# HG changeset patch # User Michael Schloh von Bennewitz # Date 1372610732 -7200 # Node ID a0926cc92e0ca48277bf97b79ed435b722c565e7 # Parent 70baf26f10880835dceb5d5a992ca4365ae17259 Update to new version of vendor software, trying to correct dependents. diff -r 70baf26f1088 -r a0926cc92e0c glib/glib.patch --- a/glib/glib.patch Sun Jun 30 18:44:10 2013 +0200 +++ b/glib/glib.patch Sun Jun 30 18:45:32 2013 +0200 @@ -1,58 +1,43 @@ Index: Makefile.in --- Makefile.in.orig 2012-05-15 00:09:32.000000000 +0200 +++ Makefile.in 2012-07-13 20:35:15.000000000 +0200 -@@ -426,7 +426,7 @@ - gio-windows-2.0.pc.in - TEST_PROGS = +@@ -820,7 +820,7 @@ + + @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test) ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} --SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs +-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests +SUBDIRS = . m4macros glib gmodule gthread gobject gio po DIST_SUBDIRS = $(SUBDIRS) build bin_SCRIPTS = glib-gettextize AM_CPPFLAGS = \ -Index: configure ---- configure.orig 2012-05-15 00:09:26.000000000 +0200 -+++ configure 2012-07-13 20:35:26.000000000 +0200 -@@ -21276,12 +21276,6 @@ - - - --if test "x$GCC" = "xyes"; then -- case " $CFLAGS " in -- *[\ \ ]-Wall[\ \ ]*) ;; -- *) CFLAGS="$CFLAGS -Wall" ;; -- esac --fi - - if test "$glib_native_win32" = "yes"; then - if test x$enable_static = xyes -a x$enable_shared = xyes; then Index: gio/Makefile.in --- gio/Makefile.in.orig 2012-05-15 00:09:29.000000000 +0200 +++ gio/Makefile.in 2012-07-13 20:35:15.000000000 +0200 -@@ -482,7 +482,7 @@ - CTAGS = ctags - am__tty_colors = \ - red=; grn=; lgn=; blu=; std= --DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify fen win32 . fam tests -+DIST_SUBDIRS = xdgmime inotify fen win32 . fam +@@ -798,8 +798,7 @@ + *) \ + b='$*';; \ + esac +-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue fen win32 . \ +- tests fam ++DIST_SUBDIRS = xdgmime inotify kqueue fen win32 . fam DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ -@@ -760,8 +760,8 @@ - gschema.dtd gconstructor_as_data.h $(NULL) $(completion_DATA) - TEST_PROGS = - NULL = --SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \ -- $(am__append_8) $(am__append_11) . $(am__append_14) tests -+SUBDIRS = $(am__append_1) $(am__append_4) \ -+ $(am__append_8) $(am__append_11) . $(am__append_14) - @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib +@@ -1172,8 +1171,8 @@ + @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts) + + @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test) +-SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \ +- $(am__append_22) $(am__append_26) $(am__append_29) . tests \ ++SUBDIRS = $(am__append_15) $(am__append_19) \ ++ $(am__append_22) $(am__append_26) $(am__append_29) . \ + $(am__append_32) @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib Index: gio/glib-compile-schemas.c --- gio/glib-compile-schemas.c.orig 2012-04-13 15:39:41.000000000 +0200 +++ gio/glib-compile-schemas.c 2012-07-13 20:35:15.000000000 +0200 -@@ -1530,7 +1530,7 @@ +@@ -1534,7 +1534,7 @@ } /* Text {{{2 */ static void @@ -61,7 +46,7 @@ const gchar *text, gsize text_len, gpointer user_data, -@@ -1695,7 +1695,7 @@ +@@ -1699,7 +1699,7 @@ parse_gschema_files (gchar **files, gboolean strict) { @@ -79,9 +64,9 @@ +#include + - /* used in test_overflow */ #ifdef G_OS_UNIX #include + #include Index: gio/xdgmime/xdgmimecache.h --- gio/xdgmime/xdgmimecache.h.orig 2011-08-16 02:51:30.000000000 +0200 +++ gio/xdgmime/xdgmimecache.h 2012-07-13 20:35:15.000000000 +0200 @@ -106,20 +91,6 @@ #include "gatomic.h" /** -Index: glib/gregex.c ---- glib/gregex.c.orig 2012-04-02 05:08:41.000000000 +0200 -+++ glib/gregex.c 2012-07-13 20:35:15.000000000 +0200 -@@ -228,8 +228,10 @@ - case PCRE_ERROR_DFA_RECURSE: - case PCRE_ERROR_RECURSIONLIMIT: - return _("recursion limit reached"); -+#ifdef PCRE_ERROR_NULLWSLIMIT - case PCRE_ERROR_NULLWSLIMIT: - return _("workspace limit for empty substrings reached"); -+#endif - case PCRE_ERROR_BADNEWLINE: - return _("invalid combination of newline flags"); - case PCRE_ERROR_BADOFFSET: Index: gmodule/gmodule-dl.c --- gmodule/gmodule-dl.c.orig 2011-08-16 02:51:30.000000000 +0200 +++ gmodule/gmodule-dl.c 2012-07-13 20:35:15.000000000 +0200 @@ -131,7 +102,7 @@ gpointer handle; /* to query symbols from the program itself, special link options -@@ -118,6 +119,9 @@ +@@ -122,6 +123,9 @@ g_module_set_error (fetch_dlerror (TRUE)); return handle; @@ -145,7 +116,7 @@ Index: gio/gsocket.c --- gio/gsocket.c.orig 2012-08-03 11:38:08.419548195 +0200 +++ gio/gsocket.c 2012-08-03 11:38:11.307357875 +0200 -@@ -48,6 +48,10 @@ +@@ -52,6 +52,10 @@ #include #endif @@ -172,3 +143,15 @@ #include #include #include +diff -Nau gio/glocalfile.c.orig gio/glocalfile.c +Index: gio/glocalfile.c.orig +--- gio/glocalfile.c.orig 2013-06-16 16:34:39.000000000 +0200 ++++ gio/glocalfile.c 2013-06-30 22:51:06.165031107 +0200 +@@ -2427,6 +2427,7 @@ + is_remote_fs (const gchar *filename) + { + const char *fsname = NULL; ++ int statfs_result = 0; + + #ifdef USE_STATFS + struct statfs statfs_buffer; diff -r 70baf26f1088 -r a0926cc92e0c glib/glib.spec --- a/glib/glib.spec Sun Jun 30 18:44:10 2013 +0200 +++ b/glib/glib.spec Sun Jun 30 18:45:32 2013 +0200 @@ -22,7 +22,7 @@ ## # package version -%define V_major 2.32 +%define V_major 2.37 %define V_minor 3 # package information @@ -36,7 +36,7 @@ Group: Algorithm License: GPL Version: %{V_major}.%{V_minor} -Release: 20120800 +Release: 20130000 # package options %option with_threads yes @@ -112,7 +112,7 @@ -e 's;\(completiondir =\) \$(sysconfdir)/bash_completion.d;\1 $(pkgdatadir)/giobash;' \ gio/Makefile.in case "%{l_platform -t}" in - *-sunos* ) + *-sunos* ) %{l_shtool} subst \ -e 's;^\(LIBELF_LIBS =\);\1 -lelf;' \ gio/Makefile.in @@ -127,6 +127,9 @@ *i?86-* | *amd64-* | *ia64-* ) l_cflags="$l_cflags -march=native" ;; esac libs="" + case "%{l_platform -t}" in + *-sunos* ) libs="-lnsl -lsocket" ;; + esac %if "%{with_threads}" == "yes" case "%{l_platform -t}" in *-netbsd* ) libs="-lpthread" ;;