OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 07-Nov-2003 11:53:22
Branch: HEAD Handle: 2003110710532002
Added files:
openpkg-src/pkgconfig pkgconfig.patch
Modified files:
openpkg-src/pkgconfig pkgconfig.spec
openpkg-web news.txt
Log:
Do not call the nonexistant gnome-config as a default measure
Summary:
Revision Changes Path
1.1 +24 -0 openpkg-src/pkgconfig/pkgconfig.patch
1.13 +3 -1 openpkg-src/pkgconfig/pkgconfig.spec
1.7316 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pkgconfig/pkgconfig.patch
============================================================================
$ cvs diff -u -r0 -r1.1 pkgconfig.patch
--- /dev/null 2003-11-07 11:53:22.000000000 +0100
+++ pkgconfig.patch 2003-11-07 11:53:22.000000000 +0100
@@ -0,0 +1,24 @@
+diff -Naur pkgconfig-0.15.0.orig/parse.c pkgconfig-0.15.0/parse.c
+--- pkgconfig-0.15.0.orig/parse.c Fri Nov 7 10:55:19 2003
++++ pkgconfig-0.15.0/parse.c Fri Nov 7 11:37:53 2003
+@@ -1239,7 +1239,7 @@
+
+ return pkg;
+ }
+- else
++ else if (strncmp (name, "gnome", strlen("gnome")) == 0)
+ {
+ /* Check for the module in gnome-config */
+ char *output;
+@@ -1337,6 +1337,11 @@
+ g_free (output);
+
+ return pkg;
++ }
++ else
++ {
++ g_free (pkg);
++ return NULL;
+ }
+ #endif
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pkgconfig/pkgconfig.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 pkgconfig.spec
--- openpkg-src/pkgconfig/pkgconfig.spec 8 Jul 2003 14:41:53 -0000 1.12
+++ openpkg-src/pkgconfig/pkgconfig.spec 7 Nov 2003 10:53:22 -0000 1.13
@@ -33,10 +33,11 @@
Group: Converter
License: GPL
Version: 0.15.0
-Release: 20030117
+Release: 20031107
# list of sources
Source0:
http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-%{version}.tar.gz
+Patch0: pkgconfig.patch
# build information
Prefix: %{l_prefix}
@@ -53,6 +54,7 @@
%prep
%setup -q
+ %patch -p1
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7315 -r1.7316 news.txt
--- openpkg-web/news.txt 7 Nov 2003 08:06:34 -0000 1.7315
+++ openpkg-web/news.txt 7 Nov 2003 10:53:20 -0000 1.7316
@@ -1,3 +1,4 @@
+07-Nov-2003: Upgraded package: P<pkgconfig-0.15.0-20031107>
07-Nov-2003: Upgraded package: P<perl-5.8.2-20031107>
07-Nov-2003: Upgraded package: P<freetype-2.1.6-20031107>
06-Nov-2003: Upgraded package: P<perl-mail-20031106-20031106>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]