summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-01-09 09:22:19 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-01-09 09:22:19 +0800
commitca20f4238b051d81c1a72233b08d63749eacb3f0 (patch)
treea2e467c494fefc032ef47a0018ad7bf913f922a8
parenta3b215df6d7fd6d6f461a1582288f5f2031c28f0 (diff)
downloadmarcuscom-ports-ca20f4238b051d81c1a72233b08d63749eacb3f0.tar
marcuscom-ports-ca20f4238b051d81c1a72233b08d63749eacb3f0.tar.gz
marcuscom-ports-ca20f4238b051d81c1a72233b08d63749eacb3f0.tar.bz2
marcuscom-ports-ca20f4238b051d81c1a72233b08d63749eacb3f0.tar.lz
marcuscom-ports-ca20f4238b051d81c1a72233b08d63749eacb3f0.tar.xz
marcuscom-ports-ca20f4238b051d81c1a72233b08d63749eacb3f0.tar.zst
marcuscom-ports-ca20f4238b051d81c1a72233b08d63749eacb3f0.zip
Update to 2.6.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3364 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11-toolkits/gtk20/Makefile3
-rw-r--r--x11-toolkits/gtk20/distinfo4
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c20
3 files changed, 13 insertions, 14 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 2334e2c2d..624611492 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gtk
-PORTVERSION= 2.6.0
-PORTREVISION= 1
+PORTVERSION= 2.6.1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \
ftp://ftp.gtk.org/pub/gtk/v2.6/ \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 8fc65c77d..614b4e318 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gtk+-2.6.0.tar.bz2) = ca717c728264fa0b3302ca00da2bcfe4
-SIZE (gnome2/gtk+-2.6.0.tar.bz2) = 10924415
+MD5 (gnome2/gtk+-2.6.1.tar.bz2) = 146ed9d12c9506fcf8745ddb2c22530a
+SIZE (gnome2/gtk+-2.6.1.tar.bz2) = 11070668
MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c
SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
index 9546b6463..97dfd0615 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
@@ -1,15 +1,15 @@
---- gtk/gtkicontheme.c.orig Wed Aug 18 11:45:13 2004
-+++ gtk/gtkicontheme.c Sat Sep 4 16:26:21 2004
-@@ -537,7 +537,7 @@
+--- gtk/gtkicontheme.c.orig Mon Jan 3 09:44:33 2005
++++ gtk/gtkicontheme.c Sat Jan 8 19:59:53 2005
+@@ -568,7 +568,7 @@
xdg_data_dirs = g_get_system_data_dirs ();
for (i = 0; xdg_data_dirs[i]; i++) ;
-- priv->search_path_len = i + 3;
-+ priv->search_path_len = (i * 2) + 3;
-
- priv->search_path = g_new (char *, priv->search_path_len);
-
-@@ -545,8 +545,10 @@
+- priv->search_path_len = i + 2;
++ priv->search_path_len = (i * 2) + 2;
+ #ifdef G_OS_UNIX
+ priv->search_path_len++;
+ #endif
+@@ -579,8 +579,10 @@
priv->search_path[i++] = g_build_filename (g_get_home_dir (), ".icons", NULL);
priv->search_path[i++] = g_build_filename (g_get_user_data_dir (), "icons", NULL);
@@ -19,5 +19,5 @@
+ priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "pixmaps", NULL);
+ }
+ #ifdef G_OS_UNIX
priv->search_path[i++] = g_strdup ("/usr/share/pixmaps");
-