summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-01-30 06:16:39 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-01-30 06:16:39 +0800
commitba727c1d88631fcfe9d581953fcdc05ad54b2887 (patch)
treead81eb25a688093a1a9452526e46eed0655aa27a
parent7743c86ca1c9381bd8ec7f8b6b00ff8ce07dc83f (diff)
downloadmarcuscom-ports-ba727c1d88631fcfe9d581953fcdc05ad54b2887.tar
marcuscom-ports-ba727c1d88631fcfe9d581953fcdc05ad54b2887.tar.gz
marcuscom-ports-ba727c1d88631fcfe9d581953fcdc05ad54b2887.tar.bz2
marcuscom-ports-ba727c1d88631fcfe9d581953fcdc05ad54b2887.tar.lz
marcuscom-ports-ba727c1d88631fcfe9d581953fcdc05ad54b2887.tar.xz
marcuscom-ports-ba727c1d88631fcfe9d581953fcdc05ad54b2887.tar.zst
marcuscom-ports-ba727c1d88631fcfe9d581953fcdc05ad54b2887.zip
Fix a problem where certain gnome-panel icons wouldn't load. This should
restore all icons to GNOME. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1727 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11-toolkits/gtk20/Makefile1
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c26
2 files changed, 27 insertions, 0 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 2f2109d6d..579fcf3c8 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk
PORTVERSION= 2.3.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.3,} \
ftp://ftp.gtk.org/pub/gtk/v2.3/ \
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
new file mode 100644
index 000000000..07bb57a6d
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
@@ -0,0 +1,26 @@
+--- gtk/gtkicontheme.c.orig Thu Jan 29 16:53:42 2004
++++ gtk/gtkicontheme.c Thu Jan 29 16:54:56 2004
+@@ -526,7 +526,7 @@
+
+ priv->custom_theme = FALSE;
+ priv->current_theme = g_strdup (DEFAULT_THEME_NAME);
+- priv->search_path = g_new (char *, 5);
++ priv->search_path = g_new (char *, 7);
+
+
+ priv->search_path[0] = g_build_filename (g_get_home_dir (),
+@@ -534,9 +534,11 @@
+ NULL);
+ priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL);
+ priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL);
+- priv->search_path[3] = g_strdup ("/usr/share/icons");
+- priv->search_path[4] = g_strdup ("/usr/share/pixmaps");
+- priv->search_path_len = 5;
++ priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL);
++ priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL);
++ priv->search_path[5] = g_strdup ("/usr/share/icons");
++ priv->search_path[6] = g_strdup ("/usr/share/pixmaps");
++ priv->search_path_len = 7;
+
+ priv->themes_valid = FALSE;
+ priv->themes = NULL;