[29116] trunk/dports/x11/gtk2

[source_changes at macosforge.org]

Revision: 29116
          http://trac.macosforge.org/projects/macports/changeset/29116
Author:   rhwood at macports.org
Date:     2007-09-15 01:36:21 -0700 (Sat, 15 Sep 2007)

Log Message:
-----------
Upgrade to version 2.12.0 including upstream provided patch

Modified Paths:
--------------
    trunk/dports/x11/gtk2/Portfile

Added Paths:
-----------
    trunk/dports/x11/gtk2/files/patch-gtk_gtkiconcache.c.diff

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2007-09-15 07:59:02 UTC (rev 29115)
+++ trunk/dports/x11/gtk2/Portfile	2007-09-15 08:36:21 UTC (rev 29116)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name		gtk2
-version		2.10.14
+version		2.12.0
 categories	x11
 maintainers	rhwood openmaintainer at macports.org
 description	Gimp ToolKit version 2
@@ -20,9 +20,9 @@
 
 distname	gtk+-${version}
 
-checksums	md5 018d7dd0fa7de01cfdb77c7c55e7ba26 \
-		sha1 78b819814d52caa66739ab64611e41f35e5b48c3 \
-		rmd160 234d7240732b28a31a260aa9e04c34fc502acbf4
+checksums	md5 e9c280afec29b11772af5a7c807abf41 \
+		sha1 f5ecbf73a789a8880a6b2e15279267bb113980e2 \
+		rmd160 226c8f38eb7895d63f81feb60152db1ca3599628
 		
 use_bzip2	yes
 
@@ -55,6 +55,9 @@
 		return -code 1 "\nThe cups-headers port may prevent building this port.  Please uninstall\n(or deactivate) cups-headers and restart the build.\n"
 	}
 }
+
+patchfiles	patch-gtk_gtkiconcache.c.diff
+
 # older CFLAGS declaration - if the default optimization still causes problems
 # we will revert to this
 #	CFLAGS="-O3 -funroll-loops -fstrict-aliasing"

Added: trunk/dports/x11/gtk2/files/patch-gtk_gtkiconcache.c.diff
===================================================================
--- trunk/dports/x11/gtk2/files/patch-gtk_gtkiconcache.c.diff	                        (rev 0)
+++ trunk/dports/x11/gtk2/files/patch-gtk_gtkiconcache.c.diff	2007-09-15 08:36:21 UTC (rev 29116)
@@ -0,0 +1,27 @@
+--- gtk/gtkiconcache.c	2007/09/14 01:01:59	18822
++++ gtk/gtkiconcache.c	2007/09/14 02:11:01	18823
+@@ -127,14 +127,19 @@
+   info.n_directories = 0;
+   info.flags = CHECK_OFFSETS|CHECK_STRINGS;
+ 
+-  if (!_gtk_icon_cache_validate (&info))
++#ifdef G_ENABLE_DEBUG
++  if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
+     {
+-      g_mapped_file_free (map);
+-      g_warning ("Icon cache '%s' is invalid\n", cache_filename);
++      if (!_gtk_icon_cache_validate (&info))
++        {
++          g_mapped_file_free (map);
++          g_warning ("Icon cache '%s' is invalid\n", cache_filename);
+ 
+-      goto done;
++          goto done;
++        }
+     }
+-  
++#endif 
++
+   GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path));
+ 
+   cache = g_new0 (GtkIconCache, 1);

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070915/d4341f37/attachment.html