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: 19-Dec-2007 20:13:35
Branch: HEAD Handle: 2007121919133400
Modified files:
openpkg-src/glib2 glib2.patch glib2.spec
Log:
fix namespace conflicts by using external PCRE
Summary:
Revision Changes Path
1.7 +37 -6 openpkg-src/glib2/glib2.patch
1.94 +6 -5 openpkg-src/glib2/glib2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/glib2/glib2.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 glib2.patch
--- openpkg-src/glib2/glib2.patch 19 Dec 2006 07:18:46 -0000 1.6
+++ openpkg-src/glib2/glib2.patch 19 Dec 2007 19:13:34 -0000 1.7
@@ -1,6 +1,6 @@
Index: configure
---- configure.orig 2006-12-18 21:28:37 +0100
-+++ configure 2006-12-19 08:11:07 +0100
+--- configure.orig 2007-12-19 17:09:14 +0100
++++ configure 2007-12-19 17:17:45 +0100
@@ -34435,7 +34435,7 @@
add_thread_lib="-l$thread_lib"
IN=" in -l$thread_lib"
@@ -10,9 +10,29 @@
{ 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; }
+@@ -40304,8 +40304,8 @@
+ else
+
+ 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
Index: gmodule/gmodule-dl.c
---- gmodule/gmodule-dl.c.orig 2004-02-20 02:41:00 +0100
-+++ gmodule/gmodule-dl.c 2006-12-19 08:11:07 +0100
+--- 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 @@
static gpointer
_g_module_self (void)
@@ -32,8 +52,8 @@
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-12-19 08:11:07 +0100
+--- 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
@@ -1,3 +1,5 @@
+#ifdef G_THREADS_ENABLED
+
@@ -61,3 +81,14 @@
return 0;
}
+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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/glib2/glib2.spec
============================================================================
$ cvs diff -u -r1.93 -r1.94 glib2.spec
--- openpkg-src/glib2/glib2.spec 25 Nov 2007 10:45:24 -0000 1.93
+++ openpkg-src/glib2/glib2.spec 19 Dec 2007 19:13:34 -0000 1.94
@@ -37,7 +37,7 @@
Group: Algorithm
License: GPL
Version: %{V_glib2_major}.%{V_glib2_minor}
-Release: 20071125
+Release: 20071219
# package options
%option with_threads yes
@@ -49,10 +49,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make, pkgconfig
-PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: gettext, libiconv, perl
-PreReq: gettext, libiconv, perl
+BuildPreReq: OpenPKG, openpkg >= 20040130, perl, make, pkgconfig
+PreReq: OpenPKG, openpkg >= 20040130, perl
+BuildPreReq: gettext, libiconv, pcre
+PreReq: gettext, libiconv, pcre
AutoReq: no
AutoReqProv: no
@@ -114,6 +114,7 @@
--with-libiconv=gnu \
--disable-debug \
--disable-shared \
+ --with-pcre=system \
%if "%{with_threads}" == "yes"
--enable-threads
%else
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
