Date: Fri, 18 Sep 2020 21:38:48 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548919 - head/x11-wm/wmakerconf/files Message-ID: <202009182138.08ILcmIe009522@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Sep 18 21:38:47 2020 New Revision: 548919 URL: https://svnweb.freebsd.org/changeset/ports/548919 Log: Add patches to build without deprecated glib functions PR: 247278 Added: head/x11-wm/wmakerconf/files/patch-src_misc.c (contents, props changed) head/x11-wm/wmakerconf/files/patch-src_previews.c (contents, props changed) head/x11-wm/wmakerconf/files/patch-src_themebrowser.c (contents, props changed) head/x11-wm/wmakerconf/files/patch-src_window.c (contents, props changed) Added: head/x11-wm/wmakerconf/files/patch-src_misc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/wmakerconf/files/patch-src_misc.c Fri Sep 18 21:38:47 2020 (r548919) @@ -0,0 +1,14 @@ +--- src/misc.c.orig 2004-12-05 01:49:32 UTC ++++ src/misc.c +@@ -482,9 +482,9 @@ copy_file (const char *dst, const char *src) + if (dir) /* directory is destination */ + { + closedir (dir); +- if (streq (dst, g_dirname (src))) ++ if (streq (dst, g_path_get_dirname (src))) + return 0; +- dst_name = g_strconcat (dst, "/", g_basename (src), NULL); ++ dst_name = g_strconcat (dst, "/", g_path_get_basename (src), NULL); + } + else + dst_name = g_strdup (dst); Added: head/x11-wm/wmakerconf/files/patch-src_previews.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/wmakerconf/files/patch-src_previews.c Fri Sep 18 21:38:47 2020 (r548919) @@ -0,0 +1,20 @@ +--- src/previews.c.orig 2004-12-07 00:37:10 UTC ++++ src/previews.c +@@ -326,7 +326,7 @@ make_preview (GtkWidget *entry, char *name) + Free (pname); + } + +- gtk_tooltips_set_tip (tooltips, data->button, g_basename (name), NULL); ++ gtk_tooltips_set_tip (tooltips, data->button, g_path_get_basename (name), NULL); + gtk_container_set_border_width (GTK_CONTAINER (data->button), 2); + gtk_container_add (GTK_CONTAINER (data->button), pixmap); + gtk_widget_show_all (data->button); +@@ -344,7 +344,7 @@ set_selection (GtkWidget *widget, GdkEventButton *even + GtkWidget *entry = gtk_object_get_user_data (GTK_OBJECT (pixmap)); + previewdata_t *data = (previewdata_t *) ptr; + +- gtk_entry_set_text (GTK_ENTRY (entry), g_basename (data->name)); ++ gtk_entry_set_text (GTK_ENTRY (entry), g_path_get_basename (data->name)); + + if (event->type == GDK_2BUTTON_PRESS) + gtk_signal_emit_by_name (GTK_OBJECT (ok_button), "clicked"); Added: head/x11-wm/wmakerconf/files/patch-src_themebrowser.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/wmakerconf/files/patch-src_themebrowser.c Fri Sep 18 21:38:47 2020 (r548919) @@ -0,0 +1,50 @@ +--- src/themebrowser.c.orig 2007-04-12 10:38:44 UTC ++++ src/themebrowser.c +@@ -917,7 +917,7 @@ append_directory (const char *dirname, GtkCTree *tree, + GtkCTreeNode *rootsibling = NULL; + + if (parent) +- root = append_node ((char *) g_basename (dirname), tree, parent, ++ root = append_node ((char *) g_path_get_basename (dirname), tree, parent, + sibling, NO); + else + root = append_node ((char *) dirname, tree, parent, sibling, NO); +@@ -2284,7 +2284,7 @@ leave_preview (GtkWidget *button, gpointer ptr) + g_list_length (list) > 1 + ? _("Show next preview") + : _("Leave preview mode"), NULL, leave_preview, list, +- _("Preview of `%s'"), g_basename (name)); ++ _("Preview of `%s'"), g_path_get_basename (name)); + } + } + +@@ -2705,7 +2705,7 @@ save_theme_backend (GtkWidget *widget, gpointer ptr) + oldfiles = g_list_remove (oldfiles, tmp); + Free (tmp); + } +- if (!WMWritePropListToFile (theme, stylename, YES)) ++ if (!WMWritePropListToFile (theme, stylename)) + { + dialog_popup (DIALOG_ERROR, NULL, NULL, + _("Can't save theme file\n`%s'\n" +@@ -3526,17 +3526,17 @@ compute_preview (GtkWidget *progress_bar, GtkWidget *p + path = get_pixmap_path (pname); + + gtk_progress_bar_update (GTK_PROGRESS_BAR (progress_bar), n / (double) nelem); +- gtk_label_set_text (GTK_LABEL (progress_label), g_basename (name)); ++ gtk_label_set_text (GTK_LABEL (progress_label), g_path_get_basename (name)); + while (gtk_events_pending ()) + gtk_main_iteration (); + + if (!path) + { +- DIR *dir = opendir (g_dirname (pname)); ++ DIR *dir = opendir (g_path_get_dirname (pname)); + + if (!dir) /* Make ~/.wmakerconf directory */ + { +- if (make_directory (g_dirname (pname))) ++ if (make_directory (g_path_get_dirname (pname))) + { + Free (pname); + return; Added: head/x11-wm/wmakerconf/files/patch-src_window.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/wmakerconf/files/patch-src_window.c Fri Sep 18 21:38:47 2020 (r548919) @@ -0,0 +1,20 @@ +--- src/window.c.orig 2004-07-22 03:09:55 UTC ++++ src/window.c +@@ -898,7 +898,7 @@ make_pixmap (const char *name, int width, int height, + gdk_imlib_render (image, max (width, 22), max (height, 22)); + pixmap = gdk_imlib_move_image (image); + mask = gdk_imlib_move_mask (image); +- if (strchr (g_basename (path), '.')) /* don't cache x-of-day */ ++ if (strchr (g_path_get_basename (path), '.')) /* don't cache x-of-day */ + gdk_imlib_destroy_image (image); + else + gdk_imlib_kill_image (image); +@@ -1069,7 +1069,7 @@ save_config_file (GtkWidget *widget, gpointer ptr) + WMReleasePropList (all_keys); + } + +- if (WMWritePropListToFile (newwm, orig_wmaker_fname, YES)) ++ if (WMWritePropListToFile (newwm, orig_wmaker_fname)) + { + changed = NO; + message (_("Window Maker config file '%s' saved."),
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009182138.08ILcmIe009522>