summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/glib2/Makefile12
-rw-r--r--devel/glib2/PLIST40
-rw-r--r--devel/glib2/distinfo13
-rw-r--r--devel/glib2/patches/patch-aa31
-rw-r--r--devel/glib2/patches/patch-ah12
-rw-r--r--devel/glib2/patches/patch-ai230
6 files changed, 73 insertions, 265 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index a2659d5c2d2..7269c804609 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.81 2005/09/28 20:52:19 rillig Exp $
+# $NetBSD: Makefile,v 1.82 2005/10/02 12:15:09 jmmv Exp $
-DISTNAME= glib-2.6.6
+DISTNAME= glib-2.8.2
PKGNAME= ${DISTNAME:S/glib/glib2/}
-PKGREVISION= 1
CATEGORIES= devel
-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/}
+MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.8/ \
+ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.8/ \
+ ${MASTER_SITE_GNOME:=sources/glib/2.8/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jmmv@NetBSD.org
@@ -27,6 +26,7 @@ PKGCONFIG_OVERRIDE+= glib-2.0.pc.in
PKGCONFIG_OVERRIDE+= gmodule-2.0-uninstalled.pc.in
PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in
PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in
+PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0-uninstalled.pc.in
PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in
PKGCONFIG_OVERRIDE+= gobject-2.0-uninstalled.pc.in
PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 7543fde1a6c..d1ed5ca5b12 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2005/08/03 16:50:15 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.27 2005/10/02 12:15:09 jmmv Exp $
bin/glib-genmarshal
bin/glib-gettextize
bin/glib-mkenums
@@ -27,6 +27,7 @@ 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
+include/glib/glib-2.0/glib/gmappedfile.h
include/glib/glib-2.0/glib/gmarkup.h
include/glib/glib-2.0/glib/gmem.h
include/glib/glib-2.0/glib/gmessages.h
@@ -80,6 +81,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-export-2.0.pc
lib/pkgconfig/gmodule-no-export-2.0.pc
lib/pkgconfig/gobject-2.0.pc
lib/pkgconfig/gthread-2.0.pc
@@ -168,6 +170,7 @@ share/doc/glib/ix02.html
share/doc/glib/ix03.html
share/doc/glib/ix04.html
share/doc/glib/ix05.html
+share/doc/glib/ix06.html
share/doc/glib/left.png
share/doc/glib/mainloop-states.gif
share/doc/glib/right.png
@@ -176,8 +179,17 @@ share/doc/glib/tools.html
share/doc/glib/up.png
share/doc/gobject/GTypeModule.html
share/doc/gobject/GTypePlugin.html
+share/doc/gobject/ch01.html
+share/doc/gobject/ch01s02.html
+share/doc/gobject/ch02.html
+share/doc/gobject/ch06s03.html
+share/doc/gobject/ch07s02.html
+share/doc/gobject/ch07s03.html
+share/doc/gobject/chapter-gobject.html
+share/doc/gobject/chapter-signal.html
share/doc/gobject/glib-genmarshal.html
share/doc/gobject/glib-mkenums.html
+share/doc/gobject/glue.png
share/doc/gobject/gobject-Boxed-Types.html
share/doc/gobject/gobject-Closures.html
share/doc/gobject/gobject-Enumeration-and-Flag-Types.html
@@ -189,9 +201,25 @@ share/doc/gobject/gobject-The-Base-Object-Type.html
share/doc/gobject/gobject-Type-Information.html
share/doc/gobject/gobject-Value-arrays.html
share/doc/gobject/gobject-Varargs-Value-Collection.html
+share/doc/gobject/gobject-memory.html
+share/doc/gobject/gobject-properties.html
share/doc/gobject/gobject-query.html
share/doc/gobject/gobject.devhelp
+share/doc/gobject/gtype-conventions.html
+share/doc/gobject/gtype-instantiable-classed.html
+share/doc/gobject/gtype-non-instantiable-classed.html
+share/doc/gobject/gtype-non-instantiable.html
share/doc/gobject/home.png
+share/doc/gobject/howto-gobject-chainup.html
+share/doc/gobject/howto-gobject-code.html
+share/doc/gobject/howto-gobject-construction.html
+share/doc/gobject/howto-gobject-destruction.html
+share/doc/gobject/howto-gobject-methods.html
+share/doc/gobject/howto-gobject.html
+share/doc/gobject/howto-interface-implement.html
+share/doc/gobject/howto-interface-properties.html
+share/doc/gobject/howto-interface.html
+share/doc/gobject/howto-signals.html
share/doc/gobject/index.html
share/doc/gobject/index.sgml
share/doc/gobject/ix01.html
@@ -199,12 +227,21 @@ share/doc/gobject/ix02.html
share/doc/gobject/ix03.html
share/doc/gobject/ix04.html
share/doc/gobject/ix05.html
+share/doc/gobject/ix06.html
share/doc/gobject/left.png
share/doc/gobject/pr01.html
+share/doc/gobject/pt01.html
+share/doc/gobject/pt02.html
+share/doc/gobject/pt03.html
share/doc/gobject/right.png
share/doc/gobject/rn01.html
share/doc/gobject/rn02.html
+share/doc/gobject/signal.html
share/doc/gobject/style.css
+share/doc/gobject/tools-ginspector.html
+share/doc/gobject/tools-gob.html
+share/doc/gobject/tools-gtkdoc.html
+share/doc/gobject/tools-refdb.html
share/doc/gobject/up.png
share/glib-2.0/gettext/mkinstalldirs
share/glib-2.0/gettext/po/Makefile.in.in
@@ -269,6 +306,7 @@ ${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/glib20.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/glib20.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/glib20.mo
${PKGLOCALEDIR}/locale/te/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/glib20.mo
${PKGLOCALEDIR}/locale/tl/LC_MESSAGES/glib20.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/glib20.mo
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/glib20.mo
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index a41f75c1144..689ddad5011 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.52 2005/08/09 22:20:02 jmmv Exp $
+$NetBSD: distinfo,v 1.53 2005/10/02 12:15:09 jmmv Exp $
-SHA1 (glib-2.6.6.tar.bz2) = 6bb8860bd29a83964ee66ad53ae3e4950aa2677f
-RMD160 (glib-2.6.6.tar.bz2) = 747a9bafea1966cd2855d8a1411ece922f68c705
-Size (glib-2.6.6.tar.bz2) = 2380899 bytes
-SHA1 (patch-aa) = 0a2543638dbd026ad697d0a4079e71a51604ae00
+SHA1 (glib-2.8.2.tar.bz2) = 26760dd7e90f72a8a738bcb03ee2d364959e4369
+RMD160 (glib-2.8.2.tar.bz2) = 9ad71c3a9ff62953b32745762502260232f669c5
+Size (glib-2.8.2.tar.bz2) = 2562146 bytes
+SHA1 (patch-aa) = cd96d401cc6c7d34addf5f9f5c2632a75476af07
SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
SHA1 (patch-af) = ee7a8ed0585cdfaf23db01d4d57d98db555c6849
SHA1 (patch-ag) = 3917075e80139e0bd937ee9c2b42745fa6e69747
-SHA1 (patch-ah) = e30ef18e474699d2b2cf3e7d1c9f36062fad1c73
-SHA1 (patch-ai) = 48faa122a9d5323b75021bf9cc061fb799be9032
+SHA1 (patch-ah) = 3b3ddc65ba62982be48ec0a5622cefe3adb4364a
SHA1 (patch-aj) = 2b859be9a31f4ca569041c01440c6b2125be2ec5
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 0cde9cc1698..2d267f69452 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.20 2005/04/15 12:54:38 wiz Exp $
+$NetBSD: patch-aa,v 1.21 2005/10/02 12:15:10 jmmv Exp $
http://bugzilla.gnome.org/show_bug.cgi?id=140329
http://bugzilla.gnome.org/show_bug.cgi?id=141256
---- configure.orig 2005-04-06 16:20:47.000000000 +0200
+--- configure.orig 2005-09-26 18:23:37.000000000 +0200
+++ 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 OS_UNIX_TRUE OS_UNIX_FALSE OS_LINUX_TRUE OS_LINUX_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 NM ac_ct_NM RANLIB ac_ct_RANLIB 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 DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA HAVE_GNUC_VISIBILITY_TRUE HAVE_GNUC_VISIBILITY_FALSE 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 OS_LINUX_TRUE OS_LINUX_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 NM ac_ct_NM RANLIB ac_ct_RANLIB 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 DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA HAVE_GNUC_VISIBILITY_TRUE HAVE_GNUC_VISIBILITY_FALSE 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 OS_LINUX_TRUE OS_LINUX_FALSE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP WINDRES ac_ct_WINDRES NM ac_ct_NM RANLIB ac_ct_RANLIB 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 GLIBC21 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 DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA HAVE_GNUC_VISIBILITY_TRUE HAVE_GNUC_VISIBILITY_FALSE 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 OS_LINUX_TRUE OS_LINUX_FALSE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP WINDRES ac_ct_WINDRES NM ac_ct_NM RANLIB ac_ct_RANLIB 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 GLIBC21 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 DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA HAVE_GNUC_VISIBILITY_TRUE HAVE_GNUC_VISIBILITY_FALSE 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.
-@@ -31222,6 +31222,7 @@ else
+@@ -32535,6 +32535,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
-@@ -31875,6 +31876,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
+@@ -33188,6 +33189,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
else
G_MODULE_BROKEN_RTLD_GLOBAL=0
fi
@@ -95,11 +95,11 @@ 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
-@@ -32504,9 +32571,33 @@ if test x"$have_threads" != xno; then
+@@ -33817,9 +33884,34 @@ if test x"$have_threads" != xno; then
# skip cygwin -pthread or -pthreads test
;;
*)
-- for flag in pthread pthreads; do
+- for flag in pthread pthreads mt; do
+ case $LDFLAGS in
+ -lpthread|*" -lpthread"|*" -lpthread "*)
+ G_THREAD_LIBS=-lpthread
@@ -111,7 +111,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
+ case $CFLAGS in
+ -pthread|*" -pthread"|*" -pthread "*)
+ G_THREAD_CFLAGS=-pthread
-+ G_THREAD_LIBS=-pthread
++ G_THREAD_LIBS=-pthread
+ ;;
+ -pthreads|*" -pthreads"|*" -pthreads "*)
+ G_THREAD_CFLAGS=-pthreads
@@ -120,18 +120,19 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
+ esac
+ if test x"$G_THREAD_CFLAGS" = x; then
+
-+ for flag in pthreads pthread ""; do
++ for flag in pthreads pthread mt ""; do
+ case $flag in
+ "") flag= ;;
-+ *) flag="-$flag" ;;
++ *) flag="-$flag" ;;
+ esac
++
glib_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -$flag"
+ CFLAGS="$CFLAGS $flag"
if test "$cross_compiling" = yes; then
cat >conftest.$ac_ext <<_ACEOF
-@@ -32595,10 +32686,12 @@ rm -f core *.core gmon.out bb.out confte
+@@ -33908,10 +34000,12 @@ rm -f core *.core gmon.out bb.out confte
fi
CFLAGS="$glib_save_CFLAGS"
if test $glib_flag_works = yes ; then
@@ -146,7 +147,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
;;
esac
fi
-@@ -32661,6 +32754,15 @@ fi
+@@ -33974,6 +34068,15 @@ fi
fi
@@ -162,7 +163,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
-@@ -34978,6 +35080,10 @@ case $host in
+@@ -36291,6 +36394,10 @@ case $host in
*)
G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
;;
@@ -173,7 +174,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
esac
-@@ -39237,6 +39343,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
+@@ -40561,6 +40668,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
diff --git a/devel/glib2/patches/patch-ah b/devel/glib2/patches/patch-ah
index 15381bf51fe..06043668d86 100644
--- a/devel/glib2/patches/patch-ah
+++ b/devel/glib2/patches/patch-ah
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.2 2005/04/15 12:54:38 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2005/10/02 12:15:10 jmmv Exp $
---- glib/gutils.c.orig 2005-03-23 15:55:02.000000000 +0100
+--- glib/gutils.c.orig 2005-08-31 22:59:34.000000000 +0200
+++ glib/gutils.c
-@@ -1929,7 +1929,7 @@ g_get_system_data_dirs (void)
- data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
+@@ -2351,7 +2351,7 @@ g_get_system_data_dirs (void)
+ gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
if (!data_dirs || !data_dirs[0])
- data_dirs = "/usr/local/share/:/usr/share/";
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.2 2005/04/15 12:54:38 wiz Exp $
data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif
-@@ -1983,7 +1983,7 @@ g_get_system_config_dirs (void)
+@@ -2405,7 +2405,7 @@ g_get_system_config_dirs (void)
conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
if (!conf_dirs || !conf_dirs[0])
@@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.2 2005/04/15 12:54:38 wiz Exp $
conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif
-@@ -2059,7 +2059,7 @@ unalias_lang (char *lang)
+@@ -2486,7 +2486,7 @@ unalias_lang (char *lang)
int i;
if (!alias_table)
diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai
deleted file mode 100644
index b6ae394a090..00000000000
--- a/devel/glib2/patches/patch-ai
+++ /dev/null
@@ -1,230 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2005/08/09 22:20:02 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=312485
-
-Index: gobject/gvaluetransform.c
-===================================================================
-RCS file: /cvs/gnome/glib/gobject/gvaluetransform.c,v
-retrieving revision 1.12
-diff -u -r1.12 gvaluetransform.c
---- gobject/gvaluetransform.c 14 Mar 2005 06:47:51 -0000 1.12
-+++ gobject/gvaluetransform.c 9 Aug 2005 13:50:02 -0000
-@@ -191,12 +191,12 @@
- GValue *dest_value)
- {
- GEnumClass *class = g_type_class_ref (G_VALUE_TYPE (src_value));
-- GEnumValue *enum_value = g_enum_get_value (class, src_value->data[0].v_int);
-+ GEnumValue *enum_value = g_enum_get_value (class, src_value->data[0].v_long);
-
- if (enum_value)
- dest_value->data[0].v_pointer = g_strdup (enum_value->value_name);
- else
-- dest_value->data[0].v_pointer = g_strdup_printf ("%d", src_value->data[0].v_int);
-+ dest_value->data[0].v_pointer = g_strdup_printf ("%ld", src_value->data[0].v_long);
-
- g_type_class_unref (class);
- }
-@@ -205,12 +205,12 @@
- GValue *dest_value)
- {
- GFlagsClass *class = g_type_class_ref (G_VALUE_TYPE (src_value));
-- GFlagsValue *flags_value = g_flags_get_first_value (class, src_value->data[0].v_uint);
-+ GFlagsValue *flags_value = g_flags_get_first_value (class, src_value->data[0].v_ulong);
-
- if (flags_value)
- {
- GString *gstring = g_string_new (NULL);
-- guint v_flags = src_value->data[0].v_uint;
-+ guint v_flags = src_value->data[0].v_ulong;
-
- do
- {
-@@ -232,7 +232,7 @@
- g_string_free (gstring, TRUE);
- }
- else
-- dest_value->data[0].v_pointer = g_strdup_printf ("%u", src_value->data[0].v_uint);
-+ dest_value->data[0].v_pointer = g_strdup_printf ("%lu", src_value->data[0].v_ulong);
-
- g_type_class_unref (class);
- }
-@@ -259,8 +259,8 @@
- g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_ULONG, value_transform_int_ulong);
- g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_INT64, value_transform_int_int64);
- g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_UINT64, value_transform_int_uint64);
-- g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_ENUM, value_transform_int_int);
-- g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_FLAGS, value_transform_int_uint);
-+ g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_ENUM, value_transform_int_long);
-+ g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_FLAGS, value_transform_int_ulong);
- g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_FLOAT, value_transform_int_float);
- g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_DOUBLE, value_transform_int_double);
- g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_STRING, value_transform_int_string);
-@@ -273,8 +273,8 @@
- g_value_register_transform_func (G_TYPE_UCHAR, G_TYPE_ULONG, value_transform_uint_ulong);
- g_value_register_transform_func (G_TYPE_UCHAR, G_TYPE_INT64, value_transform_uint_int64);
- g_value_register_transform_func (G_TYPE_UCHAR, G_TYPE_UINT64, value_transform_uint_uint64);
-- g_value_register_transform_func (G_TYPE_UCHAR, G_TYPE_ENUM, value_transform_uint_int);
-- g_value_register_transform_func (G_TYPE_UCHAR, G_TYPE_FLAGS, value_transform_uint_uint);
-+ g_value_register_transform_func (G_TYPE_UCHAR, G_TYPE_ENUM, value_transform_uint_long);
-+ g_value_register_transform_func (G_TYPE_UCHAR, G_TYPE_FLAGS, value_transform_uint_ulong);
- g_value_register_transform_func (G_TYPE_UCHAR, G_TYPE_FLOAT, value_transform_uint_float);
- g_value_register_transform_func (G_TYPE_UCHAR, G_TYPE_DOUBLE, value_transform_uint_double);
- g_value_register_transform_func (G_TYPE_UCHAR, G_TYPE_STRING, value_transform_uint_string);
-@@ -287,8 +287,8 @@
- g_value_register_transform_func (G_TYPE_BOOLEAN, G_TYPE_ULONG, value_transform_int_ulong);
- g_value_register_transform_func (G_TYPE_BOOLEAN, G_TYPE_INT64, value_transform_int_int64);
- g_value_register_transform_func (G_TYPE_BOOLEAN, G_TYPE_UINT64, value_transform_int_uint64);
-- g_value_register_transform_func (G_TYPE_BOOLEAN, G_TYPE_ENUM, value_transform_int_int);
-- g_value_register_transform_func (G_TYPE_BOOLEAN, G_TYPE_FLAGS, value_transform_int_uint);
-+ g_value_register_transform_func (G_TYPE_BOOLEAN, G_TYPE_ENUM, value_transform_int_long);
-+ g_value_register_transform_func (G_TYPE_BOOLEAN, G_TYPE_FLAGS, value_transform_int_ulong);
- SKIP____register_transform_func (G_TYPE_BOOLEAN, G_TYPE_FLOAT, value_transform_int_float);
- SKIP____register_transform_func (G_TYPE_BOOLEAN, G_TYPE_DOUBLE, value_transform_int_double);
- g_value_register_transform_func (G_TYPE_BOOLEAN, G_TYPE_STRING, value_transform_bool_string);
-@@ -301,8 +301,8 @@
- g_value_register_transform_func (G_TYPE_INT, G_TYPE_ULONG, value_transform_int_ulong);
- g_value_register_transform_func (G_TYPE_INT, G_TYPE_INT64, value_transform_int_int64);
- g_value_register_transform_func (G_TYPE_INT, G_TYPE_UINT64, value_transform_int_uint64);
-- g_value_register_transform_func (G_TYPE_INT, G_TYPE_ENUM, value_transform_int_int);
-- g_value_register_transform_func (G_TYPE_INT, G_TYPE_FLAGS, value_transform_int_uint);
-+ g_value_register_transform_func (G_TYPE_INT, G_TYPE_ENUM, value_transform_int_long);
-+ g_value_register_transform_func (G_TYPE_INT, G_TYPE_FLAGS, value_transform_int_ulong);
- g_value_register_transform_func (G_TYPE_INT, G_TYPE_FLOAT, value_transform_int_float);
- g_value_register_transform_func (G_TYPE_INT, G_TYPE_DOUBLE, value_transform_int_double);
- g_value_register_transform_func (G_TYPE_INT, G_TYPE_STRING, value_transform_int_string);
-@@ -315,8 +315,8 @@
- g_value_register_transform_func (G_TYPE_UINT, G_TYPE_ULONG, value_transform_uint_ulong);
- g_value_register_transform_func (G_TYPE_UINT, G_TYPE_INT64, value_transform_uint_int64);
- g_value_register_transform_func (G_TYPE_UINT, G_TYPE_UINT64, value_transform_uint_uint64);
-- g_value_register_transform_func (G_TYPE_UINT, G_TYPE_ENUM, value_transform_uint_int);
-- g_value_register_transform_func (G_TYPE_UINT, G_TYPE_FLAGS, value_transform_uint_uint);
-+ g_value_register_transform_func (G_TYPE_UINT, G_TYPE_ENUM, value_transform_uint_long);
-+ g_value_register_transform_func (G_TYPE_UINT, G_TYPE_FLAGS, value_transform_uint_ulong);
- g_value_register_transform_func (G_TYPE_UINT, G_TYPE_FLOAT, value_transform_uint_float);
- g_value_register_transform_func (G_TYPE_UINT, G_TYPE_DOUBLE, value_transform_uint_double);
- g_value_register_transform_func (G_TYPE_UINT, G_TYPE_STRING, value_transform_uint_string);
-@@ -329,8 +329,8 @@
- g_value_register_transform_func (G_TYPE_LONG, G_TYPE_ULONG, value_transform_long_ulong);
- g_value_register_transform_func (G_TYPE_LONG, G_TYPE_INT64, value_transform_long_int64);
- g_value_register_transform_func (G_TYPE_LONG, G_TYPE_UINT64, value_transform_long_uint64);
-- g_value_register_transform_func (G_TYPE_LONG, G_TYPE_ENUM, value_transform_long_int);
-- g_value_register_transform_func (G_TYPE_LONG, G_TYPE_FLAGS, value_transform_long_uint);
-+ g_value_register_transform_func (G_TYPE_LONG, G_TYPE_ENUM, value_transform_long_long);
-+ g_value_register_transform_func (G_TYPE_LONG, G_TYPE_FLAGS, value_transform_long_ulong);
- g_value_register_transform_func (G_TYPE_LONG, G_TYPE_FLOAT, value_transform_long_float);
- g_value_register_transform_func (G_TYPE_LONG, G_TYPE_DOUBLE, value_transform_long_double);
- g_value_register_transform_func (G_TYPE_LONG, G_TYPE_STRING, value_transform_long_string);
-@@ -343,8 +343,8 @@
- g_value_register_transform_func (G_TYPE_ULONG, G_TYPE_ULONG, value_transform_ulong_ulong);
- g_value_register_transform_func (G_TYPE_ULONG, G_TYPE_INT64, value_transform_ulong_int64);
- g_value_register_transform_func (G_TYPE_ULONG, G_TYPE_UINT64, value_transform_ulong_uint64);
-- g_value_register_transform_func (G_TYPE_ULONG, G_TYPE_ENUM, value_transform_ulong_int);
-- g_value_register_transform_func (G_TYPE_ULONG, G_TYPE_FLAGS, value_transform_ulong_uint);
-+ g_value_register_transform_func (G_TYPE_ULONG, G_TYPE_ENUM, value_transform_ulong_long);
-+ g_value_register_transform_func (G_TYPE_ULONG, G_TYPE_FLAGS, value_transform_ulong_ulong);
- g_value_register_transform_func (G_TYPE_ULONG, G_TYPE_FLOAT, value_transform_ulong_float);
- g_value_register_transform_func (G_TYPE_ULONG, G_TYPE_DOUBLE, value_transform_ulong_double);
- g_value_register_transform_func (G_TYPE_ULONG, G_TYPE_STRING, value_transform_ulong_string);
-@@ -357,8 +357,8 @@
- g_value_register_transform_func (G_TYPE_INT64, G_TYPE_ULONG, value_transform_int64_ulong);
- g_value_register_transform_func (G_TYPE_INT64, G_TYPE_INT64, value_transform_int64_int64);
- g_value_register_transform_func (G_TYPE_INT64, G_TYPE_UINT64, value_transform_int64_uint64);
-- g_value_register_transform_func (G_TYPE_INT64, G_TYPE_ENUM, value_transform_int64_int);
-- g_value_register_transform_func (G_TYPE_INT64, G_TYPE_FLAGS, value_transform_int64_uint);
-+ g_value_register_transform_func (G_TYPE_INT64, G_TYPE_ENUM, value_transform_int64_long);
-+ g_value_register_transform_func (G_TYPE_INT64, G_TYPE_FLAGS, value_transform_int64_ulong);
- g_value_register_transform_func (G_TYPE_INT64, G_TYPE_FLOAT, value_transform_int64_float);
- g_value_register_transform_func (G_TYPE_INT64, G_TYPE_DOUBLE, value_transform_int64_double);
- g_value_register_transform_func (G_TYPE_INT64, G_TYPE_STRING, value_transform_int64_string);
-@@ -371,41 +371,41 @@
- g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_ULONG, value_transform_uint64_ulong);
- g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_INT64, value_transform_uint64_int64);
- g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_UINT64, value_transform_uint64_uint64);
-- g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_ENUM, value_transform_uint64_int);
-- g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_FLAGS, value_transform_uint64_uint);
-+ g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_ENUM, value_transform_uint64_long);
-+ g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_FLAGS, value_transform_uint64_ulong);
- #ifndef _MSC_VER
- /* required casts unsupported with msvc 5.0 */
- g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_FLOAT, value_transform_uint64_float);
- g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_DOUBLE, value_transform_uint64_double);
- #endif
- g_value_register_transform_func (G_TYPE_UINT64, G_TYPE_STRING, value_transform_uint64_string);
-- g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_CHAR, value_transform_int_s8);
-- g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_UCHAR, value_transform_int_u8);
-- SKIP____register_transform_func (G_TYPE_ENUM, G_TYPE_BOOLEAN, value_transform_int_bool);
-- g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_INT, value_transform_int_int);
-- g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_UINT, value_transform_int_uint);
-- g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_LONG, value_transform_int_long);
-- g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_ULONG, value_transform_int_ulong);
-- g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_INT64, value_transform_int_int64);
-- g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_UINT64, value_transform_int_uint64);
-- g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_ENUM, value_transform_int_int);
-- g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_FLAGS, value_transform_int_uint);
-- SKIP____register_transform_func (G_TYPE_ENUM, G_TYPE_FLOAT, value_transform_int_float);
-- SKIP____register_transform_func (G_TYPE_ENUM, G_TYPE_DOUBLE, value_transform_int_double);
-+ g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_CHAR, value_transform_long_s8);
-+ g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_UCHAR, value_transform_long_u8);
-+ SKIP____register_transform_func (G_TYPE_ENUM, G_TYPE_BOOLEAN, value_transform_long_bool);
-+ g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_INT, value_transform_long_int);
-+ g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_UINT, value_transform_long_uint);
-+ g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_LONG, value_transform_long_long);
-+ g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_ULONG, value_transform_long_ulong);
-+ g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_INT64, value_transform_long_int64);
-+ g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_UINT64, value_transform_long_uint64);
-+ g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_ENUM, value_transform_long_long);
-+ g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_FLAGS, value_transform_long_ulong);
-+ SKIP____register_transform_func (G_TYPE_ENUM, G_TYPE_FLOAT, value_transform_long_float);
-+ SKIP____register_transform_func (G_TYPE_ENUM, G_TYPE_DOUBLE, value_transform_long_double);
- g_value_register_transform_func (G_TYPE_ENUM, G_TYPE_STRING, value_transform_enum_string);
-- g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_CHAR, value_transform_uint_s8);
-- g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_UCHAR, value_transform_uint_u8);
-- SKIP____register_transform_func (G_TYPE_FLAGS, G_TYPE_BOOLEAN, value_transform_uint_bool);
-- g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_INT, value_transform_uint_int);
-- g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_UINT, value_transform_uint_uint);
-- g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_LONG, value_transform_uint_long);
-- g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_ULONG, value_transform_uint_ulong);
-- g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_INT64, value_transform_uint_int64);
-- g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_UINT64, value_transform_uint_uint64);
-- SKIP____register_transform_func (G_TYPE_FLAGS, G_TYPE_ENUM, value_transform_uint_int);
-- g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_FLAGS, value_transform_uint_uint);
-- SKIP____register_transform_func (G_TYPE_FLAGS, G_TYPE_FLOAT, value_transform_uint_float);
-- SKIP____register_transform_func (G_TYPE_FLAGS, G_TYPE_DOUBLE, value_transform_uint_double);
-+ g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_CHAR, value_transform_ulong_s8);
-+ g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_UCHAR, value_transform_ulong_u8);
-+ SKIP____register_transform_func (G_TYPE_FLAGS, G_TYPE_BOOLEAN, value_transform_ulong_bool);
-+ g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_INT, value_transform_ulong_int);
-+ g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_UINT, value_transform_ulong_uint);
-+ g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_LONG, value_transform_ulong_long);
-+ g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_ULONG, value_transform_ulong_ulong);
-+ g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_INT64, value_transform_ulong_int64);
-+ g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_UINT64, value_transform_ulong_uint64);
-+ SKIP____register_transform_func (G_TYPE_FLAGS, G_TYPE_ENUM, value_transform_ulong_long);
-+ g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_FLAGS, value_transform_ulong_ulong);
-+ SKIP____register_transform_func (G_TYPE_FLAGS, G_TYPE_FLOAT, value_transform_ulong_float);
-+ SKIP____register_transform_func (G_TYPE_FLAGS, G_TYPE_DOUBLE, value_transform_ulong_double);
- g_value_register_transform_func (G_TYPE_FLAGS, G_TYPE_STRING, value_transform_flags_string);
- g_value_register_transform_func (G_TYPE_FLOAT, G_TYPE_CHAR, value_transform_float_s8);
- g_value_register_transform_func (G_TYPE_FLOAT, G_TYPE_UCHAR, value_transform_float_u8);
-@@ -416,8 +416,8 @@
- g_value_register_transform_func (G_TYPE_FLOAT, G_TYPE_ULONG, value_transform_float_ulong);
- g_value_register_transform_func (G_TYPE_FLOAT, G_TYPE_INT64, value_transform_float_int64);
- g_value_register_transform_func (G_TYPE_FLOAT, G_TYPE_UINT64, value_transform_float_uint64);
-- SKIP____register_transform_func (G_TYPE_FLOAT, G_TYPE_ENUM, value_transform_float_int);
-- SKIP____register_transform_func (G_TYPE_FLOAT, G_TYPE_FLAGS, value_transform_float_uint);
-+ SKIP____register_transform_func (G_TYPE_FLOAT, G_TYPE_ENUM, value_transform_float_long);
-+ SKIP____register_transform_func (G_TYPE_FLOAT, G_TYPE_FLAGS, value_transform_float_ulong);
- g_value_register_transform_func (G_TYPE_FLOAT, G_TYPE_FLOAT, value_transform_float_float);
- g_value_register_transform_func (G_TYPE_FLOAT, G_TYPE_DOUBLE, value_transform_float_double);
- g_value_register_transform_func (G_TYPE_FLOAT, G_TYPE_STRING, value_transform_float_string);
-@@ -430,8 +430,8 @@
- g_value_register_transform_func (G_TYPE_DOUBLE, G_TYPE_ULONG, value_transform_double_ulong);
- g_value_register_transform_func (G_TYPE_DOUBLE, G_TYPE_INT64, value_transform_double_int64);
- g_value_register_transform_func (G_TYPE_DOUBLE, G_TYPE_UINT64, value_transform_double_uint64);
-- SKIP____register_transform_func (G_TYPE_DOUBLE, G_TYPE_ENUM, value_transform_double_int);
-- SKIP____register_transform_func (G_TYPE_DOUBLE, G_TYPE_FLAGS, value_transform_double_uint);
-+ SKIP____register_transform_func (G_TYPE_DOUBLE, G_TYPE_ENUM, value_transform_double_long);
-+ SKIP____register_transform_func (G_TYPE_DOUBLE, G_TYPE_FLAGS, value_transform_double_ulong);
- g_value_register_transform_func (G_TYPE_DOUBLE, G_TYPE_FLOAT, value_transform_double_float);
- g_value_register_transform_func (G_TYPE_DOUBLE, G_TYPE_DOUBLE, value_transform_double_double);
- g_value_register_transform_func (G_TYPE_DOUBLE, G_TYPE_STRING, value_transform_double_string);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 07:41:06 +0000