summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/glib2/Makefile11
-rw-r--r--devel/glib2/buildlink3.mk4
-rw-r--r--devel/glib2/distinfo14
-rw-r--r--devel/glib2/patches/patch-aa60
-rw-r--r--devel/glib2/patches/patch-ab19
-rw-r--r--devel/glib2/patches/patch-ak20
6 files changed, 62 insertions, 66 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 67efda3c5ab..684af81f649 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.125 2007/10/29 19:06:04 drochner Exp $
+# $NetBSD: Makefile,v 1.126 2007/11/08 19:52:21 drochner Exp $
# When updating glib2, please apply patch-ak to configure.in
# Then run a matching version of autoconf to regen patch-aa.
-DISTNAME= glib-2.14.2
+DISTNAME= glib-2.14.3
PKGNAME= ${DISTNAME:S/glib/glib2/}
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.14/ \
@@ -39,14 +39,18 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib
CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
-
CONFIGURE_ARGS.gnu-iconv+= --with-libiconv=gnu
+CONFIGURE_ARGS+= --with-pcre=system
+# need pcre utf8 + unicode-properties
+BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
# Avoid an ICE in gcc2 on sparc64
CONFIGURE_ENV+= F77=${FALSE:Q}
CONFIGURE_ENV+= PERL_PATH=${PERL5:Q}
+CONFIGURE_ENV+= ac_cv_func_posix_memalign=no
+
.include "../../mk/bsd.prefs.mk"
CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
@@ -88,5 +92,6 @@ CONFIGURE_ARGS+= --disable-threads
.else
.include "../../mk/pthread.buildlink3.mk"
.endif
+.include "../../devel/pcre/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index 6b96c8cc832..06790884073 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/11/08 19:52:21 drochner Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIB2_BUILDLINK3_MK:= ${GLIB2_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-
+.include "../../devel/pcre/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 88b61668c9f..edff0408490 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.87 2007/10/29 19:15:24 drochner Exp $
+$NetBSD: distinfo,v 1.88 2007/11/08 19:52:21 drochner Exp $
-SHA1 (glib-2.14.2.tar.bz2) = 0711f1e8abf6a052aa298bcb1350bcf2195da6e4
-RMD160 (glib-2.14.2.tar.bz2) = 23a1f83abdd7de9863bd02e4a75396ea75918810
-Size (glib-2.14.2.tar.bz2) = 3340273 bytes
-SHA1 (patch-aa) = 92c69cf8dbe064ef40a4022415b1d8e44f4aac73
-SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
+SHA1 (glib-2.14.3.tar.bz2) = 3aef290ceaf17379b2fe24d8fdfb5ce6755d5f25
+RMD160 (glib-2.14.3.tar.bz2) = d66ec2f7bf8e9fe1ab9e0191b55f46f9b711ca4c
+Size (glib-2.14.3.tar.bz2) = 3339169 bytes
+SHA1 (patch-aa) = 1fdb9b104bfb3c8c28252be3e82a1757a5ca64cf
+SHA1 (patch-ab) = e84c4928b5288b83f2203b4ffd28cdb9de730e98
SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
@@ -12,4 +12,4 @@ SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae
SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905
SHA1 (patch-ai) = baf3466a38ed09e956c4e8423a64415395690de7
SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
-SHA1 (patch-ak) = 86ead0dc2836ee2ced420cca62e2f116ece316aa
+SHA1 (patch-ak) = 4eee3ce549ba0972ab5d5d8166d37d2b61320e68
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index a46f57b4ff7..8edab605430 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.36 2007/10/29 19:15:24 drochner Exp $
+$NetBSD: patch-aa,v 1.37 2007/11/08 19:52:21 drochner Exp $
---- configure.orig 2007-09-16 18:29:44.000000000 +0200
+--- configure.orig 2007-11-07 06:13:12.000000000 +0100
+++ configure
-@@ -929,6 +929,7 @@ G_MODULE_PLUGIN_LIBS
+@@ -945,6 +945,7 @@ G_MODULE_PLUGIN_LIBS
G_MODULE_LDFLAGS
G_MODULE_HAVE_DLERROR
G_MODULE_BROKEN_RTLD_GLOBAL
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.36 2007/10/29 19:15:24 drochner Exp $
G_MODULE_NEED_USCORE
GLIB_DEBUG_FLAGS
GSPAWN
-@@ -36702,6 +36703,7 @@ else
+@@ -33908,6 +33909,7 @@ else
fi
G_MODULE_NEED_USCORE=0
G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.36 2007/10/29 19:15:24 drochner Exp $
G_MODULE_HAVE_DLERROR=0
if test -z "$G_MODULE_IMPL"; then
case "$host" in
-@@ -37625,6 +37627,84 @@ fi
+@@ -34703,6 +34705,84 @@ fi
LIBS="$LIBS_orig"
fi
@@ -103,7 +103,7 @@ $NetBSD: patch-aa,v 1.36 2007/10/29 19:15:24 drochner Exp $
if test -z "$G_MODULE_IMPL"; then
G_MODULE_IMPL=0
G_MODULE_SUPPORTED=false
-@@ -37661,6 +37741,8 @@ fi
+@@ -34739,6 +34819,8 @@ fi
@@ -112,7 +112,7 @@ $NetBSD: patch-aa,v 1.36 2007/10/29 19:15:24 drochner Exp $
{ echo "$as_me:$LINENO: checking for gspawn implementation" >&5
echo $ECHO_N "checking for gspawn implementation... $ECHO_C" >&6; }
case "$host" in
-@@ -38059,126 +38141,8 @@ if test x"$have_threads" != xno; then
+@@ -35086,110 +35168,8 @@ if test x"$have_threads" != xno; then
G_THREAD_LIBS="-lpthread -lthread"
;;
*)
@@ -146,27 +146,11 @@ $NetBSD: patch-aa,v 1.36 2007/10/29 19:15:24 drochner Exp $
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext &&
+- $as_test_x conftest$ac_exeext; then
- glib_flag_works=yes
-else
- echo "$as_me: failed program was:" >&5
@@ -175,7 +159,7 @@ $NetBSD: patch-aa,v 1.36 2007/10/29 19:15:24 drochner Exp $
- glib_flag_works=no
-fi
-
--rm -f core conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-else
- cat >conftest.$ac_ext <<_ACEOF
@@ -241,7 +225,7 @@ $NetBSD: patch-aa,v 1.36 2007/10/29 19:15:24 drochner Exp $
;;
esac
fi
-@@ -40503,6 +40467,10 @@ case $host in
+@@ -37150,6 +37130,10 @@ case $host in
*)
G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
;;
@@ -252,7 +236,7 @@ $NetBSD: patch-aa,v 1.36 2007/10/29 19:15:24 drochner Exp $
esac
-@@ -46199,6 +46167,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
+@@ -42175,6 +42159,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
G_MODULE_LDFLAGS!$G_MODULE_LDFLAGS$ac_delim
G_MODULE_HAVE_DLERROR!$G_MODULE_HAVE_DLERROR$ac_delim
G_MODULE_BROKEN_RTLD_GLOBAL!$G_MODULE_BROKEN_RTLD_GLOBAL$ac_delim
@@ -260,23 +244,23 @@ $NetBSD: patch-aa,v 1.36 2007/10/29 19:15:24 drochner Exp $
G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim
GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim
GSPAWN!$GSPAWN$ac_delim
-@@ -46217,7 +46186,6 @@ ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_
+@@ -42192,7 +42177,6 @@ G_THREAD_LIBS_EXTRA!$G_THREAD_LIBS_EXTRA
+ ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_delim
ENABLE_REGEX_FALSE!$ENABLE_REGEX_FALSE$ac_delim
USE_SYSTEM_PCRE_TRUE!$USE_SYSTEM_PCRE_TRUE$ac_delim
- USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim
--PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
+-USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -46259,6 +46227,7 @@ _ACEOF
+@@ -42234,6 +42218,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
++USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim
+ PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
PCRE_LIBS!$PCRE_LIBS$ac_delim
PCRE_REQUIRES!$PCRE_REQUIRES$ac_delim
- PCRE_WARN_CFLAGS!$PCRE_WARN_CFLAGS$ac_delim
-@@ -46281,7 +46250,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -42256,7 +42241,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
diff --git a/devel/glib2/patches/patch-ab b/devel/glib2/patches/patch-ab
index 2f59bceb586..1ace88d4cbe 100644
--- a/devel/glib2/patches/patch-ab
+++ b/devel/glib2/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.11 2005/03/02 15:38:08 wiz Exp $
+$NetBSD: patch-ab,v 1.12 2007/11/08 19:52:21 drochner Exp $
http://bugzilla.gnome.org/show_bug.cgi?id=140329
---- gmodule/gmodule.c.orig 2005-01-02 17:03:56.000000000 +0100
+--- gmodule/gmodule.c.orig 2007-10-16 07:44:43.000000000 +0200
+++ gmodule/gmodule.c
-@@ -560,6 +560,24 @@ g_module_error (void)
+@@ -599,6 +599,31 @@ g_module_error (void)
return g_static_private_get (&module_error_private);
}
@@ -13,23 +13,30 @@ http://bugzilla.gnome.org/show_bug.cgi?id=140329
+ const gchar *symbol_name,
+ gpointer *symbol)
+{
++ gpointer hdl = module->handle;
++#if defined (G_MODULE_BROKEN_DLOPEN_NULL) && defined(__NetBSD__) && defined(RTLD_DEFAULT)
++ /* use some special handle to access global namespace */
++ if (module == main_module)
++ hdl = RTLD_DEFAULT;
++#endif
++
+#ifdef G_MODULE_NEED_USCORE
+ {
+ gchar *name;
+
+ name = g_strconcat ("_", symbol_name, NULL);
-+ *symbol = _g_module_symbol (module->handle, name);
++ *symbol = _g_module_symbol (hdl, name);
+ g_free (name);
+ }
+#else /* !G_MODULE_NEED_USCORE */
-+ *symbol = _g_module_symbol (module->handle, symbol_name);
++ *symbol = _g_module_symbol (hdl, symbol_name);
+#endif /* !G_MODULE_NEED_USCORE */
+}
+
gboolean
g_module_symbol (GModule *module,
const gchar *symbol_name,
-@@ -577,17 +595,28 @@ g_module_symbol (GModule *module,
+@@ -616,17 +641,28 @@ g_module_symbol (GModule *module,
g_static_rec_mutex_lock (&g_module_global_lock);
diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak
index 515fb43cfcf..56a5d256f3f 100644
--- a/devel/glib2/patches/patch-ak
+++ b/devel/glib2/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2007/08/15 22:09:13 tnn Exp $
+$NetBSD: patch-ak,v 1.2 2007/11/08 19:52:21 drochner Exp $
---- configure.in.orig 2007-08-04 02:50:45.000000000 +0200
+--- configure.in.orig 2007-11-07 06:12:00.000000000 +0100
+++ configure.in
-@@ -1205,6 +1205,7 @@ fi
+@@ -1202,6 +1202,7 @@ fi
dnl G_MODULE_IMPL= don't reset, so cmd-line can override
G_MODULE_NEED_USCORE=0
G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -10,7 +10,7 @@ $NetBSD: patch-ak,v 1.1 2007/08/15 22:09:13 tnn Exp $
G_MODULE_HAVE_DLERROR=0
dnl *** force native WIN32 shared lib loader
if test -z "$G_MODULE_IMPL"; then
-@@ -1329,6 +1330,38 @@ dnl *** check for having dlerror()
+@@ -1326,6 +1327,38 @@ dnl *** check for having dlerror()
[G_MODULE_HAVE_DLERROR=0])
LIBS="$LIBS_orig"
fi
@@ -29,11 +29,11 @@ $NetBSD: patch-ak,v 1.1 2007/08/15 22:09:13 tnn Exp $
+int gettext;
+int main () {
+ void *handle;
-+ handle = dlopen ("libintl.so", RTLD_GLOBAL | RTLD_LAZY);
++ handle = dlopen ("libm.so", RTLD_GLOBAL | RTLD_LAZY);
+ if (!handle) return 0;
+ handle = dlopen (NULL, 0);
+ if (!handle) return 0;
-+ handle = dlsym (handle, "gettext");
++ handle = dlsym (handle, "sin");
+ return handle == NULL;
+}
+ ],
@@ -41,7 +41,7 @@ $NetBSD: patch-ak,v 1.1 2007/08/15 22:09:13 tnn Exp $
+ [glib_cv_dlopennull_broken=yes],
+ [glib_cv_dlopennull_broken=no])
+ ])
-+ if test "xglib_cv_dlopennull_broken$" = "xyes"; then
++ if test "x$glib_cv_dlopennull_broken" = "xyes"; then
+ G_MODULE_BROKEN_DLOPEN_NULL=1
+ else
+ G_MODULE_BROKEN_DLOPEN_NULL=0
@@ -49,7 +49,7 @@ $NetBSD: patch-ak,v 1.1 2007/08/15 22:09:13 tnn Exp $
dnl *** done, have we got an implementation?
if test -z "$G_MODULE_IMPL"; then
G_MODULE_IMPL=0
-@@ -1358,6 +1391,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
+@@ -1355,6 +1388,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
AC_SUBST(G_MODULE_LDFLAGS)
AC_SUBST(G_MODULE_HAVE_DLERROR)
AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
@@ -58,7 +58,7 @@ $NetBSD: patch-ak,v 1.1 2007/08/15 22:09:13 tnn Exp $
AC_SUBST(G_MODULE_NEED_USCORE)
AC_SUBST(GLIB_DEBUG_FLAGS)
-@@ -1601,22 +1636,8 @@ if test x"$have_threads" != xno; then
+@@ -1598,22 +1633,8 @@ if test x"$have_threads" != xno; then
G_THREAD_LIBS="-lpthread -lthread"
;;
*)
@@ -83,7 +83,7 @@ $NetBSD: patch-ak,v 1.1 2007/08/15 22:09:13 tnn Exp $
;;
esac
fi
-@@ -1972,6 +1993,10 @@ case $host in
+@@ -1970,6 +1991,10 @@ case $host in
*)
G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
;;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 03:44:29 +0000