OpenPKG Specs / annotate

glib/glib.patch@a2c6460cfb16 (annotated)

glib/glib.patch

Mon, 28 Jan 2013 17:37:18 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Mon, 28 Jan 2013 17:37:18 +0100
changeset 758
a2c6460cfb16
parent 454
e99334bd789c
child 769
a0926cc92e0c
permissions
-rw-r--r--

Correct socket error reporting improvement with IPv6 portable code,
after helpful recommendation by Saúl Ibarra Corretgé on OSips devlist.

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@454 4 @@ -426,7 +426,7 @@
michael@454 5 gio-windows-2.0.pc.in
michael@454 6 TEST_PROGS =
michael@454 7 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
michael@454 8 -SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
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@273 13 Index: configure
michael@454 14 --- configure.orig 2012-05-15 00:09:26.000000000 +0200
michael@454 15 +++ configure 2012-07-13 20:35:26.000000000 +0200
michael@454 16 @@ -21276,12 +21276,6 @@
michael@273 17
michael@273 18
michael@454 19
michael@454 20 -if test "x$GCC" = "xyes"; then
michael@454 21 - case " $CFLAGS " in
michael@454 22 - *[\ \ ]-Wall[\ \ ]*) ;;
michael@454 23 - *) CFLAGS="$CFLAGS -Wall" ;;
michael@454 24 - esac
michael@454 25 -fi
michael@454 26
michael@454 27 if test "$glib_native_win32" = "yes"; then
michael@454 28 if test x$enable_static = xyes -a x$enable_shared = xyes; then
michael@454 29 Index: gio/Makefile.in
michael@454 30 --- gio/Makefile.in.orig 2012-05-15 00:09:29.000000000 +0200
michael@454 31 +++ gio/Makefile.in 2012-07-13 20:35:15.000000000 +0200
michael@454 32 @@ -482,7 +482,7 @@
michael@454 33 CTAGS = ctags
michael@454 34 am__tty_colors = \
michael@454 35 red=; grn=; lgn=; blu=; std=
michael@454 36 -DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify fen win32 . fam tests
michael@454 37 +DIST_SUBDIRS = xdgmime inotify fen win32 . fam
michael@454 38 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
michael@454 39 am__relativize = \
michael@454 40 dir0=`pwd`; \
michael@454 41 @@ -760,8 +760,8 @@
michael@454 42 gschema.dtd gconstructor_as_data.h $(NULL) $(completion_DATA)
michael@454 43 TEST_PROGS =
michael@454 44 NULL =
michael@454 45 -SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \
michael@454 46 - $(am__append_8) $(am__append_11) . $(am__append_14) tests
michael@454 47 +SUBDIRS = $(am__append_1) $(am__append_4) \
michael@454 48 + $(am__append_8) $(am__append_11) . $(am__append_14)
michael@454 49 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
michael@454 50 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
michael@454 51 @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
michael@454 52 Index: gio/glib-compile-schemas.c
michael@454 53 --- gio/glib-compile-schemas.c.orig 2012-04-13 15:39:41.000000000 +0200
michael@454 54 +++ gio/glib-compile-schemas.c 2012-07-13 20:35:15.000000000 +0200
michael@454 55 @@ -1530,7 +1530,7 @@
michael@454 56 }
michael@454 57 /* Text {{{2 */
michael@454 58 static void
michael@454 59 -text (GMarkupParseContext *context,
michael@454 60 +XXXtext (GMarkupParseContext *context,
michael@454 61 const gchar *text,
michael@454 62 gsize text_len,
michael@454 63 gpointer user_data,
michael@454 64 @@ -1695,7 +1695,7 @@
michael@454 65 parse_gschema_files (gchar **files,
michael@454 66 gboolean strict)
michael@454 67 {
michael@454 68 - GMarkupParser parser = { start_element, end_element, text };
michael@454 69 + GMarkupParser parser = { start_element, end_element, XXXtext };
michael@454 70 ParseState state = { 0, };
michael@454 71 const gchar *filename;
michael@454 72 GError *error = NULL;
michael@454 73 Index: gio/tests/gdbus-peer.c
michael@454 74 --- gio/tests/gdbus-peer.c.orig 2012-05-14 23:58:01.000000000 +0200
michael@454 75 +++ gio/tests/gdbus-peer.c 2012-07-13 20:35:15.000000000 +0200
michael@454 76 @@ -39,6 +39,8 @@
michael@454 77 #include <gio/gunixsocketaddress.h>
michael@454 78 #include <gio/gunixfdlist.h>
michael@454 79
michael@454 80 +#include <sys/socket.h>
michael@454 81 +
michael@454 82 /* used in test_overflow */
michael@454 83 #ifdef G_OS_UNIX
michael@454 84 #include <gio/gunixconnection.h>
michael@454 85 Index: gio/xdgmime/xdgmimecache.h
michael@454 86 --- gio/xdgmime/xdgmimecache.h.orig 2011-08-16 02:51:30.000000000 +0200
michael@454 87 +++ gio/xdgmime/xdgmimecache.h 2012-07-13 20:35:15.000000000 +0200
michael@454 88 @@ -46,6 +46,9 @@
michael@454 89 #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon)
michael@454 90 #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon)
michael@454 91 #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump)
michael@454 92 +#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type)
michael@454 93 +#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal)
michael@454 94 +#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal)
michael@454 95 #endif
michael@454 96
michael@454 97 extern XdgMimeCache **_caches;
michael@454 98 Index: glib/gatomic.c
michael@454 99 --- glib/gatomic.c.orig 2012-03-12 01:42:41.000000000 +0100
michael@454 100 +++ glib/gatomic.c 2012-07-13 20:35:15.000000000 +0200
michael@454 101 @@ -21,6 +21,7 @@
michael@454 102
michael@454 103 #include "config.h"
michael@454 104
michael@454 105 +#include "gthread.h"
michael@454 106 #include "gatomic.h"
michael@454 107
michael@454 108 /**
michael@454 109 Index: glib/gregex.c
michael@454 110 --- glib/gregex.c.orig 2012-04-02 05:08:41.000000000 +0200
michael@454 111 +++ glib/gregex.c 2012-07-13 20:35:15.000000000 +0200
michael@454 112 @@ -228,8 +228,10 @@
michael@454 113 case PCRE_ERROR_DFA_RECURSE:
michael@454 114 case PCRE_ERROR_RECURSIONLIMIT:
michael@454 115 return _("recursion limit reached");
michael@454 116 +#ifdef PCRE_ERROR_NULLWSLIMIT
michael@454 117 case PCRE_ERROR_NULLWSLIMIT:
michael@454 118 return _("workspace limit for empty substrings reached");
michael@454 119 +#endif
michael@454 120 case PCRE_ERROR_BADNEWLINE:
michael@454 121 return _("invalid combination of newline flags");
michael@454 122 case PCRE_ERROR_BADOFFSET:
michael@273 123 Index: gmodule/gmodule-dl.c
michael@454 124 --- gmodule/gmodule-dl.c.orig 2011-08-16 02:51:30.000000000 +0200
michael@454 125 +++ gmodule/gmodule-dl.c 2012-07-13 20:35:15.000000000 +0200
michael@273 126 @@ -107,6 +107,7 @@
michael@273 127 static gpointer
michael@273 128 _g_module_self (void)
michael@273 129 {
michael@273 130 +#ifndef __FreeBSD__
michael@273 131 gpointer handle;
michael@273 132
michael@273 133 /* to query symbols from the program itself, special link options
michael@273 134 @@ -118,6 +119,9 @@
michael@273 135 g_module_set_error (fetch_dlerror (TRUE));
michael@273 136
michael@273 137 return handle;
michael@273 138 +#else
michael@273 139 + return RTLD_DEFAULT;
michael@273 140 +#endif
michael@273 141 }
michael@273 142
michael@273 143 static void
michael@455 144 diff -Nau gio/gsocket.c.orig gio/gsocket.c
michael@455 145 Index: gio/gsocket.c
michael@455 146 --- gio/gsocket.c.orig 2012-08-03 11:38:08.419548195 +0200
michael@455 147 +++ gio/gsocket.c 2012-08-03 11:38:11.307357875 +0200
michael@455 148 @@ -48,6 +48,10 @@
michael@455 149 #include <sys/uio.h>
michael@455 150 #endif
michael@455 151
michael@455 152 +#if defined (__SVR4) && defined (__sun)
michael@455 153 +#include <sys/filio.h>
michael@455 154 +#endif
michael@455 155 +
michael@455 156 #include "gcancellable.h"
michael@455 157 #include "gioenumtypes.h"
michael@455 158 #include "ginetaddress.h"
michael@455 159 diff -Nau gio/gresource-tool.c.orig gio/gresource-tool.c
michael@455 160 Index: gio/gresource-tool.c
michael@455 161 --- gio/gresource-tool.c.orig 2012-08-03 11:25:31.632225248 +0200
michael@455 162 +++ gio/gresource-tool.c 2012-08-03 11:38:12.657797557 +0200
michael@455 163 @@ -31,6 +31,11 @@
michael@455 164 #include <locale.h>
michael@455 165
michael@455 166 #ifdef HAVE_LIBELF
michael@455 167 +/* Solaris libelf does not support largefile in 32-bit mode */
michael@455 168 +#if defined (__SVR4) && defined (__sun) && defined (__i386)
michael@455 169 +#undef _FILE_OFFSET_BITS
michael@455 170 +#define _FILE_OFFSET_BITS 32
michael@455 171 +#endif
michael@455 172 #include <libelf.h>
michael@455 173 #include <gelf.h>
michael@455 174 #include <sys/mman.h>

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial