openpkg-packages/glib2/glib2.patch

Index: gio/glib-compile-schemas.c
--- gio/glib-compile-schemas.c.orig	2010-11-14 06:49:49.000000000 +0100
+++ gio/glib-compile-schemas.c	2010-12-31 11:40:08.000000000 +0100
@@ -1458,7 +1458,7 @@
 }
 /* Text {{{2 */
 static void
-text (GMarkupParseContext  *context,
+XXXtext (GMarkupParseContext  *context,
       const gchar          *text,
       gsize                 text_len,
       gpointer              user_data,
@@ -1590,7 +1590,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/libasyncns/asyncns.c
--- gio/libasyncns/asyncns.c.orig	2010-04-13 15:33:16.000000000 +0200
+++ gio/libasyncns/asyncns.c	2010-12-31 11:40:08.000000000 +0100
@@ -39,6 +39,8 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 #include <pwd.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
Index: gio/tests/gdbus-peer.c
--- gio/tests/gdbus-peer.c.orig	2010-11-12 14:52:52.000000000 +0100
+++ gio/tests/gdbus-peer.c	2010-12-31 11:40:08.000000000 +0100
@@ -37,6 +37,8 @@
 #include <gio/gunixsocketaddress.h>
 #include <gio/gunixfdlist.h>
 
+#include <sys/socket.h>
+
 /* used in test_overflow */
 #ifdef G_OS_UNIX
 #include <gio/gunixconnection.h>
Index: gio/xdgmime/xdgmimecache.h
--- gio/xdgmime/xdgmimecache.h.orig	2010-08-16 20:43:54.000000000 +0200
+++ gio/xdgmime/xdgmimecache.h	2010-12-31 11:40:08.000000000 +0100
@@ -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-2.0.pc.in
--- glib-2.0.pc.in.orig	2009-04-01 01:04:20.000000000 +0200
+++ glib-2.0.pc.in	2010-12-31 11:56:41.000000000 +0100
@@ -10,6 +10,6 @@
 Name: GLib
 Description: C Utility Library
 Version: @VERSION@
-Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
+Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ -lpcre
 Libs.private: @ICONV_LIBS@
 Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
Index: glib/gatomic.c
--- glib/gatomic.c.orig	2010-09-05 06:20:56.000000000 +0200
+++ glib/gatomic.c	2010-12-31 11:40:08.000000000 +0100
@@ -27,6 +27,7 @@
 #include <sched.h>
 #endif
 
+#include "gthread.h"
 #include "gatomic.h"
 #include "gthreadprivate.h"
 
Index: glib/gregex.c
--- glib/gregex.c.orig	2010-09-18 22:17:22.000000000 +0200
+++ glib/gregex.c	2010-12-31 11:40:08.000000000 +0100
@@ -226,8 +226,10 @@
     case PCRE_ERROR_DFA_RECURSE:
     case PCRE_ERROR_RECURSIONLIMIT:
       return _("recursion limit reached");
+#ifdef PCRE_ERROR_NULLWSLIMIT
     case PCRE_ERROR_NULLWSLIMIT:
       return _("workspace limit for empty substrings reached");
+#endif
     case PCRE_ERROR_BADNEWLINE:
       return _("invalid combination of newline flags");
     default:
Index: gmodule/gmodule-dl.c
--- gmodule/gmodule-dl.c.orig	2009-04-01 01:04:20.000000000 +0200
+++ gmodule/gmodule-dl.c	2010-12-31 11:40:08.000000000 +0100
@@ -107,6 +107,7 @@
 static gpointer
 _g_module_self (void)
 {
+#ifndef __FreeBSD__
   gpointer handle;
   
   /* to query symbols from the program itself, special link options
@@ -118,6 +119,9 @@
     g_module_set_error (fetch_dlerror (TRUE));
   
   return handle;
+#else
+  return RTLD_DEFAULT;
+#endif
 }
 
 static void
Index: gthread/gthread-posix.c
--- gthread/gthread-posix.c.orig	2009-04-01 01:04:20.000000000 +0200
+++ gthread/gthread-posix.c	2010-12-31 11:40:08.000000000 +0100
@@ -130,7 +130,8 @@
 g_thread_impl_init(void)
 {
 #ifdef _SC_THREAD_STACK_MIN
-  g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0);
+  g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN),
+    g_thread_min_stack_size);
 #endif /* _SC_THREAD_STACK_MIN */
 #ifdef HAVE_PRIORITIES
 # ifdef G_THREADS_IMPL_POSIX
@@ -187,7 +188,7 @@
   result = pthread_mutex_trylock ((pthread_mutex_t *) mutex);
 
 #ifdef G_THREADS_IMPL_POSIX
-  if (result == EBUSY)
+  if ((result == EBUSY) || (result == EDEADLK))
     return FALSE;
 #else /* G_THREADS_IMPL_DCE */
   if (result == 0)
Index: tests/errorcheck-mutex-test.c
--- tests/errorcheck-mutex-test.c.orig	2009-04-01 01:04:20.000000000 +0200
+++ tests/errorcheck-mutex-test.c	2010-12-31 11:40:08.000000000 +0100
@@ -1,3 +1,5 @@
+#ifdef G_THREADS_ENABLED
+
 #undef G_DISABLE_ASSERT
 #undef G_LOG_DOMAIN
 #define G_ERRORCHECK_MUTEXES
@@ -102,9 +104,12 @@
    timed_wait_on_otherwise_locked_mutex}
 };
 
+#endif
+
 int
 main (int argc, char* argv[])
 {
+#ifdef G_THREADS_ENABLED
   int i;
 
   if (argc == 2)
@@ -126,6 +131,7 @@
     {
       fprintf (stderr, "      %s\n", func_table[i].name);
     }
+#endif
 
   return 0;
 }