openpkg-packages/glib/glib.patch

Index: Makefile.in
--- Makefile.in.orig	2013-10-15 21:14:50.000000000 +0200
+++ Makefile.in	2013-10-20 10:29:53.907825969 +0200
@@ -820,7 +820,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
 bin_SCRIPTS = glib-gettextize
 AM_CPPFLAGS = \
Index: gio/Makefile.in
--- gio/Makefile.in.orig	2013-10-15 21:14:51.000000000 +0200
+++ gio/Makefile.in	2013-10-20 10:30:46.597786355 +0200
@@ -800,7 +800,7 @@
       b='$*';; \
   esac
 DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue fen win32 . \
-	tests fam
+	fam
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -1173,8 +1173,8 @@
 @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
 
 @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_26) $(am__append_29) . tests \
+SUBDIRS = $(am__append_15) $(am__append_19) \
+	$(am__append_22) $(am__append_26) $(am__append_29) . \
 	$(am__append_32)
 @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
Index: gio/glib-compile-schemas.c
--- gio/glib-compile-schemas.c.orig	2013-08-08 12:00:40.000000000 +0200
+++ gio/glib-compile-schemas.c	2013-10-20 10:29:04.017821164 +0200
@@ -1534,7 +1534,7 @@
 }
 /* Text {{{2 */
 static void
-text (GMarkupParseContext  *context,
+XXXtext (GMarkupParseContext  *context,
       const gchar          *text,
       gsize                 text_len,
       gpointer              user_data,
@@ -1699,7 +1699,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	2013-10-15 21:07:46.000000000 +0200
+++ gio/tests/gdbus-peer.c	2013-10-20 10:31:04.238696024 +0200
@@ -29,6 +29,7 @@
 /* for open(2) */
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
 #include <fcntl.h>
 #include <string.h>
 
Index: gio/xdgmime/xdgmimecache.h
--- gio/xdgmime/xdgmimecache.h.orig	2013-05-07 20:26:07.000000000 +0200
+++ gio/xdgmime/xdgmimecache.h	2013-10-20 10:29:04.017821164 +0200
@@ -46,6 +46,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	2013-08-08 12:00:40.000000000 +0200
+++ glib/gatomic.c	2013-10-20 10:29:04.017821164 +0200
@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include "gthread.h"
 #include "gatomic.h"
 
 /**
Index: gmodule/gmodule-dl.c
--- gmodule/gmodule-dl.c.orig	2013-08-08 12:00:40.000000000 +0200
+++ gmodule/gmodule-dl.c	2013-10-20 10:29:04.017821164 +0200
@@ -107,6 +107,7 @@
 static gpointer
 _g_module_self (void)
 {
+#ifndef __FreeBSD__
   gpointer handle;
   
   /* to query symbols from the program itself, special link options
@@ -122,6 +123,9 @@
     g_module_set_error (fetch_dlerror (TRUE));
   
   return handle;
+#else
+  return RTLD_DEFAULT;
+#endif
 }
 
 static void