1.1 --- a/glib/glib.patch Sun Jun 30 18:44:10 2013 +0200
1.2 +++ b/glib/glib.patch Sun Jun 30 18:45:32 2013 +0200
1.3 @@ -1,58 +1,43 @@
1.4 Index: Makefile.in
1.5 --- Makefile.in.orig 2012-05-15 00:09:32.000000000 +0200
1.6 +++ Makefile.in 2012-07-13 20:35:15.000000000 +0200
1.7 -@@ -426,7 +426,7 @@
1.8 - gio-windows-2.0.pc.in
1.9 - TEST_PROGS =
1.10 +@@ -820,7 +820,7 @@
1.11 +
1.12 + @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
1.13 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
1.14 --SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
1.15 +-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
1.16 +SUBDIRS = . m4macros glib gmodule gthread gobject gio po
1.17 DIST_SUBDIRS = $(SUBDIRS) build
1.18 bin_SCRIPTS = glib-gettextize
1.19 AM_CPPFLAGS = \
1.20 -Index: configure
1.21 ---- configure.orig 2012-05-15 00:09:26.000000000 +0200
1.22 -+++ configure 2012-07-13 20:35:26.000000000 +0200
1.23 -@@ -21276,12 +21276,6 @@
1.24 -
1.25 -
1.26 -
1.27 --if test "x$GCC" = "xyes"; then
1.28 -- case " $CFLAGS " in
1.29 -- *[\ \ ]-Wall[\ \ ]*) ;;
1.30 -- *) CFLAGS="$CFLAGS -Wall" ;;
1.31 -- esac
1.32 --fi
1.33 -
1.34 - if test "$glib_native_win32" = "yes"; then
1.35 - if test x$enable_static = xyes -a x$enable_shared = xyes; then
1.36 Index: gio/Makefile.in
1.37 --- gio/Makefile.in.orig 2012-05-15 00:09:29.000000000 +0200
1.38 +++ gio/Makefile.in 2012-07-13 20:35:15.000000000 +0200
1.39 -@@ -482,7 +482,7 @@
1.40 - CTAGS = ctags
1.41 - am__tty_colors = \
1.42 - red=; grn=; lgn=; blu=; std=
1.43 --DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify fen win32 . fam tests
1.44 -+DIST_SUBDIRS = xdgmime inotify fen win32 . fam
1.45 +@@ -798,8 +798,7 @@
1.46 + *) \
1.47 + b='$*';; \
1.48 + esac
1.49 +-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue fen win32 . \
1.50 +- tests fam
1.51 ++DIST_SUBDIRS = xdgmime inotify kqueue fen win32 . fam
1.52 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1.53 am__relativize = \
1.54 dir0=`pwd`; \
1.55 -@@ -760,8 +760,8 @@
1.56 - gschema.dtd gconstructor_as_data.h $(NULL) $(completion_DATA)
1.57 - TEST_PROGS =
1.58 - NULL =
1.59 --SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \
1.60 -- $(am__append_8) $(am__append_11) . $(am__append_14) tests
1.61 -+SUBDIRS = $(am__append_1) $(am__append_4) \
1.62 -+ $(am__append_8) $(am__append_11) . $(am__append_14)
1.63 - @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
1.64 +@@ -1172,8 +1171,8 @@
1.65 + @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts)
1.66 +
1.67 + @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
1.68 +-SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \
1.69 +- $(am__append_22) $(am__append_26) $(am__append_29) . tests \
1.70 ++SUBDIRS = $(am__append_15) $(am__append_19) \
1.71 ++ $(am__append_22) $(am__append_26) $(am__append_29) . \
1.72 + $(am__append_32)
1.73 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
1.74 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
1.75 Index: gio/glib-compile-schemas.c
1.76 --- gio/glib-compile-schemas.c.orig 2012-04-13 15:39:41.000000000 +0200
1.77 +++ gio/glib-compile-schemas.c 2012-07-13 20:35:15.000000000 +0200
1.78 -@@ -1530,7 +1530,7 @@
1.79 +@@ -1534,7 +1534,7 @@
1.80 }
1.81 /* Text {{{2 */
1.82 static void
1.83 @@ -61,7 +46,7 @@
1.84 const gchar *text,
1.85 gsize text_len,
1.86 gpointer user_data,
1.87 -@@ -1695,7 +1695,7 @@
1.88 +@@ -1699,7 +1699,7 @@
1.89 parse_gschema_files (gchar **files,
1.90 gboolean strict)
1.91 {
1.92 @@ -79,9 +64,9 @@
1.93
1.94 +#include <sys/socket.h>
1.95 +
1.96 - /* used in test_overflow */
1.97 #ifdef G_OS_UNIX
1.98 #include <gio/gunixconnection.h>
1.99 + #include <errno.h>
1.100 Index: gio/xdgmime/xdgmimecache.h
1.101 --- gio/xdgmime/xdgmimecache.h.orig 2011-08-16 02:51:30.000000000 +0200
1.102 +++ gio/xdgmime/xdgmimecache.h 2012-07-13 20:35:15.000000000 +0200
1.103 @@ -106,20 +91,6 @@
1.104 #include "gatomic.h"
1.105
1.106 /**
1.107 -Index: glib/gregex.c
1.108 ---- glib/gregex.c.orig 2012-04-02 05:08:41.000000000 +0200
1.109 -+++ glib/gregex.c 2012-07-13 20:35:15.000000000 +0200
1.110 -@@ -228,8 +228,10 @@
1.111 - case PCRE_ERROR_DFA_RECURSE:
1.112 - case PCRE_ERROR_RECURSIONLIMIT:
1.113 - return _("recursion limit reached");
1.114 -+#ifdef PCRE_ERROR_NULLWSLIMIT
1.115 - case PCRE_ERROR_NULLWSLIMIT:
1.116 - return _("workspace limit for empty substrings reached");
1.117 -+#endif
1.118 - case PCRE_ERROR_BADNEWLINE:
1.119 - return _("invalid combination of newline flags");
1.120 - case PCRE_ERROR_BADOFFSET:
1.121 Index: gmodule/gmodule-dl.c
1.122 --- gmodule/gmodule-dl.c.orig 2011-08-16 02:51:30.000000000 +0200
1.123 +++ gmodule/gmodule-dl.c 2012-07-13 20:35:15.000000000 +0200
1.124 @@ -131,7 +102,7 @@
1.125 gpointer handle;
1.126
1.127 /* to query symbols from the program itself, special link options
1.128 -@@ -118,6 +119,9 @@
1.129 +@@ -122,6 +123,9 @@
1.130 g_module_set_error (fetch_dlerror (TRUE));
1.131
1.132 return handle;
1.133 @@ -145,7 +116,7 @@
1.134 Index: gio/gsocket.c
1.135 --- gio/gsocket.c.orig 2012-08-03 11:38:08.419548195 +0200
1.136 +++ gio/gsocket.c 2012-08-03 11:38:11.307357875 +0200
1.137 -@@ -48,6 +48,10 @@
1.138 +@@ -52,6 +52,10 @@
1.139 #include <sys/uio.h>
1.140 #endif
1.141
1.142 @@ -172,3 +143,15 @@
1.143 #include <libelf.h>
1.144 #include <gelf.h>
1.145 #include <sys/mman.h>
1.146 +diff -Nau gio/glocalfile.c.orig gio/glocalfile.c
1.147 +Index: gio/glocalfile.c.orig
1.148 +--- gio/glocalfile.c.orig 2013-06-16 16:34:39.000000000 +0200
1.149 ++++ gio/glocalfile.c 2013-06-30 22:51:06.165031107 +0200
1.150 +@@ -2427,6 +2427,7 @@
1.151 + is_remote_fs (const gchar *filename)
1.152 + {
1.153 + const char *fsname = NULL;
1.154 ++ int statfs_result = 0;
1.155 +
1.156 + #ifdef USE_STATFS
1.157 + struct statfs statfs_buffer;
