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: 11-Mar-2008 20:54:16
Branch: HEAD Handle: 2008031119541500
Modified files:
openpkg-src/glib2 glib2.patch glib2.spec
Log:
upgrading package: glib2 2.14.5 -> 2.16.1
Summary:
Revision Changes Path
1.8 +19 -39 openpkg-src/glib2/glib2.patch
1.98 +21 -5 openpkg-src/glib2/glib2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/glib2/glib2.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 glib2.patch
--- openpkg-src/glib2/glib2.patch 19 Dec 2007 19:13:34 -0000 1.7
+++ openpkg-src/glib2/glib2.patch 11 Mar 2008 19:54:15 -0000 1.8
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2007-12-19 17:09:14 +0100
-+++ configure 2007-12-19 17:17:45 +0100
-@@ -34435,7 +34435,7 @@
+--- 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
@@ -10,30 +10,21 @@
{ 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"
+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 @@
- fi
- { echo "$as_me:$LINENO: result: $glib_cv_pcre_has_unicode" >&5
+ 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 2007-11-24 07:40:52 +0100
-+++ gmodule/gmodule-dl.c 2007-12-19 17:09:14 +0100
-@@ -106,6 +106,7 @@
+--- 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)
{
@@ -41,7 +32,7 @@
gpointer handle;
/* to query symbols from the program itself, special link options
-@@ -117,6 +118,9 @@
+@@ -118,6 +119,9 @@
g_module_set_error (fetch_dlerror (TRUE));
return handle;
@@ -52,8 +43,8 @@
static void
Index: tests/errorcheck-mutex-test.c
---- 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
+--- 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
+
@@ -81,14 +72,3 @@
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.97 -r1.98 glib2.spec
--- openpkg-src/glib2/glib2.spec 8 Jan 2008 18:54:19 -0000 1.97
+++ openpkg-src/glib2/glib2.spec 11 Mar 2008 19:54:15 -0000 1.98
@@ -22,8 +22,8 @@
##
# package version
-%define V_glib2_major 2.14
-%define V_glib2_minor 5
+%define V_glib2_major 2.16
+%define V_glib2_minor 1
# package information
Name: glib2
@@ -36,13 +36,13 @@
Group: Algorithm
License: GPL
Version: %{V_glib2_major}.%{V_glib2_minor}
-Release: 20080108
+Release: 20080311
# package options
%option with_threads yes
# list of sources
-Source0:
ftp://ftp.gtk.org/pub/glib/%{V_glib2_major}/glib-%{version}.tar.gz
+Source0:
ftp://ftp.gnome.org/pub/gnome/sources/glib/%{V_glib2_major}/glib-%{version}.tar.gz
Patch0: glib2.patch
# build information
@@ -64,7 +64,7 @@
%track
prog glib2 = {
version = %{version}
- url = ftp://ftp.gtk.org/pub/glib/%{V_glib2_major}/
+ url =
ftp://ftp.gnome.org/pub/gnome/sources/glib/%{V_glib2_major}/
regex = glib-(__VER__)\.tar\.(gz|bz2)
}
@@ -77,10 +77,24 @@
-e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
configure
%{l_shtool} subst \
+ -e 's;/glib-2\.0\.pc;/glib-x.x.pc;g' \
+ -e 's;/gobject-2\.0\.pc;/gobject-x.x.pc;g' \
+ -e 's;/gthread-2\.0\.pc;/gthread-x.x.pc;g' \
+ -e 's;/gmodule-2\.0\.pc;/gmodule-x.x.pc;g' \
+ -e 's;/gio-unix-2\.0\.pc;/gio-unix-x.x.pc;g' \
+ -e 's;/gio-2\.0\.pc;/gio-x.x.pc;g' \
-e 's;/glib-2\.0;/glib2;g' \
-e 's;/gobject-2\.0;/gobject2;g' \
-e 's;/gthread-2\.0;/gthread2;g' \
-e 's;/gmodule-2\.0;/gmodule2;g' \
+ -e 's;/gio-unix-2\.0;/gio-unix2;g' \
+ -e 's;/gio-2\.0;/gio2;g' \
+ -e 's;/glib-x\.x\.pc;/glib-2.0.pc;g' \
+ -e 's;/gobject-x\.x\.pc;/gobject-2.0.pc;g' \
+ -e 's;/gthread-x\.x\.pc;/gthread-2.0.pc;g' \
+ -e 's;/gmodule-x\.x\.pc;/gmodule-2.0.pc;g' \
+ -e 's;/gio-unix-x\.x\.pc;/gio-unix-2.0.pc;g' \
+ -e 's;/gio-x\.x\.pc;/gio-2.0.pc;g' \
-e 's;lib\(g[a-z]*\)-2\.0;lib\12;g' \
`find . -name Makefile.in -print` \
m4macros/glib-2.0.m4
@@ -89,6 +103,8 @@
-e 's;/gobject-2\.0;/gobject2;g' \
-e 's;/gthread-2\.0;/gthread2;g' \
-e 's;/gmodule-2\.0;/gmodule2;g' \
+ -e 's;/gio-unix-2\.0;/gio-unix2;g' \
+ -e 's;/gio-2\.0;/gio2;g' \
-e 's;-l\(g[a-z]*\)-2\.0;-l\12;g' \
*-2.0.pc.in
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
