diff options
-rw-r--r-- | devel/glib2/Makefile | 10 | ||||
-rw-r--r-- | devel/glib2/PLIST | 17 | ||||
-rw-r--r-- | devel/glib2/distinfo | 8 | ||||
-rw-r--r-- | devel/glib2/patches/patch-aa | 28 |
4 files changed, 39 insertions, 24 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 411b8a1c8e9..3863cf2efaf 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.62 2004/12/20 13:05:08 grant Exp $ +# $NetBSD: Makefile,v 1.63 2004/12/24 10:03:27 jmmv Exp $ -DISTNAME= glib-2.4.8 +DISTNAME= glib-2.6.0 PKGNAME= ${DISTNAME:S/glib/glib2/} CATEGORIES= devel -MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.4/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.4/ \ - ${MASTER_SITE_GNOME:=sources/glib/2.4/} +MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.6/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.6/ \ + ${MASTER_SITE_GNOME:=sources/glib/2.6/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST index 54b86048e28..5c231456aa6 100644 --- a/devel/glib2/PLIST +++ b/devel/glib2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2004/10/08 19:18:25 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.21 2004/12/24 10:03:27 jmmv Exp $ bin/glib-genmarshal bin/glib-gettextize bin/glib-mkenums @@ -23,6 +23,7 @@ include/glib/glib-2.0/glib/ghook.h include/glib/glib-2.0/glib/gi18n-lib.h include/glib/glib-2.0/glib/gi18n.h include/glib/glib-2.0/glib/giochannel.h +include/glib/glib-2.0/glib/gkeyfile.h include/glib/glib-2.0/glib/glist.h include/glib/glib-2.0/glib/gmacros.h include/glib/glib-2.0/glib/gmain.h @@ -30,6 +31,7 @@ include/glib/glib-2.0/glib/gmarkup.h include/glib/glib-2.0/glib/gmem.h include/glib/glib-2.0/glib/gmessages.h include/glib/glib-2.0/glib/gnode.h +include/glib/glib-2.0/glib/goption.h include/glib/glib-2.0/glib/gpattern.h include/glib/glib-2.0/glib/gprimes.h include/glib/glib-2.0/glib/gprintf.h @@ -42,6 +44,7 @@ include/glib/glib-2.0/glib/gscanner.h include/glib/glib-2.0/glib/gshell.h include/glib/glib-2.0/glib/gslist.h include/glib/glib-2.0/glib/gspawn.h +include/glib/glib-2.0/glib/gstdio.h include/glib/glib-2.0/glib/gstrfuncs.h include/glib/glib-2.0/glib/gstring.h include/glib/glib-2.0/glib/gthread.h @@ -77,6 +80,7 @@ lib/libgobject-2.0.la lib/libgthread-2.0.la lib/pkgconfig/glib-2.0.pc lib/pkgconfig/gmodule-2.0.pc +lib/pkgconfig/gmodule-no-export-2.0.pc lib/pkgconfig/gobject-2.0.pc lib/pkgconfig/gthread-2.0.pc man/man1/glib-genmarshal.1 @@ -96,6 +100,7 @@ share/doc/glib/glib-Byte-Arrays.html share/doc/glib/glib-Byte-Order-Macros.html share/doc/glib/glib-Caches.html share/doc/glib/glib-Character-Set-Conversion.html +share/doc/glib/glib-Commandline-option-parser.html share/doc/glib/glib-Datasets.html share/doc/glib/glib-Date-and-Time-Functions.html share/doc/glib/glib-Double-ended-Queues.html @@ -108,6 +113,7 @@ share/doc/glib/glib-Hash-Tables.html share/doc/glib/glib-Hook-Functions.html share/doc/glib/glib-I18N.html share/doc/glib/glib-IO-Channels.html +share/doc/glib/glib-Key-value-file-parser.html share/doc/glib/glib-Keyed-Data-Lists.html share/doc/glib/glib-Lexical-Scanner.html share/doc/glib/glib-Limits-of-Basic-Types.html @@ -138,6 +144,7 @@ share/doc/glib/glib-Timers.html share/doc/glib/glib-Trash-Stacks.html share/doc/glib/glib-Type-Conversion-Macros.html share/doc/glib/glib-Unicode-Manipulation.html +share/doc/glib/glib-Version-Information.html share/doc/glib/glib-Warnings-and-Assertions.html share/doc/glib/glib-Windows-Compatability-Functions.html share/doc/glib/glib-building.html @@ -157,6 +164,10 @@ share/doc/glib/home.png share/doc/glib/index.html share/doc/glib/index.sgml share/doc/glib/ix01.html +share/doc/glib/ix02.html +share/doc/glib/ix03.html +share/doc/glib/ix04.html +share/doc/glib/ix05.html share/doc/glib/left.png share/doc/glib/mainloop-states.gif share/doc/glib/right.png @@ -184,6 +195,10 @@ share/doc/gobject/home.png share/doc/gobject/index.html share/doc/gobject/index.sgml share/doc/gobject/ix01.html +share/doc/gobject/ix02.html +share/doc/gobject/ix03.html +share/doc/gobject/ix04.html +share/doc/gobject/ix05.html share/doc/gobject/left.png share/doc/gobject/pr01.html share/doc/gobject/right.png diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 6629c6b5bd9..c99c63d0b28 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.39 2004/12/04 22:17:50 jmmv Exp $ +$NetBSD: distinfo,v 1.40 2004/12/24 10:03:27 jmmv Exp $ -SHA1 (glib-2.4.8.tar.bz2) = 416ad637a3f77d5a0b6f0fc065ec25dd84b48e04 -Size (glib-2.4.8.tar.bz2) = 2152755 bytes -SHA1 (patch-aa) = 2c34a7568876216e21342fb93a0aea0eb30fd327 +SHA1 (glib-2.6.0.tar.bz2) = e0d769aeddb0610926f30ab4c62b9378a38e503e +Size (glib-2.6.0.tar.bz2) = 2257529 bytes +SHA1 (patch-aa) = 05c11f213ce0597b6a3086f4e7f8e2f38b96c940 SHA1 (patch-ab) = a231346877b6246e086312fda107a90dffdd0adb SHA1 (patch-ac) = 5f3d1446a41e71f1bf5556a1dd2a2a04e77d45da SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa index 9d8f5bb5879..c7840e82898 100644 --- a/devel/glib2/patches/patch-aa +++ b/devel/glib2/patches/patch-aa @@ -1,20 +1,20 @@ -$NetBSD: patch-aa,v 1.16 2004/11/12 06:42:19 jlam Exp $ +$NetBSD: patch-aa,v 1.17 2004/12/24 10:03:27 jmmv Exp $ http://bugzilla.gnome.org/show_bug.cgi?id=140329 http://bugzilla.gnome.org/show_bug.cgi?id=141256 ---- configure.orig 2004-10-08 13:59:07.000000000 -0400 +--- configure.orig 2004-12-16 06:10:02.000000000 +0100 +++ configure @@ -465,7 +465,7 @@ ac_includes_default="\ # include <unistd.h> #endif" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot GLIB_MAJOR_VERSION GLIB_MINOR_VERSION GLIB_MICRO_VERSION GLIB_VERSION GLIB_INTERFACE_AGE GLIB_BINARY_AGE LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LT_CURRENT_MINUS_AGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_WIN32_TRUE OS_WIN32_FALSE G_LIB_WIN32_RESOURCE G_MODULE_WIN32_RESOURCE G_OBJECT_WIN32_RESOURCE G_THREAD_WIN32_RESOURCE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE ENABLE_GC_FRIENDLY DISABLE_MEM_POOLS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE HAVE_CXX_TRUE HAVE_CXX_FALSE PKG_CONFIG PERL INDENT REBUILD PERL_PATH CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE ICONV_LIBS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA GLIBC21 HAVE_GOOD_PRINTF_TRUE HAVE_GOOD_PRINTF_FALSE G_MODULE_SUPPORTED G_MODULE_IMPL G_MODULE_LIBS G_MODULE_LIBS_EXTRA G_MODULE_PLUGIN_LIBS G_MODULE_LDFLAGS G_MODULE_HAVE_DLERROR G_MODULE_BROKEN_RTLD_GLOBAL G_MODULE_NEED_USCORE GLIB_DEBUG_FLAGS GSPAWN GIO PLATFORMDEP ENABLE_TIMELOOP_TRUE ENABLE_TIMELOOP_FALSE PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE GTHREAD_COMPILE_IMPL_DEFINES G_THREAD_CFLAGS G_THREAD_LIBS G_THREAD_LIBS_FOR_GTHREAD G_THREAD_LIBS_EXTRA G_LIBS_EXTRA CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE GLIB_GENMARSHAL HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_MAN_TRUE ENABLE_MAN_FALSE LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot GLIB_MAJOR_VERSION GLIB_MINOR_VERSION GLIB_MICRO_VERSION GLIB_VERSION GLIB_INTERFACE_AGE GLIB_BINARY_AGE LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LT_CURRENT_MINUS_AGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_WIN32_TRUE OS_WIN32_FALSE G_LIB_WIN32_RESOURCE G_MODULE_WIN32_RESOURCE G_OBJECT_WIN32_RESOURCE G_THREAD_WIN32_RESOURCE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE ENABLE_GC_FRIENDLY DISABLE_MEM_POOLS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE HAVE_CXX_TRUE HAVE_CXX_FALSE PKG_CONFIG PERL INDENT REBUILD PERL_PATH CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE ICONV_LIBS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA GLIBC21 HAVE_GOOD_PRINTF_TRUE HAVE_GOOD_PRINTF_FALSE G_MODULE_SUPPORTED G_MODULE_IMPL G_MODULE_LIBS G_MODULE_LIBS_EXTRA G_MODULE_PLUGIN_LIBS G_MODULE_LDFLAGS G_MODULE_HAVE_DLERROR G_MODULE_BROKEN_RTLD_GLOBAL G_MODULE_BROKEN_DLOPEN_NULL G_MODULE_NEED_USCORE GLIB_DEBUG_FLAGS GSPAWN GIO PLATFORMDEP ENABLE_TIMELOOP_TRUE ENABLE_TIMELOOP_FALSE PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE GTHREAD_COMPILE_IMPL_DEFINES G_THREAD_CFLAGS G_THREAD_LIBS G_THREAD_LIBS_FOR_GTHREAD G_THREAD_LIBS_EXTRA G_LIBS_EXTRA CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE GLIB_GENMARSHAL HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_MAN_TRUE ENABLE_MAN_FALSE LIBOBJS LTLIBOBJS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot GLIB_MAJOR_VERSION GLIB_MINOR_VERSION GLIB_MICRO_VERSION GLIB_VERSION GLIB_INTERFACE_AGE GLIB_BINARY_AGE LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LT_CURRENT_MINUS_AGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_WIN32_TRUE OS_WIN32_FALSE OS_UNIX_TRUE OS_UNIX_FALSE G_LIB_WIN32_RESOURCE G_MODULE_WIN32_RESOURCE G_OBJECT_WIN32_RESOURCE G_THREAD_WIN32_RESOURCE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE LIBTOOL_EXPORT_OPTIONS ENABLE_GC_FRIENDLY DISABLE_MEM_POOLS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE HAVE_CXX_TRUE HAVE_CXX_FALSE PKG_CONFIG PERL INDENT REBUILD PERL_PATH CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE ICONV_LIBS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA GLIBC21 HAVE_GOOD_PRINTF_TRUE HAVE_GOOD_PRINTF_FALSE G_MODULE_SUPPORTED G_MODULE_IMPL G_MODULE_LIBS G_MODULE_LIBS_EXTRA G_MODULE_PLUGIN_LIBS G_MODULE_LDFLAGS G_MODULE_HAVE_DLERROR G_MODULE_BROKEN_RTLD_GLOBAL G_MODULE_NEED_USCORE GLIB_DEBUG_FLAGS GSPAWN GIO PLATFORMDEP ENABLE_TIMELOOP_TRUE ENABLE_TIMELOOP_FALSE PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE GTHREAD_COMPILE_IMPL_DEFINES G_THREAD_CFLAGS G_THREAD_LIBS G_THREAD_LIBS_FOR_GTHREAD G_THREAD_LIBS_EXTRA G_LIBS_EXTRA CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE GLIB_GENMARSHAL HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_MAN_TRUE ENABLE_MAN_FALSE LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot GLIB_MAJOR_VERSION GLIB_MINOR_VERSION GLIB_MICRO_VERSION GLIB_VERSION GLIB_INTERFACE_AGE GLIB_BINARY_AGE LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LT_CURRENT_MINUS_AGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_WIN32_TRUE OS_WIN32_FALSE OS_UNIX_TRUE OS_UNIX_FALSE G_LIB_WIN32_RESOURCE G_MODULE_WIN32_RESOURCE G_OBJECT_WIN32_RESOURCE G_THREAD_WIN32_RESOURCE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE LIBTOOL_EXPORT_OPTIONS ENABLE_GC_FRIENDLY DISABLE_MEM_POOLS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE HAVE_CXX_TRUE HAVE_CXX_FALSE PKG_CONFIG PERL INDENT REBUILD PERL_PATH CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE ICONV_LIBS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA GLIBC21 HAVE_GOOD_PRINTF_TRUE HAVE_GOOD_PRINTF_FALSE G_MODULE_SUPPORTED G_MODULE_IMPL G_MODULE_LIBS G_MODULE_LIBS_EXTRA G_MODULE_PLUGIN_LIBS G_MODULE_LDFLAGS G_MODULE_HAVE_DLERROR G_MODULE_BROKEN_RTLD_GLOBAL G_MODULE_BROKEN_DLOPEN_NULL G_MODULE_NEED_USCORE GLIB_DEBUG_FLAGS GSPAWN GIO PLATFORMDEP ENABLE_TIMELOOP_TRUE ENABLE_TIMELOOP_FALSE PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE GTHREAD_COMPILE_IMPL_DEFINES G_THREAD_CFLAGS G_THREAD_LIBS G_THREAD_LIBS_FOR_GTHREAD G_THREAD_LIBS_EXTRA G_LIBS_EXTRA CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE GLIB_GENMARSHAL HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_MAN_TRUE ENABLE_MAN_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. -@@ -30430,6 +30430,7 @@ else +@@ -30798,6 +30798,7 @@ else fi G_MODULE_NEED_USCORE=0 G_MODULE_BROKEN_RTLD_GLOBAL=0 @@ -22,7 +22,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256 G_MODULE_HAVE_DLERROR=0 if test -z "$G_MODULE_IMPL"; then case "$host" in -@@ -31083,6 +31084,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke +@@ -31451,6 +31452,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke else G_MODULE_BROKEN_RTLD_GLOBAL=0 fi @@ -95,7 +95,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256 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 -@@ -31712,9 +31779,33 @@ if test x"$have_threads" != xno; then +@@ -32080,9 +32147,33 @@ if test x"$have_threads" != xno; then # skip cygwin -pthread or -pthreads test ;; *) @@ -131,7 +131,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256 if test "$cross_compiling" = yes; then cat >conftest.$ac_ext <<_ACEOF -@@ -31803,10 +31894,12 @@ rm -f core *.core gmon.out bb.out confte +@@ -32171,10 +32262,12 @@ rm -f core *.core gmon.out bb.out confte fi CFLAGS="$glib_save_CFLAGS" if test $glib_flag_works = yes ; then @@ -146,7 +146,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256 ;; esac fi -@@ -31869,6 +31962,15 @@ fi +@@ -32237,6 +32330,15 @@ fi fi @@ -162,7 +162,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256 # if we are not finding the localtime_r function, then we probably are # not using the proper multithread flag -@@ -34184,6 +34286,10 @@ case $host in +@@ -34551,6 +34653,10 @@ case $host in *-*-linux*) G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`" ;; @@ -170,10 +170,10 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256 + # On NetBSD, pkgsrc's libtool does the right thing. + G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" + ;; - *) - G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-Wc,-pthread/`" - ;; -@@ -38406,6 +38512,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI + esac + + +@@ -38783,6 +38889,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI s,@G_MODULE_LDFLAGS@,$G_MODULE_LDFLAGS,;t t s,@G_MODULE_HAVE_DLERROR@,$G_MODULE_HAVE_DLERROR,;t t s,@G_MODULE_BROKEN_RTLD_GLOBAL@,$G_MODULE_BROKEN_RTLD_GLOBAL,;t t |