From 46039a37abf74b0757c7d81a3c25681f35b91a03 Mon Sep 17 00:00:00 2001
From: Qing He <qing.he@intel.com>
Date: Tue, 13 Jul 2010 15:04:13 +0800
Subject: [PATCH] pkgconfig: upgrade to version 0.25

from 0.23

changes:
  - remove sysrootfix patch, it's now in upstream
  - use external popt instead of the included one

Signed-off-by: Qing He <qing.he@intel.com>
---
 .../pkgconfig/pkgconfig-0.23/sysrootfix.patch | 31 -------------------
 .../autofoo.patch                             |  0
 .../glibconfig-sysdefs.h                      |  0
 meta/packages/pkgconfig/pkgconfig.inc         |  7 ++---
 .../{pkgconfig_0.23.bb => pkgconfig_0.25.bb}  |  2 ++
 5 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch
 rename meta/packages/pkgconfig/{pkgconfig-0.23 => pkgconfig-0.25}/autofoo.patch (100%)
 rename meta/packages/pkgconfig/{pkgconfig-0.23 => pkgconfig-0.25}/glibconfig-sysdefs.h (100%)
 rename meta/packages/pkgconfig/{pkgconfig_0.23.bb => pkgconfig_0.25.bb} (66%)

diff --git a/meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch b/meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch
deleted file mode 100644
index c5ee82e9aa..0000000000
--- a/meta/packages/pkgconfig/pkgconfig-0.23/sysrootfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: pkg-config-0.23/pkg.c
-===================================================================
---- pkg-config-0.23.orig/pkg.c	2008-03-26 22:18:39.000000000 +0000
-+++ pkg-config-0.23/pkg.c	2008-03-26 22:31:11.000000000 +0000
-@@ -472,19 +472,15 @@
-   while (tmp != NULL)
-     {
-       char *tmpstr = (char*) tmp->data;
--      if (pcsysrootdir != NULL)
-+      if (pcsysrootdir != NULL && tmpstr[0] == '-' &&
-+	      (tmpstr[1] == 'I' || tmpstr[1] == 'L'))
- 	{
--	  if (tmpstr[0] == '-' &&
--	      (tmpstr[1] == 'I' ||
--	       tmpstr[1] == 'L'))
--	    {
--	      g_string_append_c (str, '-');
--	      g_string_append_c (str, tmpstr[1]);
--	      g_string_append (str, pcsysrootdir);
--	      g_string_append (str, tmpstr+2);
--	    }
-+	  g_string_append_c (str, '-');
-+	  g_string_append_c (str, tmpstr[1]);
-+	  g_string_append (str, pcsysrootdir);
-+	  g_string_append (str, tmpstr+2);
- 	}
--      else 
-+      else
- 	{
- 	  g_string_append (str, tmpstr);
- 	}
diff --git a/meta/packages/pkgconfig/pkgconfig-0.23/autofoo.patch b/meta/packages/pkgconfig/pkgconfig-0.25/autofoo.patch
similarity index 100%
rename from meta/packages/pkgconfig/pkgconfig-0.23/autofoo.patch
rename to meta/packages/pkgconfig/pkgconfig-0.25/autofoo.patch
diff --git a/meta/packages/pkgconfig/pkgconfig-0.23/glibconfig-sysdefs.h b/meta/packages/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h
similarity index 100%
rename from meta/packages/pkgconfig/pkgconfig-0.23/glibconfig-sysdefs.h
rename to meta/packages/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h
diff --git a/meta/packages/pkgconfig/pkgconfig.inc b/meta/packages/pkgconfig/pkgconfig.inc
index a42ee9e1d0..c0e748173d 100644
--- a/meta/packages/pkgconfig/pkgconfig.inc
+++ b/meta/packages/pkgconfig/pkgconfig.inc
@@ -7,15 +7,14 @@ BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=pkg-config"
 SECTION = "console/utils"
 
 LICENSE = "GPLv2+"
-PR = "r8"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 popt"
 DEPENDS_virtclass-native = ""
 DEPENDS_virtclass-nativesdk = ""
 
 SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
            file://autofoo.patch \
-           file://sysrootfix.patch \
            file://glibconfig-sysdefs.h \
            file://disable-legacy.patch"
 
@@ -23,7 +22,7 @@ S = "${WORKDIR}/pkg-config-${PV}/"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-installed-glib --disable-legacy-scripts"
+EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts"
 EXTRA_OECONF_virtclass-native = "--disable-legacy-scripts"
 EXTRA_OECONF_virtclass-nativesdk = "--disable-legacy-scripts"
 
diff --git a/meta/packages/pkgconfig/pkgconfig_0.23.bb b/meta/packages/pkgconfig/pkgconfig_0.25.bb
similarity index 66%
rename from meta/packages/pkgconfig/pkgconfig_0.23.bb
rename to meta/packages/pkgconfig/pkgconfig_0.25.bb
index d9ff6ea06c..09b28a5bd5 100644
--- a/meta/packages/pkgconfig/pkgconfig_0.23.bb
+++ b/meta/packages/pkgconfig/pkgconfig_0.25.bb
@@ -1 +1,3 @@
 require pkgconfig.inc
+
+PR = "r0"