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: 04-Oct-2006 07:46:47
Branch: HEAD Handle: 2006100406464600
Modified files:
openpkg-src/pkgconfig pkgconfig.patch pkgconfig.spec
Log:
cleanup packaging and fix patch
Summary:
Revision Changes Path
1.4 +30 -31 openpkg-src/pkgconfig/pkgconfig.patch
1.37 +2 -1 openpkg-src/pkgconfig/pkgconfig.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pkgconfig/pkgconfig.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 pkgconfig.patch
--- openpkg-src/pkgconfig/pkgconfig.patch 24 Oct 2005 13:25:01 -0000
1.3
+++ openpkg-src/pkgconfig/pkgconfig.patch 4 Oct 2006 05:46:46 -0000
1.4
@@ -1,30 +1,6 @@
-diff -Nau parse.c.orig parse.c
---- parse.c.orig Fri Nov 7 10:55:19 2003
-+++ 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
- }
Index: main.c
---- main.c.orig 2005-10-16 20:04:50 +0200
-+++ main.c 2005-10-24 15:13:44 +0200
+--- main.c.orig 2006-08-16 19:54:56 +0200
++++ main.c 2006-10-03 16:21:58 +0200
@@ -182,7 +182,8 @@
int want_I_cflags = 0;
int want_other_cflags = 0;
@@ -46,9 +22,9 @@
{ "short-errors", 0, POPT_ARG_NONE, &want_short_errors, 0,
"print short errors" },
{ "libs-only-l", 0, POPT_ARG_NONE, &want_l_libs, 0,
-@@ -621,6 +624,17 @@
- need_newline = TRUE;
- }
+@@ -415,6 +418,17 @@
+ else
+ debug_spew ("Error printing disabled\n");
+ /*************************************************************************
+ * if user explicitly specified only --static, then recurse. *
@@ -61,6 +37,29 @@
+ if (!want_static_lib_list && !want_shared_lib_list)
+ want_static_lib_list = ENABLE_INDIRECT_DEPS;
+
- if (want_l_libs)
+ if (want_static_lib_list)
+ enable_private_libs();
+ else
+Index: parse.c
+--- parse.c.orig 2006-08-16 20:45:45 +0200
++++ parse.c 2006-10-03 16:17:58 +0200
+@@ -1394,7 +1394,7 @@
+
+ return pkg;
+ }
+- else
++ else if (strncmp (name, "gnome", strlen("gnome")) == 0)
{
- char *str = packages_get_l_libs (packages);
+ /* Check for the module in gnome-config */
+ char *output;
+@@ -1493,5 +1493,10 @@
+
+ return pkg;
+ }
++ else
++ {
++ g_free (pkg);
++ return NULL;
++ }
+ #endif
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pkgconfig/pkgconfig.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 pkgconfig.spec
--- openpkg-src/pkgconfig/pkgconfig.spec 24 Sep 2006 08:32:52 -0000
1.36
+++ openpkg-src/pkgconfig/pkgconfig.spec 4 Oct 2006 05:46:46 -0000
1.37
@@ -33,7 +33,7 @@
Group: Building
License: GPL
Version: 0.21
-Release: 20060924
+Release: 20061004
# list of sources
Source0:
http://pkgconfig.freedesktop.org/releases/pkg-config-%{version}.tar.gz
@@ -64,6 +64,7 @@
%patch -p0
%{l_shtool} subst \
-e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+ -e 's;-Wall;;' \
configure glib-*/configure
%build
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
