OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Aug-2006 09:27:58
Branch: HEAD Handle: 2006080808275700
Modified files:
openpkg-src/glib2 glib2.patch glib2.spec
Log:
fix building under with_threads=no
Summary:
Revision Changes Path
1.3 +31 -1 openpkg-src/glib2/glib2.patch
1.70 +1 -1 openpkg-src/glib2/glib2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/glib2/glib2.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 glib2.patch
--- openpkg-src/glib2/glib2.patch 20 Aug 2005 21:54:34 -0000 1.2
+++ openpkg-src/glib2/glib2.patch 8 Aug 2006 07:27:57 -0000 1.3
@@ -1,6 +1,6 @@
Index: gmodule/gmodule-dl.c
--- gmodule/gmodule-dl.c.orig 2004-02-20 02:41:00 +0100
-+++ gmodule/gmodule-dl.c 2005-08-15 10:07:43 +0200
++++ gmodule/gmodule-dl.c 2006-08-08 09:24:49 +0200
@@ -106,6 +106,7 @@
static gpointer
_g_module_self (void)
@@ -19,3 +19,33 @@
}
static void
+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-08-08 09:25:44 +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;
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/glib2/glib2.spec
============================================================================
$ cvs diff -u -r1.69 -r1.70 glib2.spec
--- openpkg-src/glib2/glib2.spec 6 Aug 2006 09:16:57 -0000 1.69
+++ openpkg-src/glib2/glib2.spec 8 Aug 2006 07:27:57 -0000 1.70
@@ -38,7 +38,7 @@
Group: Algorithm
License: GPL
Version: %{V_glib2_major}.%{V_glib2_minor}
-Release: 20060806
+Release: 20060808
# package options
%option with_threads yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
