1.1 --- a/glib/glib.patch Fri Aug 03 15:15:17 2012 +0200
1.2 +++ b/glib/glib.patch Fri Aug 03 15:16:43 2012 +0200
1.3 @@ -1,29 +1,128 @@
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 + ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
1.11 +-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
1.12 ++SUBDIRS = . m4macros glib gmodule gthread gobject gio po
1.13 + DIST_SUBDIRS = $(SUBDIRS) build
1.14 + bin_SCRIPTS = glib-gettextize
1.15 + AM_CPPFLAGS = \
1.16 Index: configure
1.17 ---- configure.orig 2010-03-16 03:52:21.000000000 +0100
1.18 -+++ configure 2010-03-17 20:07:17.000000000 +0100
1.19 -@@ -25810,7 +25810,7 @@
1.20 - add_thread_lib="-l$thread_lib"
1.21 - IN=" in -l$thread_lib"
1.22 - fi
1.23 -- LIBS="$add_thread_lib $glib_save_LIBS"
1.24 -+ LIBS="$add_thread_lib `echo x$glib_save_LIBS | sed -e 's;^x;;' -e 's;-lrt;;'`"
1.25 +--- configure.orig 2012-05-15 00:09:26.000000000 +0200
1.26 ++++ configure 2012-07-13 20:35:26.000000000 +0200
1.27 +@@ -21276,12 +21276,6 @@
1.28
1.29 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_min$IN" >&5
1.30 - $as_echo_n "checking for sched_get_priority_min$IN... " >&6; }
1.31 -Index: glib-2.0.pc.in
1.32 ---- glib-2.0.pc.in.orig 2009-04-01 01:04:20.000000000 +0200
1.33 -+++ glib-2.0.pc.in 2010-03-17 20:07:17.000000000 +0100
1.34 -@@ -9,6 +9,7 @@
1.35
1.36 - Name: GLib
1.37 - Description: C Utility Library
1.38 -+Requires: libpcre
1.39 - Version: @VERSION@
1.40 - Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
1.41 - Libs.private: @ICONV_LIBS@
1.42 +
1.43 +-if test "x$GCC" = "xyes"; then
1.44 +- case " $CFLAGS " in
1.45 +- *[\ \ ]-Wall[\ \ ]*) ;;
1.46 +- *) CFLAGS="$CFLAGS -Wall" ;;
1.47 +- esac
1.48 +-fi
1.49 +
1.50 + if test "$glib_native_win32" = "yes"; then
1.51 + if test x$enable_static = xyes -a x$enable_shared = xyes; then
1.52 +Index: gio/Makefile.in
1.53 +--- gio/Makefile.in.orig 2012-05-15 00:09:29.000000000 +0200
1.54 ++++ gio/Makefile.in 2012-07-13 20:35:15.000000000 +0200
1.55 +@@ -482,7 +482,7 @@
1.56 + CTAGS = ctags
1.57 + am__tty_colors = \
1.58 + red=; grn=; lgn=; blu=; std=
1.59 +-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify fen win32 . fam tests
1.60 ++DIST_SUBDIRS = xdgmime inotify fen win32 . fam
1.61 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1.62 + am__relativize = \
1.63 + dir0=`pwd`; \
1.64 +@@ -760,8 +760,8 @@
1.65 + gschema.dtd gconstructor_as_data.h $(NULL) $(completion_DATA)
1.66 + TEST_PROGS =
1.67 + NULL =
1.68 +-SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \
1.69 +- $(am__append_8) $(am__append_11) . $(am__append_14) tests
1.70 ++SUBDIRS = $(am__append_1) $(am__append_4) \
1.71 ++ $(am__append_8) $(am__append_11) . $(am__append_14)
1.72 + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
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 + }
1.80 + /* Text {{{2 */
1.81 + static void
1.82 +-text (GMarkupParseContext *context,
1.83 ++XXXtext (GMarkupParseContext *context,
1.84 + const gchar *text,
1.85 + gsize text_len,
1.86 + gpointer user_data,
1.87 +@@ -1695,7 +1695,7 @@
1.88 + parse_gschema_files (gchar **files,
1.89 + gboolean strict)
1.90 + {
1.91 +- GMarkupParser parser = { start_element, end_element, text };
1.92 ++ GMarkupParser parser = { start_element, end_element, XXXtext };
1.93 + ParseState state = { 0, };
1.94 + const gchar *filename;
1.95 + GError *error = NULL;
1.96 +Index: gio/tests/gdbus-peer.c
1.97 +--- gio/tests/gdbus-peer.c.orig 2012-05-14 23:58:01.000000000 +0200
1.98 ++++ gio/tests/gdbus-peer.c 2012-07-13 20:35:15.000000000 +0200
1.99 +@@ -39,6 +39,8 @@
1.100 + #include <gio/gunixsocketaddress.h>
1.101 + #include <gio/gunixfdlist.h>
1.102 +
1.103 ++#include <sys/socket.h>
1.104 ++
1.105 + /* used in test_overflow */
1.106 + #ifdef G_OS_UNIX
1.107 + #include <gio/gunixconnection.h>
1.108 +Index: gio/xdgmime/xdgmimecache.h
1.109 +--- gio/xdgmime/xdgmimecache.h.orig 2011-08-16 02:51:30.000000000 +0200
1.110 ++++ gio/xdgmime/xdgmimecache.h 2012-07-13 20:35:15.000000000 +0200
1.111 +@@ -46,6 +46,9 @@
1.112 + #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon)
1.113 + #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon)
1.114 + #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump)
1.115 ++#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type)
1.116 ++#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal)
1.117 ++#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal)
1.118 + #endif
1.119 +
1.120 + extern XdgMimeCache **_caches;
1.121 +Index: glib/gatomic.c
1.122 +--- glib/gatomic.c.orig 2012-03-12 01:42:41.000000000 +0100
1.123 ++++ glib/gatomic.c 2012-07-13 20:35:15.000000000 +0200
1.124 +@@ -21,6 +21,7 @@
1.125 +
1.126 + #include "config.h"
1.127 +
1.128 ++#include "gthread.h"
1.129 + #include "gatomic.h"
1.130 +
1.131 + /**
1.132 +Index: glib/gregex.c
1.133 +--- glib/gregex.c.orig 2012-04-02 05:08:41.000000000 +0200
1.134 ++++ glib/gregex.c 2012-07-13 20:35:15.000000000 +0200
1.135 +@@ -228,8 +228,10 @@
1.136 + case PCRE_ERROR_DFA_RECURSE:
1.137 + case PCRE_ERROR_RECURSIONLIMIT:
1.138 + return _("recursion limit reached");
1.139 ++#ifdef PCRE_ERROR_NULLWSLIMIT
1.140 + case PCRE_ERROR_NULLWSLIMIT:
1.141 + return _("workspace limit for empty substrings reached");
1.142 ++#endif
1.143 + case PCRE_ERROR_BADNEWLINE:
1.144 + return _("invalid combination of newline flags");
1.145 + case PCRE_ERROR_BADOFFSET:
1.146 Index: gmodule/gmodule-dl.c
1.147 ---- gmodule/gmodule-dl.c.orig 2009-04-01 01:04:20.000000000 +0200
1.148 -+++ gmodule/gmodule-dl.c 2010-03-17 20:07:17.000000000 +0100
1.149 +--- gmodule/gmodule-dl.c.orig 2011-08-16 02:51:30.000000000 +0200
1.150 ++++ gmodule/gmodule-dl.c 2012-07-13 20:35:15.000000000 +0200
1.151 @@ -107,6 +107,7 @@
1.152 static gpointer
1.153 _g_module_self (void)
1.154 @@ -42,33 +141,3 @@
1.155 }
1.156
1.157 static void
1.158 -Index: tests/errorcheck-mutex-test.c
1.159 ---- tests/errorcheck-mutex-test.c.orig 2009-04-01 01:04:20.000000000 +0200
1.160 -+++ tests/errorcheck-mutex-test.c 2010-03-17 20:07:17.000000000 +0100
1.161 -@@ -1,3 +1,5 @@
1.162 -+#ifdef G_THREADS_ENABLED
1.163 -+
1.164 - #undef G_DISABLE_ASSERT
1.165 - #undef G_LOG_DOMAIN
1.166 - #define G_ERRORCHECK_MUTEXES
1.167 -@@ -102,9 +104,12 @@
1.168 - timed_wait_on_otherwise_locked_mutex}
1.169 - };
1.170 -
1.171 -+#endif
1.172 -+
1.173 - int
1.174 - main (int argc, char* argv[])
1.175 - {
1.176 -+#ifdef G_THREADS_ENABLED
1.177 - int i;
1.178 -
1.179 - if (argc == 2)
1.180 -@@ -126,6 +131,7 @@
1.181 - {
1.182 - fprintf (stderr, " %s\n", func_table[i].name);
1.183 - }
1.184 -+#endif
1.185 -
1.186 - return 0;
1.187 - }
