comparison: glib/glib.patch
glib/glib.patch
- changeset 454
- e99334bd789c
- parent 453
- 5ee40987cb02
- child 455
- eb5f1f7ac5ff
equal
deleted
inserted
replaced
| 0:bf2cce45bfd1 | 1:d86b3f718c2e |
|---|---|
| 1 Index: Makefile.in | |
| 2 --- Makefile.in.orig 2012-05-15 00:09:32.000000000 +0200 | |
| 3 +++ Makefile.in 2012-07-13 20:35:15.000000000 +0200 | |
| 4 @@ -426,7 +426,7 @@ | |
| 5 gio-windows-2.0.pc.in | |
| 6 TEST_PROGS = | |
| 7 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} | |
| 8 -SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs | |
| 9 +SUBDIRS = . m4macros glib gmodule gthread gobject gio po | |
| 10 DIST_SUBDIRS = $(SUBDIRS) build | |
| 11 bin_SCRIPTS = glib-gettextize | |
| 12 AM_CPPFLAGS = \ | |
| 1 Index: configure | 13 Index: configure |
| 2 --- configure.orig 2010-03-16 03:52:21.000000000 +0100 | 14 --- configure.orig 2012-05-15 00:09:26.000000000 +0200 |
| 3 +++ configure 2010-03-17 20:07:17.000000000 +0100 | 15 +++ configure 2012-07-13 20:35:26.000000000 +0200 |
| 4 @@ -25810,7 +25810,7 @@ | 16 @@ -21276,12 +21276,6 @@ |
| 5 add_thread_lib="-l$thread_lib" | |
| 6 IN=" in -l$thread_lib" | |
| 7 fi | |
| 8 - LIBS="$add_thread_lib $glib_save_LIBS" | |
| 9 + LIBS="$add_thread_lib `echo x$glib_save_LIBS | sed -e 's;^x;;' -e 's;-lrt;;'`" | |
| 10 | 17 |
| 11 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_min$IN" >&5 | |
| 12 $as_echo_n "checking for sched_get_priority_min$IN... " >&6; } | |
| 13 Index: glib-2.0.pc.in | |
| 14 --- glib-2.0.pc.in.orig 2009-04-01 01:04:20.000000000 +0200 | |
| 15 +++ glib-2.0.pc.in 2010-03-17 20:07:17.000000000 +0100 | |
| 16 @@ -9,6 +9,7 @@ | |
| 17 | 18 |
| 18 Name: GLib | 19 |
| 19 Description: C Utility Library | 20 -if test "x$GCC" = "xyes"; then |
| 20 +Requires: libpcre | 21 - case " $CFLAGS " in |
| 21 Version: @VERSION@ | 22 - *[\ \ ]-Wall[\ \ ]*) ;; |
| 22 Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ | 23 - *) CFLAGS="$CFLAGS -Wall" ;; |
| 23 Libs.private: @ICONV_LIBS@ | 24 - esac |
| 25 -fi | |
| 26 | |
| 27 if test "$glib_native_win32" = "yes"; then | |
| 28 if test x$enable_static = xyes -a x$enable_shared = xyes; then | |
| 29 Index: gio/Makefile.in | |
| 30 --- gio/Makefile.in.orig 2012-05-15 00:09:29.000000000 +0200 | |
| 31 +++ gio/Makefile.in 2012-07-13 20:35:15.000000000 +0200 | |
| 32 @@ -482,7 +482,7 @@ | |
| 33 CTAGS = ctags | |
| 34 am__tty_colors = \ | |
| 35 red=; grn=; lgn=; blu=; std= | |
| 36 -DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify fen win32 . fam tests | |
| 37 +DIST_SUBDIRS = xdgmime inotify fen win32 . fam | |
| 38 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
| 39 am__relativize = \ | |
| 40 dir0=`pwd`; \ | |
| 41 @@ -760,8 +760,8 @@ | |
| 42 gschema.dtd gconstructor_as_data.h $(NULL) $(completion_DATA) | |
| 43 TEST_PROGS = | |
| 44 NULL = | |
| 45 -SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \ | |
| 46 - $(am__append_8) $(am__append_11) . $(am__append_14) tests | |
| 47 +SUBDIRS = $(am__append_1) $(am__append_4) \ | |
| 48 + $(am__append_8) $(am__append_11) . $(am__append_14) | |
| 49 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib | |
| 50 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) | |
| 51 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib | |
| 52 Index: gio/glib-compile-schemas.c | |
| 53 --- gio/glib-compile-schemas.c.orig 2012-04-13 15:39:41.000000000 +0200 | |
| 54 +++ gio/glib-compile-schemas.c 2012-07-13 20:35:15.000000000 +0200 | |
| 55 @@ -1530,7 +1530,7 @@ | |
| 56 } | |
| 57 /* Text {{{2 */ | |
| 58 static void | |
| 59 -text (GMarkupParseContext *context, | |
| 60 +XXXtext (GMarkupParseContext *context, | |
| 61 const gchar *text, | |
| 62 gsize text_len, | |
| 63 gpointer user_data, | |
| 64 @@ -1695,7 +1695,7 @@ | |
| 65 parse_gschema_files (gchar **files, | |
| 66 gboolean strict) | |
| 67 { | |
| 68 - GMarkupParser parser = { start_element, end_element, text }; | |
| 69 + GMarkupParser parser = { start_element, end_element, XXXtext }; | |
| 70 ParseState state = { 0, }; | |
| 71 const gchar *filename; | |
| 72 GError *error = NULL; | |
| 73 Index: gio/tests/gdbus-peer.c | |
| 74 --- gio/tests/gdbus-peer.c.orig 2012-05-14 23:58:01.000000000 +0200 | |
| 75 +++ gio/tests/gdbus-peer.c 2012-07-13 20:35:15.000000000 +0200 | |
| 76 @@ -39,6 +39,8 @@ | |
| 77 #include <gio/gunixsocketaddress.h> | |
| 78 #include <gio/gunixfdlist.h> | |
| 79 | |
| 80 +#include <sys/socket.h> | |
| 81 + | |
| 82 /* used in test_overflow */ | |
| 83 #ifdef G_OS_UNIX | |
| 84 #include <gio/gunixconnection.h> | |
| 85 Index: gio/xdgmime/xdgmimecache.h | |
| 86 --- gio/xdgmime/xdgmimecache.h.orig 2011-08-16 02:51:30.000000000 +0200 | |
| 87 +++ gio/xdgmime/xdgmimecache.h 2012-07-13 20:35:15.000000000 +0200 | |
| 88 @@ -46,6 +46,9 @@ | |
| 89 #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) | |
| 90 #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) | |
| 91 #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) | |
| 92 +#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) | |
| 93 +#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) | |
| 94 +#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) | |
| 95 #endif | |
| 96 | |
| 97 extern XdgMimeCache **_caches; | |
| 98 Index: glib/gatomic.c | |
| 99 --- glib/gatomic.c.orig 2012-03-12 01:42:41.000000000 +0100 | |
| 100 +++ glib/gatomic.c 2012-07-13 20:35:15.000000000 +0200 | |
| 101 @@ -21,6 +21,7 @@ | |
| 102 | |
| 103 #include "config.h" | |
| 104 | |
| 105 +#include "gthread.h" | |
| 106 #include "gatomic.h" | |
| 107 | |
| 108 /** | |
| 109 Index: glib/gregex.c | |
| 110 --- glib/gregex.c.orig 2012-04-02 05:08:41.000000000 +0200 | |
| 111 +++ glib/gregex.c 2012-07-13 20:35:15.000000000 +0200 | |
| 112 @@ -228,8 +228,10 @@ | |
| 113 case PCRE_ERROR_DFA_RECURSE: | |
| 114 case PCRE_ERROR_RECURSIONLIMIT: | |
| 115 return _("recursion limit reached"); | |
| 116 +#ifdef PCRE_ERROR_NULLWSLIMIT | |
| 117 case PCRE_ERROR_NULLWSLIMIT: | |
| 118 return _("workspace limit for empty substrings reached"); | |
| 119 +#endif | |
| 120 case PCRE_ERROR_BADNEWLINE: | |
| 121 return _("invalid combination of newline flags"); | |
| 122 case PCRE_ERROR_BADOFFSET: | |
| 24 Index: gmodule/gmodule-dl.c | 123 Index: gmodule/gmodule-dl.c |
| 25 --- gmodule/gmodule-dl.c.orig 2009-04-01 01:04:20.000000000 +0200 | 124 --- gmodule/gmodule-dl.c.orig 2011-08-16 02:51:30.000000000 +0200 |
| 26 +++ gmodule/gmodule-dl.c 2010-03-17 20:07:17.000000000 +0100 | 125 +++ gmodule/gmodule-dl.c 2012-07-13 20:35:15.000000000 +0200 |
| 27 @@ -107,6 +107,7 @@ | 126 @@ -107,6 +107,7 @@ |
| 28 static gpointer | 127 static gpointer |
| 29 _g_module_self (void) | 128 _g_module_self (void) |
| 30 { | 129 { |
| 31 +#ifndef __FreeBSD__ | 130 +#ifndef __FreeBSD__ |
| 40 + return RTLD_DEFAULT; | 139 + return RTLD_DEFAULT; |
| 41 +#endif | 140 +#endif |
| 42 } | 141 } |
| 43 | 142 |
| 44 static void | 143 static void |
| 45 Index: tests/errorcheck-mutex-test.c | |
| 46 --- tests/errorcheck-mutex-test.c.orig 2009-04-01 01:04:20.000000000 +0200 | |
| 47 +++ tests/errorcheck-mutex-test.c 2010-03-17 20:07:17.000000000 +0100 | |
| 48 @@ -1,3 +1,5 @@ | |
| 49 +#ifdef G_THREADS_ENABLED | |
| 50 + | |
| 51 #undef G_DISABLE_ASSERT | |
| 52 #undef G_LOG_DOMAIN | |
| 53 #define G_ERRORCHECK_MUTEXES | |
| 54 @@ -102,9 +104,12 @@ | |
| 55 timed_wait_on_otherwise_locked_mutex} | |
| 56 }; | |
| 57 | |
| 58 +#endif | |
| 59 + | |
| 60 int | |
| 61 main (int argc, char* argv[]) | |
| 62 { | |
| 63 +#ifdef G_THREADS_ENABLED | |
| 64 int i; | |
| 65 | |
| 66 if (argc == 2) | |
| 67 @@ -126,6 +131,7 @@ | |
| 68 { | |
| 69 fprintf (stderr, " %s\n", func_table[i].name); | |
| 70 } | |
| 71 +#endif | |
| 72 | |
| 73 return 0; | |
| 74 } |
