summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-12-24 05:25:06 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-12-24 05:25:06 +0800
commit1e62e5567921fc940d52ca2e08ed49ac06239a47 (patch)
tree62f1b21cc6f491e2681b11b41cb07ace8c918b7f
parent1da0e0d002af01620b5692c4af34ce16ff97258d (diff)
downloadmarcuscom-ports-1e62e5567921fc940d52ca2e08ed49ac06239a47.tar
marcuscom-ports-1e62e5567921fc940d52ca2e08ed49ac06239a47.tar.gz
marcuscom-ports-1e62e5567921fc940d52ca2e08ed49ac06239a47.tar.bz2
marcuscom-ports-1e62e5567921fc940d52ca2e08ed49ac06239a47.tar.lz
marcuscom-ports-1e62e5567921fc940d52ca2e08ed49ac06239a47.tar.xz
marcuscom-ports-1e62e5567921fc940d52ca2e08ed49ac06239a47.tar.zst
marcuscom-ports-1e62e5567921fc940d52ca2e08ed49ac06239a47.zip
Fix build on 4.X.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3320 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-pixmaps.c13
-rw-r--r--x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-rc-style.c14
-rw-r--r--x11-themes/gtk-engines2/files/patch-engines_redmond_src_redmond_gtk2_drawing.c17
3 files changed, 44 insertions, 0 deletions
diff --git a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-pixmaps.c b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-pixmaps.c
new file mode 100644
index 000000000..590e73060
--- /dev/null
+++ b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-pixmaps.c
@@ -0,0 +1,13 @@
+--- engines/crux/crux-pixmaps.c.orig Thu Dec 23 16:13:44 2004
++++ engines/crux/crux-pixmaps.c Thu Dec 23 16:14:09 2004
+@@ -329,8 +329,9 @@
+ static GdkPixbuf *
+ load_image (const char *file)
+ {
++ GdkPixbuf *pixbuf;
+ printf("%s\n", file);
+- GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
++ pixbuf = gdk_pixbuf_new_from_file (file, NULL);
+ if (pixbuf != 0)
+ return pixbuf;
+
diff --git a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-rc-style.c b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-rc-style.c
new file mode 100644
index 000000000..ecaff5537
--- /dev/null
+++ b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-rc-style.c
@@ -0,0 +1,14 @@
+--- engines/crux/src/crux-rc-style.c.orig Thu Dec 23 16:14:48 2004
++++ engines/crux/src/crux-rc-style.c Thu Dec 23 16:15:02 2004
+@@ -20,9 +20,10 @@
+ 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-themes/gtk-engines2/files/patch-engines_redmond_src_redmond_gtk2_drawing.c b/x11-themes/gtk-engines2/files/patch-engines_redmond_src_redmond_gtk2_drawing.c
new file mode 100644
index 000000000..8ff91069a
--- /dev/null
+++ b/x11-themes/gtk-engines2/files/patch-engines_redmond_src_redmond_gtk2_drawing.c
@@ -0,0 +1,17 @@
+--- engines/redmond/src/redmond_gtk2_drawing.c.orig Thu Dec 23 16:16:27 2004
++++ engines/redmond/src/redmond_gtk2_drawing.c Thu Dec 23 16:18:06 2004
+@@ -1581,9 +1581,13 @@
+ gint height,
+ GtkOrientation orientation)
+ {
++ gboolean left_cutoff, top_cutoff, bottom_cutoff, right_cutoff;
+ g_return_if_fail(sanitize_parameters(style, window, &width, &height));
+
+- gboolean left_cutoff = FALSE, right_cutoff = FALSE, top_cutoff = FALSE, bottom_cutoff = FALSE;
++ left_cutoff = FALSE;
++ right_cutoff = FALSE;
++ top_cutoff = FALSE;
++ bottom_cutoff = FALSE;
+
+ if (IS_BONOBO_DOCK_ITEM_GRIP(widget) &&
+ (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) &&