OpenPKG Specs / annotate

glib/glib.patch@a0926cc92e0c (annotated)

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.

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

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial