diff options
author | jmmv <jmmv@pkgsrc.org> | 2005-01-13 19:51:19 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2005-01-13 19:51:19 +0000 |
commit | 25ab654d477f23f23700bbcd37476b9b851fd02d (patch) | |
tree | 48940af6d4a317e46221652c7b94eb71c2d5b682 /x11/gtk2-engines/patches | |
parent | db61aac2542ff20fd1fecdcaf794c65547d4096c (diff) | |
download | pkgsrc-25ab654d477f23f23700bbcd37476b9b851fd02d.tar.gz |
Fix multiple useless C99isms. Should fix the build with GCC 2.95.
Spotted by latest NetBSD 1.6.2/i386 kristerw@'s bulk build.
While here, commit an update that has been laying here for a while.
This should depend on the latest gtk2 to avoid a deadlock when using
SVG themes. So bump PKGREVISION to 1.
Diffstat (limited to 'x11/gtk2-engines/patches')
-rw-r--r-- | x11/gtk2-engines/patches/patch-aa | 14 | ||||
-rw-r--r-- | x11/gtk2-engines/patches/patch-ab | 16 | ||||
-rw-r--r-- | x11/gtk2-engines/patches/patch-ac | 17 |
3 files changed, 47 insertions, 0 deletions
diff --git a/x11/gtk2-engines/patches/patch-aa b/x11/gtk2-engines/patches/patch-aa new file mode 100644 index 00000000000..de45d9e312c --- /dev/null +++ b/x11/gtk2-engines/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.3 2005/01/13 19:51:19 jmmv Exp $ + +--- engines/crux/src/crux-pixmaps.c.orig 2004-12-01 13:55:55.000000000 +0100 ++++ engines/crux/src/crux-pixmaps.c +@@ -329,8 +329,8 @@ recolor_pixbuf (GdkPixbuf *pixbuf, eazel + static GdkPixbuf * + load_image (const char *file) + { +- printf("%s\n", file); + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); ++ printf("%s\n", file); + if (pixbuf != 0) + return pixbuf; + diff --git a/x11/gtk2-engines/patches/patch-ab b/x11/gtk2-engines/patches/patch-ab new file mode 100644 index 00000000000..4e09da77372 --- /dev/null +++ b/x11/gtk2-engines/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.1 2005/01/13 19:51:19 jmmv Exp $ + +--- engines/crux/src/crux-rc-style.c.orig 2004-12-01 13:55:55.000000000 +0100 ++++ engines/crux/src/crux-rc-style.c +@@ -20,9 +20,10 @@ GtkRcStyleClass *rc_parent_class; + static void + crux_rc_style_init (CruxRcStyle *style) + { ++ gchar *path; + style->theme_data = NULL; + +- gchar *path = g_malloc (strlen (DATADIR) + 15); ++ path = g_malloc (strlen (DATADIR) + 15); + sprintf (path, "pixmap_path \"%s\"", DATADIR); + + gtk_rc_parse_string (path); diff --git a/x11/gtk2-engines/patches/patch-ac b/x11/gtk2-engines/patches/patch-ac new file mode 100644 index 00000000000..56bc1c29a99 --- /dev/null +++ b/x11/gtk2-engines/patches/patch-ac @@ -0,0 +1,17 @@ +$NetBSD: patch-ac,v 1.1 2005/01/13 19:51:19 jmmv Exp $ + +--- engines/redmond/src/redmond_gtk2_drawing.c.orig 2004-12-15 17:52:56.000000000 +0100 ++++ engines/redmond/src/redmond_gtk2_drawing.c +@@ -1581,10 +1581,10 @@ redmond_draw_handle (GtkStyle * style, + gint height, + GtkOrientation orientation) + { +- g_return_if_fail(sanitize_parameters(style, window, &width, &height)); +- + gboolean left_cutoff = FALSE, right_cutoff = FALSE, top_cutoff = FALSE, bottom_cutoff = FALSE; + ++ g_return_if_fail(sanitize_parameters(style, window, &width, &height)); ++ + if (IS_BONOBO_DOCK_ITEM_GRIP(widget) && + (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) && + orientation == (GTK_ORIENTATION_HORIZONTAL)) |