head 1.9; access; symbols OPENPKG_E1_MP_HEAD:1.6 OPENPKG_E1_MP:1.6 OPENPKG_E1_MP_2_STABLE:1.2.4.2 OPENPKG_E1_FP:1.2.4.2 OPENPKG_2_STABLE_MP:1.5 OPENPKG_2_STABLE_20061018:1.2.4.1 OPENPKG_2_STABLE_20060622:1.2 OPENPKG_2_STABLE:1.2.0.4 OPENPKG_2_STABLE_BP:1.2 OPENPKG_2_5_RELEASE:1.2 OPENPKG_2_5_SOLID:1.2.0.2 OPENPKG_2_5_SOLID_BP:1.2 OPENPKG_2_4_RELEASE:1.1 OPENPKG_2_4_SOLID:1.1.0.8 OPENPKG_2_4_SOLID_BP:1.1 OPENPKG_CW_FP:1.1 OPENPKG_2_3_RELEASE:1.1 OPENPKG_2_3_SOLID:1.1.0.6 OPENPKG_2_3_SOLID_BP:1.1 OPENPKG_2_2_RELEASE:1.1 OPENPKG_2_2_SOLID:1.1.0.4 OPENPKG_2_2_SOLID_BP:1.1 OPENPKG_2_1_RELEASE:1.1 OPENPKG_2_1_SOLID:1.1.0.2 OPENPKG_2_1_SOLID_BP:1.1; locks; strict; comment @# @; 1.9 date 2008.10.17.06.41.17; author rse; state Exp; branches; next 1.8; commitid a2UFTtAo0mvgMWmt; 1.8 date 2008.03.11.19.54.15; author rse; state Exp; branches; next 1.7; commitid LrNhd5n1FsjJeKUs; 1.7 date 2007.12.19.19.13.34; author rse; state Exp; branches; next 1.6; commitid SkBSWDqKRMNbG4Ks; 1.6 date 2006.12.19.07.18.46; author rse; state Exp; branches; next 1.5; commitid aNq7NMWYBLxns6Zr; 1.5 date 2006.10.24.10.02.05; author rse; state Exp; branches; next 1.4; commitid kRtpTYM8ptWZ9VRr; 1.4 date 2006.10.02.05.51.41; author rse; state Exp; branches; next 1.3; commitid aJV7nuQgfclXt4Pr; 1.3 date 2006.08.08.07.27.57; author rse; state Exp; branches; next 1.2; commitid pp8faxp0YbfAM0Ir; 1.2 date 2005.08.20.21.54.34; author rse; state Exp; branches 1.2.4.1; next 1.1; 1.1 date 2004.06.05.15.33.46; author ms; state Exp; branches; next ; 1.2.4.1 date 2006.10.16.14.50.32; author rse; state Exp; branches; next 1.2.4.2; commitid iZxwRSmmWscPXUQr; 1.2.4.2 date 2006.10.24.10.03.27; author rse; state Exp; branches; next ; commitid MV3eRB0VPjOtaVRr; desc @@ 1.9 log @upgrading package: glib2 2.18.1 -> 2.18.2 @ text @Index: configure --- configure.orig 2008-03-11 01:41:11 +0100 +++ configure 2008-03-11 20:40:30 +0100 @@@@ -39397,7 +39397,7 @@@@ add_thread_lib="-l$thread_lib" IN=" in -l$thread_lib" fi - LIBS="$add_thread_lib $glib_save_LIBS" + LIBS="$add_thread_lib `echo x$glib_save_LIBS | sed -e 's;^x;;' -e 's;-lrt;;'`" { echo "$as_me:$LINENO: checking for sched_get_priority_min$IN" >&5 echo $ECHO_N "checking for sched_get_priority_min$IN... $ECHO_C" >&6; } Index: glib-2.0.pc.in --- glib-2.0.pc.in.orig 2008-03-11 01:32:01 +0100 +++ glib-2.0.pc.in 2008-03-11 20:40:30 +0100 @@@@ -9,6 +9,7 @@@@ Name: GLib Description: C Utility Library +Requires: libpcre Version: @@VERSION@@ Libs: -L${libdir} -lglib-2.0 @@INTLLIBS@@ @@ICONV_LIBS@@ Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include Index: gmodule/gmodule-dl.c --- gmodule/gmodule-dl.c.orig 2008-03-11 01:31:51 +0100 +++ gmodule/gmodule-dl.c 2008-03-11 20:40:30 +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: tests/errorcheck-mutex-test.c --- tests/errorcheck-mutex-test.c.orig 2008-03-11 01:31:52 +0100 +++ tests/errorcheck-mutex-test.c 2008-03-11 20:40:30 +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; } Index: configure --- configure.orig 2008-10-17 08:34:41 +0200 +++ configure 2008-10-17 08:38:53 +0200 @@@@ -4266,13 +4266,7 @@@@ if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + : fi ac_ext=c @ 1.8 log @upgrading package: glib2 2.14.5 -> 2.16.1 @ text @d75 18 @ 1.7 log @fix namespace conflicts by using external PCRE @ text @d2 3 a4 3 --- configure.orig 2007-12-19 17:09:14 +0100 +++ configure 2007-12-19 17:17:45 +0100 @@@@ -34435,7 +34435,7 @@@@ d13 4 a16 2 @@@@ -40304,8 +40304,8 @@@@ else d18 6 a23 17 glib_save_CFLAGS="$CFLAGS" - glib_save_LDFLAGS="$LDFLAGS" - CFLAGS="$CFLAGS $PCRE_CFLAGS" LDFLAGS="$LDFLAGS $PCRE_LIBS" + glib_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $PCRE_CFLAGS" LIBS="$LIBS $PCRE_LIBS" if test "$cross_compiling" = yes; then glib_cv_pcre_has_unicode=yes else @@@@ -40361,7 +40361,7 @@@@ CFLAGS="$glib_save_CFLAGS" - LDFLAGS="$glib_save_LDFLAGS" + LIBS="$glib_save_LIBS" fi { echo "$as_me:$LINENO: result: $glib_cv_pcre_has_unicode" >&5 d25 3 a27 3 --- gmodule/gmodule-dl.c.orig 2007-11-24 07:40:52 +0100 +++ gmodule/gmodule-dl.c 2007-12-19 17:09:14 +0100 @@@@ -106,6 +106,7 @@@@ d35 1 a35 1 @@@@ -117,6 +118,9 @@@@ d46 2 a47 2 --- tests/errorcheck-mutex-test.c.orig 2007-11-24 07:40:54 +0100 +++ tests/errorcheck-mutex-test.c 2007-12-19 17:09:14 +0100 a74 11 Index: glib-2.0.pc.in --- glib-2.0.pc.in.orig 2007-12-19 20:08:15 +0100 +++ glib-2.0.pc.in 2007-12-19 20:08:49 +0100 @@@@ -9,6 +9,7 @@@@ Name: GLib Description: C Utility Library +Requires: libpcre Version: @@VERSION@@ Libs: -L${libdir} -lglib2 @@INTLLIBS@@ @@ICONV_LIBS@@ Cflags: -I${includedir}/glib2 -I${libdir}/glib2/include @ 1.6 log @upgrading package: glib2 2.12.4 -> 2.12.5 @ text @d2 2 a3 2 --- configure.orig 2006-12-18 21:28:37 +0100 +++ configure 2006-12-19 08:11:07 +0100 d13 20 d34 2 a35 2 --- gmodule/gmodule-dl.c.orig 2004-02-20 02:41:00 +0100 +++ gmodule/gmodule-dl.c 2006-12-19 08:11:07 +0100 d55 2 a56 2 --- tests/errorcheck-mutex-test.c.orig 2006-05-11 01:58:26 +0200 +++ tests/errorcheck-mutex-test.c 2006-12-19 08:11:07 +0100 d84 11 @ 1.5 log @fix thread library dependency detection (upstream bugreport will be sent, too) by a cruel workaround. This implicitly fixes all other packages depending on glib2 and its gthread2 stuff @ text @d2 3 a4 3 --- configure.orig 2006-10-02 01:05:29.000000000 +0200 +++ configure 2006-10-24 11:54:36.072847414 +0200 @@@@ -34128,7 +34128,7 @@@@ d11 2 a12 14 echo "$as_me:$LINENO: checking for sched_get_priority_min$IN" >&5 echo $ECHO_N "checking for sched_get_priority_min$IN... $ECHO_C" >&6 Index: glib/gtimer.c --- glib/gtimer.c.orig 2006-10-01 07:51:15.000000000 +0200 +++ glib/gtimer.c 2006-10-24 11:53:59.538290388 +0200 @@@@ -257,7 +257,7 @@@@ if (microseconds) *microseconds = (elapsed / 10) % 1000000; -#elif HAVE_CLOCK_GETTIME +#elif USE_CLOCK_GETTIME if (timer->active) GETTIME (timer->end); d14 2 a15 2 --- gmodule/gmodule-dl.c.orig 2004-02-20 02:41:00.000000000 +0100 +++ gmodule/gmodule-dl.c 2006-10-24 11:53:59.538582104 +0200 d35 2 a36 2 --- tests/errorcheck-mutex-test.c.orig 2006-05-11 01:58:26.000000000 +0200 +++ tests/errorcheck-mutex-test.c 2006-10-24 11:53:59.538736913 +0200 @ 1.4 log @upgrading package: glib2 2.12.3 -> 2.12.4 @ text @d1 12 d14 2 a15 2 --- glib/gtimer.c.orig 2006-10-01 07:51:15 +0200 +++ glib/gtimer.c 2006-10-02 07:48:30 +0200 d26 2 a27 2 --- gmodule/gmodule-dl.c.orig 2004-02-20 02:41:00 +0100 +++ gmodule/gmodule-dl.c 2006-10-02 07:42:55 +0200 d47 2 a48 2 --- tests/errorcheck-mutex-test.c.orig 2006-05-11 01:58:26 +0200 +++ tests/errorcheck-mutex-test.c 2006-10-02 07:42:55 +0200 @ 1.3 log @fix building under with_threads=no @ text @d1 12 d15 1 a15 1 +++ gmodule/gmodule-dl.c 2006-08-08 09:24:49 +0200 d36 1 a36 1 +++ tests/errorcheck-mutex-test.c 2006-08-08 09:25:44 +0200 @ 1.2 log @Perform the upgrade to Gtk 2.8 together with the upgrade of all its direct dependency libraries. Gtk 2.8 is considered API compatible with Gtk 2.6 but nevertheless this upgrade at least required lots of small changes to mostly all involved packages. The most notable change is that Gtk 2.8 is now based on Cairo. @ text @d3 1 a3 1 +++ gmodule/gmodule-dl.c 2005-08-15 10:07:43 +0200 d22 30 @ 1.2.4.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 12 Index: glib/gtimer.c --- glib/gtimer.c.orig 2006-10-01 07:51:15 +0200 +++ glib/gtimer.c 2006-10-02 07:48:30 +0200 @@@@ -257,7 +257,7 @@@@ if (microseconds) *microseconds = (elapsed / 10) % 1000000; -#elif HAVE_CLOCK_GETTIME +#elif USE_CLOCK_GETTIME if (timer->active) GETTIME (timer->end); d3 1 a3 1 +++ gmodule/gmodule-dl.c 2006-10-02 07:42:55 +0200 a21 30 Index: tests/errorcheck-mutex-test.c --- tests/errorcheck-mutex-test.c.orig 2006-05-11 01:58:26 +0200 +++ tests/errorcheck-mutex-test.c 2006-10-02 07:42:55 +0200 @@@@ -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; } @ 1.2.4.2 log @MFC: fix thread library dependency detection (upstream bugreport will be sent, too) by a cruel workaround. This implicitly fixes all other packages depending on glib2 and its gthread2 stuff @ text @a0 12 Index: configure --- configure.orig 2006-10-02 01:05:29.000000000 +0200 +++ configure 2006-10-24 11:54:36.072847414 +0200 @@@@ -34128,7 +34128,7 @@@@ add_thread_lib="-l$thread_lib" IN=" in -l$thread_lib" fi - LIBS="$add_thread_lib $glib_save_LIBS" + LIBS="$add_thread_lib `echo x$glib_save_LIBS | sed -e 's;^x;;' -e 's;-lrt;;'`" echo "$as_me:$LINENO: checking for sched_get_priority_min$IN" >&5 echo $ECHO_N "checking for sched_get_priority_min$IN... $ECHO_C" >&6 d2 2 a3 2 --- glib/gtimer.c.orig 2006-10-01 07:51:15.000000000 +0200 +++ glib/gtimer.c 2006-10-24 11:53:59.538290388 +0200 d14 2 a15 2 --- gmodule/gmodule-dl.c.orig 2004-02-20 02:41:00.000000000 +0100 +++ gmodule/gmodule-dl.c 2006-10-24 11:53:59.538582104 +0200 d35 2 a36 2 --- tests/errorcheck-mutex-test.c.orig 2006-05-11 01:58:26.000000000 +0200 +++ tests/errorcheck-mutex-test.c 2006-10-24 11:53:59.538736913 +0200 @ 1.1 log @repair flawed configure script test for C++ preprocessor using a substitution instead of a patch for future maintenance @ text @d1 4 a4 3 --- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001 +++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002 @@@@ -104,6 +104,7 @@@@ d12 1 a12 1 @@@@ -115,6 +116,9 @@@@ @