1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/glib2/glib2.patch Fri Oct 22 13:29:57 2010 +0200 1.3 @@ -0,0 +1,74 @@ 1.4 +Index: configure 1.5 +--- configure.orig 2010-03-16 03:52:21.000000000 +0100 1.6 ++++ configure 2010-03-17 20:07:17.000000000 +0100 1.7 +@@ -25810,7 +25810,7 @@ 1.8 + add_thread_lib="-l$thread_lib" 1.9 + IN=" in -l$thread_lib" 1.10 + fi 1.11 +- LIBS="$add_thread_lib $glib_save_LIBS" 1.12 ++ LIBS="$add_thread_lib `echo x$glib_save_LIBS | sed -e 's;^x;;' -e 's;-lrt;;'`" 1.13 + 1.14 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_min$IN" >&5 1.15 + $as_echo_n "checking for sched_get_priority_min$IN... " >&6; } 1.16 +Index: glib-2.0.pc.in 1.17 +--- glib-2.0.pc.in.orig 2009-04-01 01:04:20.000000000 +0200 1.18 ++++ glib-2.0.pc.in 2010-03-17 20:07:17.000000000 +0100 1.19 +@@ -9,6 +9,7 @@ 1.20 + 1.21 + Name: GLib 1.22 + Description: C Utility Library 1.23 ++Requires: libpcre 1.24 + Version: @VERSION@ 1.25 + Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ 1.26 + Libs.private: @ICONV_LIBS@ 1.27 +Index: gmodule/gmodule-dl.c 1.28 +--- gmodule/gmodule-dl.c.orig 2009-04-01 01:04:20.000000000 +0200 1.29 ++++ gmodule/gmodule-dl.c 2010-03-17 20:07:17.000000000 +0100 1.30 +@@ -107,6 +107,7 @@ 1.31 + static gpointer 1.32 + _g_module_self (void) 1.33 + { 1.34 ++#ifndef __FreeBSD__ 1.35 + gpointer handle; 1.36 + 1.37 + /* to query symbols from the program itself, special link options 1.38 +@@ -118,6 +119,9 @@ 1.39 + g_module_set_error (fetch_dlerror (TRUE)); 1.40 + 1.41 + return handle; 1.42 ++#else 1.43 ++ return RTLD_DEFAULT; 1.44 ++#endif 1.45 + } 1.46 + 1.47 + static void 1.48 +Index: tests/errorcheck-mutex-test.c 1.49 +--- tests/errorcheck-mutex-test.c.orig 2009-04-01 01:04:20.000000000 +0200 1.50 ++++ tests/errorcheck-mutex-test.c 2010-03-17 20:07:17.000000000 +0100 1.51 +@@ -1,3 +1,5 @@ 1.52 ++#ifdef G_THREADS_ENABLED 1.53 ++ 1.54 + #undef G_DISABLE_ASSERT 1.55 + #undef G_LOG_DOMAIN 1.56 + #define G_ERRORCHECK_MUTEXES 1.57 +@@ -102,9 +104,12 @@ 1.58 + timed_wait_on_otherwise_locked_mutex} 1.59 + }; 1.60 + 1.61 ++#endif 1.62 ++ 1.63 + int 1.64 + main (int argc, char* argv[]) 1.65 + { 1.66 ++#ifdef G_THREADS_ENABLED 1.67 + int i; 1.68 + 1.69 + if (argc == 2) 1.70 +@@ -126,6 +131,7 @@ 1.71 + { 1.72 + fprintf (stderr, " %s\n", func_table[i].name); 1.73 + } 1.74 ++#endif 1.75 + 1.76 + return 0; 1.77 + }