[27148] trunk/dports/devel/glib2

[source_changes at macosforge.org]

Revision: 27148
          http://trac.macosforge.org/projects/macports/changeset/27148
Author:   ryandesign at macports.org
Date:     2007-07-21 07:20:10 -0700 (Sat, 21 Jul 2007)

Log Message:
-----------
glib2:

 * Upgrade to 2.12.13.
 * Add patch for gi18n.h/popt.h conflict. This patch is critical as the conflict is wrecking havoc on GNOME installations and upgrades.
 * Replace hardcoded versions in the distro sites with regexes based on the version.

Thanks to Randall Wood for this update.

Modified Paths:
--------------
    trunk/dports/devel/glib2/Portfile

Added Paths:
-----------
    trunk/dports/devel/glib2/files/patch-glib_gi18n.h

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2007-07-21 12:51:00 UTC (rev 27147)
+++ trunk/dports/devel/glib2/Portfile	2007-07-21 14:20:10 UTC (rev 27148)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                glib2
-version             2.12.12
+version             2.12.13
 categories          devel
 maintainers         ryandesign
 homepage            http://www.gtk.org/
@@ -20,17 +20,18 @@
 	many other things.
 
 master_sites \
-	ftp://ftp.gtk.org/pub/glib/2.12 \
-	gnome:sources/glib/2.12
+	ftp://ftp.gtk.org/pub/glib/[strsed ${version} {/\.[0-9]*$//}] \
+	gnome:sources/glib/[strsed ${version} {/\.[0-9]*$//}]
 
 checksums \
-	md5 0b3a42098243d054475ff6eb51ed2be1 \
-	sha1 527bced2e6d38169c08c8712d5e3b6ebb0dc46b5 \
-	rmd160 bab462a1e4ef3e9905a4af5b727ad4f9ca03cf02
+	md5 d76124236e4e216e8c0861341e967a76 \
+	sha1 81ce0e53f5583be970623d12523c785a392647bf \
+	rmd160 0d13e73cb2173e7d63ce188fdb77746cca3b04d6
 
 patchfiles \
 	patch-glib-2.0.pc.in \
-	patch-glib__gutils.c
+	patch-glib__gutils.c \
+	patch-glib_gi18n.h
 
 depends_build \
 	port:pkgconfig

Added: trunk/dports/devel/glib2/files/patch-glib_gi18n.h
===================================================================
--- trunk/dports/devel/glib2/files/patch-glib_gi18n.h	                        (rev 0)
+++ trunk/dports/devel/glib2/files/patch-glib_gi18n.h	2007-07-21 14:20:10 UTC (rev 27148)
@@ -0,0 +1,17 @@
+--- glib/gi18n.h~	2007-07-21 05:05:22.000000000 -0400
++++ glib/gi18n.h	2007-07-21 05:07:01.000000000 -0400
+@@ -25,10 +25,14 @@
+ #define _(String) gettext (String)
+ #define Q_(String) g_strip_context ((String), gettext (String))
+ #ifdef gettext_noop
++#ifndef N_
+ #define N_(String) gettext_noop (String)
++#endif
+ #else
++#ifndef N_
+ #define N_(String) (String)
+ #endif
++#endif
+ 
+ #endif  /* __G_I18N_H__ */
+ 

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