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>

1 files changed, 0 insertions, 31 deletions

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);
-        }