glib/glib.patch@a0926cc92e0c
glib/glib.patch
Sun, 30 Jun 2013 18:45:32 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sun, 30 Jun 2013 18:45:32 +0200
- changeset 769
- a0926cc92e0c
- parent 455
- eb5f1f7ac5ff
- permissions
- -rw-r--r--
Update to new version of vendor software, trying to correct dependents.
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 @@ -820,7 +820,7 @@
6 @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
7 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
8 -SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
9 +SUBDIRS = . m4macros glib gmodule gthread gobject gio po
10 DIST_SUBDIRS = $(SUBDIRS) build
11 bin_SCRIPTS = glib-gettextize
12 AM_CPPFLAGS = \
13 Index: gio/Makefile.in
14 --- gio/Makefile.in.orig 2012-05-15 00:09:29.000000000 +0200
15 +++ gio/Makefile.in 2012-07-13 20:35:15.000000000 +0200
16 @@ -798,8 +798,7 @@
17 *) \
18 b='$*';; \
19 esac
20 -DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue fen win32 . \
21 - tests fam
22 +DIST_SUBDIRS = xdgmime inotify kqueue fen win32 . fam
23 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
24 am__relativize = \
25 dir0=`pwd`; \
26 @@ -1172,8 +1171,8 @@
27 @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts)
29 @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
30 -SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \
31 - $(am__append_22) $(am__append_26) $(am__append_29) . tests \
32 +SUBDIRS = $(am__append_15) $(am__append_19) \
33 + $(am__append_22) $(am__append_26) $(am__append_29) . \
34 $(am__append_32)
35 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
36 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
37 Index: gio/glib-compile-schemas.c
38 --- gio/glib-compile-schemas.c.orig 2012-04-13 15:39:41.000000000 +0200
39 +++ gio/glib-compile-schemas.c 2012-07-13 20:35:15.000000000 +0200
40 @@ -1534,7 +1534,7 @@
41 }
42 /* Text {{{2 */
43 static void
44 -text (GMarkupParseContext *context,
45 +XXXtext (GMarkupParseContext *context,
46 const gchar *text,
47 gsize text_len,
48 gpointer user_data,
49 @@ -1699,7 +1699,7 @@
50 parse_gschema_files (gchar **files,
51 gboolean strict)
52 {
53 - GMarkupParser parser = { start_element, end_element, text };
54 + GMarkupParser parser = { start_element, end_element, XXXtext };
55 ParseState state = { 0, };
56 const gchar *filename;
57 GError *error = NULL;
58 Index: gio/tests/gdbus-peer.c
59 --- gio/tests/gdbus-peer.c.orig 2012-05-14 23:58:01.000000000 +0200
60 +++ gio/tests/gdbus-peer.c 2012-07-13 20:35:15.000000000 +0200
61 @@ -39,6 +39,8 @@
62 #include <gio/gunixsocketaddress.h>
63 #include <gio/gunixfdlist.h>
65 +#include <sys/socket.h>
66 +
67 #ifdef G_OS_UNIX
68 #include <gio/gunixconnection.h>
69 #include <errno.h>
70 Index: gio/xdgmime/xdgmimecache.h
71 --- gio/xdgmime/xdgmimecache.h.orig 2011-08-16 02:51:30.000000000 +0200
72 +++ gio/xdgmime/xdgmimecache.h 2012-07-13 20:35:15.000000000 +0200
73 @@ -46,6 +46,9 @@
74 #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon)
75 #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon)
76 #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump)
77 +#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type)
78 +#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal)
79 +#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal)
80 #endif
82 extern XdgMimeCache **_caches;
83 Index: glib/gatomic.c
84 --- glib/gatomic.c.orig 2012-03-12 01:42:41.000000000 +0100
85 +++ glib/gatomic.c 2012-07-13 20:35:15.000000000 +0200
86 @@ -21,6 +21,7 @@
88 #include "config.h"
90 +#include "gthread.h"
91 #include "gatomic.h"
93 /**
94 Index: gmodule/gmodule-dl.c
95 --- gmodule/gmodule-dl.c.orig 2011-08-16 02:51:30.000000000 +0200
96 +++ gmodule/gmodule-dl.c 2012-07-13 20:35:15.000000000 +0200
97 @@ -107,6 +107,7 @@
98 static gpointer
99 _g_module_self (void)
100 {
101 +#ifndef __FreeBSD__
102 gpointer handle;
104 /* to query symbols from the program itself, special link options
105 @@ -122,6 +123,9 @@
106 g_module_set_error (fetch_dlerror (TRUE));
108 return handle;
109 +#else
110 + return RTLD_DEFAULT;
111 +#endif
112 }
114 static void
115 diff -Nau gio/gsocket.c.orig gio/gsocket.c
116 Index: gio/gsocket.c
117 --- gio/gsocket.c.orig 2012-08-03 11:38:08.419548195 +0200
118 +++ gio/gsocket.c 2012-08-03 11:38:11.307357875 +0200
119 @@ -52,6 +52,10 @@
120 #include <sys/uio.h>
121 #endif
123 +#if defined (__SVR4) && defined (__sun)
124 +#include <sys/filio.h>
125 +#endif
126 +
127 #include "gcancellable.h"
128 #include "gioenumtypes.h"
129 #include "ginetaddress.h"
130 diff -Nau gio/gresource-tool.c.orig gio/gresource-tool.c
131 Index: gio/gresource-tool.c
132 --- gio/gresource-tool.c.orig 2012-08-03 11:25:31.632225248 +0200
133 +++ gio/gresource-tool.c 2012-08-03 11:38:12.657797557 +0200
134 @@ -31,6 +31,11 @@
135 #include <locale.h>
137 #ifdef HAVE_LIBELF
138 +/* Solaris libelf does not support largefile in 32-bit mode */
139 +#if defined (__SVR4) && defined (__sun) && defined (__i386)
140 +#undef _FILE_OFFSET_BITS
141 +#define _FILE_OFFSET_BITS 32
142 +#endif
143 #include <libelf.h>
144 #include <gelf.h>
145 #include <sys/mman.h>
146 diff -Nau gio/glocalfile.c.orig gio/glocalfile.c
147 Index: gio/glocalfile.c.orig
148 --- gio/glocalfile.c.orig 2013-06-16 16:34:39.000000000 +0200
149 +++ gio/glocalfile.c 2013-06-30 22:51:06.165031107 +0200
150 @@ -2427,6 +2427,7 @@
151 is_remote_fs (const gchar *filename)
152 {
153 const char *fsname = NULL;
154 + int statfs_result = 0;
156 #ifdef USE_STATFS
157 struct statfs statfs_buffer;
