diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/glib2/Makefile | 12 | ||||
-rw-r--r-- | devel/glib2/PLIST | 16 | ||||
-rw-r--r-- | devel/glib2/distinfo | 11 | ||||
-rw-r--r-- | devel/glib2/patches/patch-aa | 103 | ||||
-rw-r--r-- | devel/glib2/patches/patch-ak | 96 |
5 files changed, 192 insertions, 46 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index d739c31809b..8236112c990 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,11 +1,13 @@ -# $NetBSD: Makefile,v 1.117 2007/07/21 21:56:07 wiz Exp $ +# $NetBSD: Makefile,v 1.118 2007/08/15 22:09:13 tnn Exp $ -DISTNAME= glib-2.12.13 +# 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.0 PKGNAME= ${DISTNAME:S/glib/glib2/} CATEGORIES= devel -MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.12/ \ - ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.12/ \ - ${MASTER_SITE_GNOME:=sources/glib/2.12/} +MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.14/ \ + ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.14/ \ + ${MASTER_SITE_GNOME:=sources/glib/2.14/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST index 50f96ff2405..ac3fc9f17b7 100644 --- a/devel/glib2/PLIST +++ b/devel/glib2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.36 2007/03/20 15:33:57 drochner Exp $ +@comment $NetBSD: PLIST,v 1.37 2007/08/15 22:09:13 tnn Exp $ bin/glib-genmarshal bin/glib-gettextize bin/glib-mkenums @@ -42,7 +42,9 @@ include/glib/glib-2.0/glib/gqsort.h include/glib/glib-2.0/glib/gquark.h include/glib/glib-2.0/glib/gqueue.h include/glib/glib-2.0/glib/grand.h +include/glib/glib-2.0/glib/gregex.h include/glib/glib-2.0/glib/grel.h +include/glib/glib-2.0/glib/gsequence.h include/glib/glib-2.0/glib/gscanner.h include/glib/glib-2.0/glib/gshell.h include/glib/glib-2.0/glib/gslice.h @@ -135,10 +137,12 @@ share/gtk-doc/html/glib/glib-Miscellaneous-Macros.html share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html share/gtk-doc/html/glib/glib-N-ary-Trees.html share/gtk-doc/html/glib/glib-Numerical-Definitions.html +share/gtk-doc/html/glib/glib-Perl-compatible-regular-expressions.html share/gtk-doc/html/glib/glib-Pointer-Arrays.html share/gtk-doc/html/glib/glib-Quarks.html share/gtk-doc/html/glib/glib-Random-Numbers.html share/gtk-doc/html/glib/glib-Relations-and-Tuples.html +share/gtk-doc/html/glib/glib-Sequences.html share/gtk-doc/html/glib/glib-Shell-related-Utilities.html share/gtk-doc/html/glib/glib-Simple-XML-Subset-Parser.html share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html @@ -166,6 +170,7 @@ share/gtk-doc/html/glib/glib-data-types.html share/gtk-doc/html/glib/glib-fundamentals.html share/gtk-doc/html/glib/glib-gettextize.html share/gtk-doc/html/glib/glib-resources.html +share/gtk-doc/html/glib/glib-regex-syntax.html share/gtk-doc/html/glib/glib-running.html share/gtk-doc/html/glib/glib-utilities.html share/gtk-doc/html/glib/glib.devhelp @@ -182,6 +187,7 @@ share/gtk-doc/html/glib/ix05.html share/gtk-doc/html/glib/ix06.html share/gtk-doc/html/glib/ix07.html share/gtk-doc/html/glib/ix08.html +share/gtk-doc/html/glib/ix09.html share/gtk-doc/html/glib/left.png share/gtk-doc/html/glib/mainloop-states.gif share/gtk-doc/html/glib/right.png @@ -190,13 +196,13 @@ share/gtk-doc/html/glib/tools.html share/gtk-doc/html/glib/up.png share/gtk-doc/html/gobject/GTypeModule.html share/gtk-doc/html/gobject/GTypePlugin.html -share/gtk-doc/html/gobject/ch01.html share/gtk-doc/html/gobject/ch01s02.html -share/gtk-doc/html/gobject/ch02.html share/gtk-doc/html/gobject/ch06s03.html share/gtk-doc/html/gobject/ch07s02.html share/gtk-doc/html/gobject/ch07s03.html +share/gtk-doc/html/gobject/chapter-intro.html share/gtk-doc/html/gobject/chapter-gobject.html +share/gtk-doc/html/gobject/chapter-gtype.html share/gtk-doc/html/gobject/chapter-signal.html share/gtk-doc/html/gobject/glib-genmarshal.html share/gtk-doc/html/gobject/glib-mkenums.html @@ -242,6 +248,7 @@ share/gtk-doc/html/gobject/ix05.html share/gtk-doc/html/gobject/ix06.html share/gtk-doc/html/gobject/ix07.html share/gtk-doc/html/gobject/ix08.html +share/gtk-doc/html/gobject/ix09.html share/gtk-doc/html/gobject/left.png share/gtk-doc/html/gobject/pr01.html share/gtk-doc/html/gobject/pt01.html @@ -259,6 +266,7 @@ share/gtk-doc/html/gobject/tools-refdb.html share/gtk-doc/html/gobject/up.png share/locale/am/LC_MESSAGES/glib20.mo share/locale/ar/LC_MESSAGES/glib20.mo +share/locale/as/LC_MESSAGES/glib20.mo share/locale/az/LC_MESSAGES/glib20.mo share/locale/be/LC_MESSAGES/glib20.mo share/locale/be@latin/LC_MESSAGES/glib20.mo @@ -295,10 +303,12 @@ share/locale/is/LC_MESSAGES/glib20.mo share/locale/it/LC_MESSAGES/glib20.mo share/locale/ja/LC_MESSAGES/glib20.mo share/locale/ka/LC_MESSAGES/glib20.mo +share/locale/kn/LC_MESSAGES/glib20.mo share/locale/ko/LC_MESSAGES/glib20.mo share/locale/ku/LC_MESSAGES/glib20.mo share/locale/lt/LC_MESSAGES/glib20.mo share/locale/lv/LC_MESSAGES/glib20.mo +share/locale/mg/LC_MESSAGES/glib20.mo share/locale/mk/LC_MESSAGES/glib20.mo share/locale/ml/LC_MESSAGES/glib20.mo share/locale/mn/LC_MESSAGES/glib20.mo diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 32170777656..ddc35a3a9ed 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.82 2007/07/19 21:25:46 wiz Exp $ +$NetBSD: distinfo,v 1.83 2007/08/15 22:09:13 tnn Exp $ -SHA1 (glib-2.12.13.tar.bz2) = 81ce0e53f5583be970623d12523c785a392647bf -RMD160 (glib-2.12.13.tar.bz2) = 0d13e73cb2173e7d63ce188fdb77746cca3b04d6 -Size (glib-2.12.13.tar.bz2) = 2938164 bytes -SHA1 (patch-aa) = d6224959a9422706f20d5df63a3270330e51e718 +SHA1 (glib-2.14.0.tar.bz2) = a0ebfd3e170b3c47af44453b8861d3caceb9b7c4 +RMD160 (glib-2.14.0.tar.bz2) = b929764eaac40afc0064424f094cd6d8a76dfcf4 +Size (glib-2.14.0.tar.bz2) = 3304745 bytes +SHA1 (patch-aa) = e313f298388abba710a2b085bf6c78b915a305c0 SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 @@ -12,3 +12,4 @@ SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905 SHA1 (patch-ai) = baf3466a38ed09e956c4e8423a64415395690de7 SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e +SHA1 (patch-ak) = 86ead0dc2836ee2ced420cca62e2f116ece316aa diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa index 2f21df3e6e3..95ebd9d80e5 100644 --- a/devel/glib2/patches/patch-aa +++ b/devel/glib2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.33 2007/03/20 15:33:59 drochner Exp $ +$NetBSD: patch-aa,v 1.34 2007/08/15 22:09:13 tnn Exp $ ---- configure.orig 2007-03-09 05:04:21.000000000 +0100 +--- configure.orig 2007-08-04 04:41:45.000000000 +0200 +++ configure -@@ -925,6 +925,7 @@ G_MODULE_PLUGIN_LIBS +@@ -929,6 +929,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.33 2007/03/20 15:33:59 drochner Exp $ G_MODULE_NEED_USCORE GLIB_DEBUG_FLAGS GSPAWN -@@ -35674,6 +35675,7 @@ else +@@ -36706,6 +36707,7 @@ else fi G_MODULE_NEED_USCORE=0 G_MODULE_BROKEN_RTLD_GLOBAL=0 @@ -18,12 +18,12 @@ $NetBSD: patch-aa,v 1.33 2007/03/20 15:33:59 drochner Exp $ G_MODULE_HAVE_DLERROR=0 if test -z "$G_MODULE_IMPL"; then case "$host" in -@@ -36411,6 +36413,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke - else - G_MODULE_BROKEN_RTLD_GLOBAL=0 - fi -+ echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5 -+echo $ECHO_N "checking for dlopen(NULL, 0) brokenness... $ECHO_C" >&6 +@@ -37629,6 +37631,84 @@ fi + + LIBS="$LIBS_orig" + fi ++ { echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5 ++echo $ECHO_N "checking for dlopen(NULL, 0) brokenness... $ECHO_C" >&6; } +if test "${glib_cv_dlopennull_broken+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else @@ -38,6 +38,7 @@ $NetBSD: patch-aa,v 1.33 2007/03/20 15:33:59 drochner Exp $ +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + ++#include <stdio.h> +#include <dlfcn.h> +#ifndef RTLD_GLOBAL +# define RTLD_GLOBAL 0 @@ -55,15 +56,25 @@ $NetBSD: patch-aa,v 1.33 2007/03/20 15:33:59 drochner Exp $ + handle = dlsym (handle, "gettext"); + return handle == NULL; +} ++ +_ACEOF +rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++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_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 ++ { (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 @@ -76,22 +87,32 @@ $NetBSD: patch-aa,v 1.33 2007/03/20 15:33:59 drochner Exp $ +( exit $ac_status ) +glib_cv_dlopennull_broken=yes +fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi -+ rm -f plugin.c plugin.o plugin.lo ++ ++ + +fi -+echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5 -+echo "${ECHO_T}$glib_cv_dlopennull_broken" >&6 -+ if test "x$glib_cv_dlopennull_broken" = "xyes"; then -+ G_MODULE_BROKEN_DLOPEN_NULL=1 ++{ echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5 ++echo "${ECHO_T}$glib_cv_dlopennull_broken" >&6; } ++ if test "xglib_cv_dlopennull_broken$" = "xyes"; then ++ G_MODULE_BROKEN_DLOPEN_NULL=1 + else -+ G_MODULE_BROKEN_DLOPEN_NULL=0 ++ G_MODULE_BROKEN_DLOPEN_NULL=0 + fi - { echo "$as_me:$LINENO: checking for preceeding underscore in symbols" >&5 - echo $ECHO_N "checking for preceeding underscore in symbols... $ECHO_C" >&6; } - if test "${glib_cv_uscore+set}" = set; then -@@ -37040,126 +37108,8 @@ if test x"$have_threads" != xno; then + if test -z "$G_MODULE_IMPL"; then + G_MODULE_IMPL=0 + G_MODULE_SUPPORTED=false +@@ -37665,6 +37745,8 @@ fi + + + ++ ++ + { echo "$as_me:$LINENO: checking for gspawn implementation" >&5 + echo $ECHO_N "checking for gspawn implementation... $ECHO_C" >&6; } + case "$host" in +@@ -38063,126 +38145,8 @@ if test x"$have_threads" != xno; then G_THREAD_LIBS="-lpthread -lthread" ;; *) @@ -215,12 +236,12 @@ $NetBSD: patch-aa,v 1.33 2007/03/20 15:33:59 drochner Exp $ - break; - fi - done -+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" -+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" ++ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ++ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" ;; esac fi -@@ -39483,6 +39433,10 @@ case $host in +@@ -40506,6 +40470,10 @@ case $host in *) G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" ;; @@ -231,7 +252,7 @@ $NetBSD: patch-aa,v 1.33 2007/03/20 15:33:59 drochner Exp $ esac -@@ -44671,6 +44625,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI +@@ -46139,6 +46107,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 @@ -239,12 +260,28 @@ $NetBSD: patch-aa,v 1.33 2007/03/20 15:33:59 drochner Exp $ G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim GSPAWN!$GSPAWN$ac_delim -@@ -44696,7 +44651,7 @@ GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LI - GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim +@@ -46157,7 +46126,6 @@ ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_ + 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 + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -46199,6 +46167,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 + PCRE_LIBS!$PCRE_LIBS$ac_delim + PCRE_WARN_CFLAGS!$PCRE_WARN_CFLAGS$ac_delim + G_LIBS_EXTRA!$G_LIBS_EXTRA$ac_delim +@@ -46219,7 +46188,7 @@ LIBOBJS!$LIBOBJS$ac_delim + LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak new file mode 100644 index 00000000000..515fb43cfcf --- /dev/null +++ b/devel/glib2/patches/patch-ak @@ -0,0 +1,96 @@ +$NetBSD: patch-ak,v 1.1 2007/08/15 22:09:13 tnn Exp $ + +--- configure.in.orig 2007-08-04 02:50:45.000000000 +0200 ++++ configure.in +@@ -1205,6 +1205,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 ++G_MODULE_BROKEN_DLOPEN_NULL=0 + 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() + [G_MODULE_HAVE_DLERROR=0]) + LIBS="$LIBS_orig" + fi ++dnl *** check for dlopen(NULL, 0) brokenness ++ AC_CACHE_CHECK([for dlopen(NULL, 0) brokenness], ++ glib_cv_dlopennull_broken,[ ++ AC_TRY_RUN([ ++#include <stdio.h> ++#include <dlfcn.h> ++#ifndef RTLD_GLOBAL ++# define RTLD_GLOBAL 0 ++#endif ++#ifndef RTLD_LAZY ++# define RTLD_LAZY 0 ++#endif ++int gettext; ++int main () { ++ void *handle; ++ handle = dlopen ("libintl.so", RTLD_GLOBAL | RTLD_LAZY); ++ if (!handle) return 0; ++ handle = dlopen (NULL, 0); ++ if (!handle) return 0; ++ handle = dlsym (handle, "gettext"); ++ return handle == NULL; ++} ++ ], ++ [glib_cv_dlopennull_broken=no], ++ [glib_cv_dlopennull_broken=yes], ++ [glib_cv_dlopennull_broken=no]) ++ ]) ++ if test "xglib_cv_dlopennull_broken$" = "xyes"; then ++ G_MODULE_BROKEN_DLOPEN_NULL=1 ++ else ++ G_MODULE_BROKEN_DLOPEN_NULL=0 ++ fi + 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) + AC_SUBST(G_MODULE_LDFLAGS) + AC_SUBST(G_MODULE_HAVE_DLERROR) + AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL) ++AC_SUBST(G_MODULE_BROKEN_DLOPEN_NULL) ++ + AC_SUBST(G_MODULE_NEED_USCORE) + AC_SUBST(GLIB_DEBUG_FLAGS) + +@@ -1601,22 +1636,8 @@ if test x"$have_threads" != xno; then + G_THREAD_LIBS="-lpthread -lthread" + ;; + *) +- for flag in pthread pthreads mt; do +- glib_save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -$flag" +- AC_TRY_RUN(glib_thread_test(0), +- glib_flag_works=yes, +- glib_flag_works=no, +- [AC_LINK_IFELSE(glib_thread_test(0), +- glib_flag_works=yes, +- glib_flag_works=no)]) +- CFLAGS="$glib_save_CFLAGS" +- if test $glib_flag_works = yes ; then +- G_THREAD_CFLAGS=-$flag +- G_THREAD_LIBS=-$flag +- break; +- fi +- done ++ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ++ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" + ;; + esac + fi +@@ -1972,6 +1993,10 @@ case $host in + *) + G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" + ;; ++ *-*-netbsd*) ++ # On NetBSD, pkgsrc's libtool does the right thing. ++ G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" ++ ;; + esac + + AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c", |