You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
134 lines
4.8 KiB
134 lines
4.8 KiB
Index: Makefile.in |
|
--- Makefile.in.orig 2017-08-09 11:47:55.947317000 +0200 |
|
+++ Makefile.in 2017-08-09 11:48:09.949399000 +0200 |
|
@@ -835,7 +835,7 @@ |
|
|
|
@ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test) |
|
ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} |
|
-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests |
|
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po |
|
DIST_SUBDIRS = $(SUBDIRS) build win32 |
|
bin_SCRIPTS = glib-gettextize |
|
AM_CPPFLAGS = \ |
|
Index: gio/Makefile.in |
|
--- gio/Makefile.in.orig 2017-08-07 18:35:30.000000000 +0200 |
|
+++ gio/Makefile.in 2017-08-09 11:47:55.948379000 +0200 |
|
@@ -1316,7 +1316,7 @@ |
|
|
|
@ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test) |
|
SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \ |
|
- $(am__append_22) $(am__append_25) . tests $(am__append_28) |
|
+ $(am__append_22) $(am__append_25) . $(am__append_28) |
|
@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) |
|
@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib |
|
AM_CPPFLAGS = \ |
|
Index: gio/glib-compile-schemas.c |
|
--- gio/glib-compile-schemas.c.orig 2017-08-07 16:58:31.000000000 +0200 |
|
+++ gio/glib-compile-schemas.c 2017-08-09 11:47:55.948697000 +0200 |
|
@@ -1576,7 +1576,7 @@ |
|
} |
|
/* Text {{{2 */ |
|
static void |
|
-text (GMarkupParseContext *context, |
|
+XXXtext (GMarkupParseContext *context, |
|
const gchar *text, |
|
gsize text_len, |
|
gpointer user_data, |
|
@@ -1757,7 +1757,7 @@ |
|
parse_gschema_files (gchar **files, |
|
gboolean strict) |
|
{ |
|
- GMarkupParser parser = { start_element, end_element, text }; |
|
+ GMarkupParser parser = { start_element, end_element, XXXtext }; |
|
ParseState state = { 0, }; |
|
const gchar *filename; |
|
GError *error = NULL; |
|
Index: gio/tests/gdbus-peer.c |
|
--- gio/tests/gdbus-peer.c.orig 2017-08-07 16:58:31.000000000 +0200 |
|
+++ gio/tests/gdbus-peer.c 2017-08-09 11:47:55.948985000 +0200 |
|
@@ -27,6 +27,7 @@ |
|
/* for open(2) */ |
|
#include <sys/types.h> |
|
#include <sys/stat.h> |
|
+#include <sys/socket.h> |
|
#include <fcntl.h> |
|
#include <string.h> |
|
|
|
Index: gio/tests/org.gtk.test.gschema.xml |
|
Index: gio/xdgmime/xdgmimecache.h |
|
--- gio/xdgmime/xdgmimecache.h.orig 2017-07-14 01:03:39.000000000 +0200 |
|
+++ gio/xdgmime/xdgmimecache.h 2017-08-09 11:47:55.949112000 +0200 |
|
@@ -44,6 +44,9 @@ |
|
#define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) |
|
#define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) |
|
#define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) |
|
+#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) |
|
+#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) |
|
+#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) |
|
#endif |
|
|
|
extern XdgMimeCache **_caches; |
|
Index: glib/gatomic.c |
|
--- glib/gatomic.c.orig 2017-07-14 01:03:39.000000000 +0200 |
|
+++ glib/gatomic.c 2017-08-09 11:47:55.949302000 +0200 |
|
@@ -19,6 +19,7 @@ |
|
|
|
#include "config.h" |
|
|
|
+#include "gthread.h" |
|
#include "gatomic.h" |
|
|
|
/** |
|
Index: glib/gmem.c |
|
--- glib/gmem.c.orig 2017-07-14 01:03:39.000000000 +0200 |
|
+++ glib/gmem.c 2017-08-09 11:47:55.949440000 +0200 |
|
@@ -38,6 +38,7 @@ |
|
#include "gbacktrace.h" |
|
#include "gtestutils.h" |
|
#include "gthread.h" |
|
+#include "gthreadprivate.h" |
|
#include "glib_trace.h" |
|
|
|
/* notes on macros: |
|
Index: glib/gthread-posix.c |
|
--- glib/gthread-posix.c.orig 2017-07-14 01:03:39.000000000 +0200 |
|
+++ glib/gthread-posix.c 2017-08-09 11:47:55.949663000 +0200 |
|
@@ -96,7 +96,7 @@ |
|
if G_UNLIKELY (mutex == NULL) |
|
g_thread_abort (errno, "malloc"); |
|
|
|
-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP |
|
+#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__) |
|
pthread_mutexattr_init (&attr); |
|
pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP); |
|
pattr = &attr; |
|
@@ -105,7 +105,7 @@ |
|
if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0) |
|
g_thread_abort (status, "pthread_mutex_init"); |
|
|
|
-#ifdef PTHREAD_ADAPTIVE_MUTEX_NP |
|
+#if defined(PTHREAD_ADAPTIVE_MUTEX_NP) && !defined(__FreeBSD__) |
|
pthread_mutexattr_destroy (&attr); |
|
#endif |
|
|
|
Index: gmodule/gmodule-dl.c |
|
--- gmodule/gmodule-dl.c.orig 2017-07-14 01:03:39.000000000 +0200 |
|
+++ gmodule/gmodule-dl.c 2017-08-09 11:47:55.949792000 +0200 |
|
@@ -106,6 +106,7 @@ |
|
static gpointer |
|
_g_module_self (void) |
|
{ |
|
+#ifndef __FreeBSD__ |
|
gpointer handle; |
|
|
|
/* to query symbols from the program itself, special link options |
|
@@ -127,6 +128,9 @@ |
|
g_module_set_error (fetch_dlerror (TRUE)); |
|
|
|
return handle; |
|
+#else |
|
+ return RTLD_DEFAULT; |
|
+#endif |
|
} |
|
|
|
static void
|
|
|