[42728] trunk/dports/devel/glib2
ryandesign at macports.org
ryandesign at macports.org
Sat Nov 29 18:38:40 PST 2008
Revision: 42728
http://trac.macports.org/changeset/42728
Author: ryandesign at macports.org
Date: 2008-11-29 18:38:39 -0800 (Sat, 29 Nov 2008)
Log Message:
-----------
glib2: update to 2.18.3; closes #17418
Modified Paths:
--------------
trunk/dports/devel/glib2/Portfile
trunk/dports/devel/glib2/files/patch-configure.diff
trunk/dports/devel/glib2/files/patch-gi18n.h.diff
trunk/dports/devel/glib2/files/patch-gutils.c.diff
Added Paths:
-----------
trunk/dports/devel/glib2/files/patch-child-test.c.diff
trunk/dports/devel/glib2/files/patch-which.diff
Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile 2008-11-30 01:51:50 UTC (rev 42727)
+++ trunk/dports/devel/glib2/Portfile 2008-11-30 02:38:39 UTC (rev 42728)
@@ -4,7 +4,7 @@
name glib2
set my_name glib
-version 2.18.2
+version 2.18.3
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign
@@ -27,14 +27,15 @@
# ftp://ftp.gtk.org/pub/${my_name}/${branch}/
checksums \
- md5 d11a5cc5e08cff53349a3481816fdaff \
- sha1 4eaf73feda42e8ecf00654f56e38f7fedd6a9266 \
- rmd160 52df56375dd97c07837ae085dc045cf29d6f59a1
+ md5 f13996a7bd57525d796a6593f26a7771 \
+ sha1 293f639fb85ea47347eb34e122327c60ef7606e4 \
+ rmd160 cf43fbba04250becaabdb7b7f55bcdec584f019e
patchfiles \
patch-glib-2.0.pc.in.diff \
patch-gutils.c.diff \
- patch-gi18n.h.diff
+ patch-gi18n.h.diff \
+ patch-which.diff
depends_build \
port:pkgconfig
@@ -64,7 +65,9 @@
}
platform darwin {
- patchfiles-append patch-configure.diff
+ patchfiles-append \
+ patch-child-test.c.diff \
+ patch-configure.diff
}
platform powerpc {
Added: trunk/dports/devel/glib2/files/patch-child-test.c.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-child-test.c.diff (rev 0)
+++ trunk/dports/devel/glib2/files/patch-child-test.c.diff 2008-11-30 02:38:39 UTC (rev 42728)
@@ -0,0 +1,11 @@
+--- tests/child-test.c 2008-11-23 23:45:21.000000000 -0600
++++ tests/child-test.c 2008-11-28 16:30:29.000000000 -0600
+@@ -175,7 +175,7 @@
+ #ifdef G_OS_WIN32
+ system ("ipconfig /all");
+ #else
+- system ("/bin/true");
++ system ("/usr/bin/true");
+ #endif
+
+ alive = 2;
Modified: trunk/dports/devel/glib2/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-configure.diff 2008-11-30 01:51:50 UTC (rev 42727)
+++ trunk/dports/devel/glib2/files/patch-configure.diff 2008-11-30 02:38:39 UTC (rev 42728)
@@ -1,6 +1,6 @@
---- configure 2008-10-16 09:41:13.000000000 -0500
-+++ configure 2008-11-03 21:26:37.000000000 -0600
-@@ -31491,28 +31491,11 @@
+--- configure.orig 2008-11-23 23:50:01.000000000 -0600
++++ configure 2008-11-25 23:59:29.000000000 -0600
+@@ -28314,28 +28314,11 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
$as_echo "$ac_cv_c_bigendian" >&6; }
@@ -31,7 +31,7 @@
if test x$ac_cv_c_bigendian = xuniversal ; then
cat >conftest.$ac_ext <<_ACEOF
-@@ -42612,7 +42595,11 @@
+@@ -39435,7 +39418,11 @@
$as_echo "$glib_cv_byte_contents_gmutex" >&6; }
cat >>confdefs.h <<_ACEOF
@@ -44,7 +44,7 @@
_ACEOF
-@@ -48189,10 +48177,13 @@
+@@ -46181,10 +46168,13 @@
_______EOF
fi
@@ -62,7 +62,7 @@
echo >>$outfile
-@@ -48241,7 +48232,12 @@
+@@ -46233,7 +46223,12 @@
long dummy_long;
} static_mutex;
};
@@ -76,7 +76,7 @@
#define g_static_mutex_get_mutex(mutex) \\
(g_thread_use_default_impl ? ((GMutex*) ((mutex)->static_mutex.pad)) : \\
g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
-@@ -48270,24 +48266,39 @@
+@@ -46262,24 +46257,39 @@
void *dummy_pointer;
long dummy_long;
};
@@ -132,7 +132,7 @@
#define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val))
#define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val))
#define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val))
-@@ -48296,7 +48307,11 @@
+@@ -46288,7 +46298,11 @@
#define GUINT_TO_LE(val) ((guint) GUINT${gintbits}_TO_LE (val))
#define GINT_TO_BE(val) ((gint) GINT${gintbits}_TO_BE (val))
#define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
Modified: trunk/dports/devel/glib2/files/patch-gi18n.h.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-gi18n.h.diff 2008-11-30 01:51:50 UTC (rev 42727)
+++ trunk/dports/devel/glib2/files/patch-gi18n.h.diff 2008-11-30 02:38:39 UTC (rev 42728)
@@ -1,6 +1,6 @@
---- glib/gi18n.h 2008-02-11 11:14:22.000000000 -0600
-+++ glib/gi18n.h 2008-02-22 12:09:30.000000000 -0600
-@@ -24,7 +24,9 @@
+--- glib/gi18n.h.orig 2008-11-23 23:45:23.000000000 -0600
++++ glib/gi18n.h 2008-11-25 23:59:29.000000000 -0600
+@@ -27,7 +27,9 @@
#define _(String) gettext (String)
#define Q_(String) g_dpgettext (NULL, String, 0)
@@ -8,5 +8,5 @@
#define N_(String) (String)
+#endif
#define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
+ #define NC_(Context, String) (String)
-
Modified: trunk/dports/devel/glib2/files/patch-gutils.c.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-gutils.c.diff 2008-11-30 01:51:50 UTC (rev 42727)
+++ trunk/dports/devel/glib2/files/patch-gutils.c.diff 2008-11-30 02:38:39 UTC (rev 42728)
@@ -1,6 +1,6 @@
---- glib/gutils.c.orig 2005-09-28 00:06:16.000000000 -0700
-+++ glib/gutils.c 2005-09-28 00:06:48.000000000 -0700
-@@ -48,6 +48,7 @@
+--- glib/gutils.c.orig 2008-11-23 23:45:23.000000000 -0600
++++ glib/gutils.c 2008-11-25 23:59:30.000000000 -0600
+@@ -51,6 +51,7 @@
#endif
#ifdef HAVE_CRT_EXTERNS_H
#include <crt_externs.h> /* for _NSGetEnviron */
Added: trunk/dports/devel/glib2/files/patch-which.diff
===================================================================
--- trunk/dports/devel/glib2/files/patch-which.diff (rev 0)
+++ trunk/dports/devel/glib2/files/patch-which.diff 2008-11-30 02:38:39 UTC (rev 42728)
@@ -0,0 +1,54 @@
+Use "which" in a way that works on Mac OS X. See #17418.
+--- gio/pltcheck.sh 2008-11-23 23:45:19.000000000 -0600
++++ gio/pltcheck.sh 2008-11-28 15:37:06.000000000 -0600
+@@ -4,7 +4,7 @@
+
+ status=0
+
+-if ! which readelf 2>/dev/null >/dev/null; then
++if ! test -x "`which readelf`"; then
+ echo "'readelf' not found; skipping test"
+ exit 0
+ fi
+--- glib/pltcheck.sh 2008-11-23 23:45:23.000000000 -0600
++++ glib/pltcheck.sh 2008-11-28 15:37:05.000000000 -0600
+@@ -4,7 +4,7 @@
+
+ status=0
+
+-if ! which readelf 2>/dev/null >/dev/null; then
++if ! test -x "`which readelf`"; then
+ echo "'readelf' not found; skipping test"
+ exit 0
+ fi
+--- gobject/pltcheck.sh 2008-11-23 23:45:24.000000000 -0600
++++ gobject/pltcheck.sh 2008-11-28 15:37:00.000000000 -0600
+@@ -4,7 +4,7 @@
+
+ status=0
+
+-if ! which readelf 2>/dev/null >/dev/null; then
++if ! test -x "`which readelf`"; then
+ echo "'readelf' not found; skipping test"
+ exit 0
+ fi
+--- gtk-doc.make 2008-11-24 01:03:18.000000000 -0600
++++ gtk-doc.make 2008-11-28 15:36:02.000000000 -0600
+@@ -157,7 +157,7 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ ! test -x "`which gtkdoc-rebase`" || \
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+ fi
+
+@@ -190,7 +190,7 @@
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ ! test -x "`which gtkdoc-rebase`" || \
+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081129/f1c504ea/attachment.html>
More information about the macports-changes
mailing list