From f7d84274593006e0b65fe4afe6781dcfc48cfb90 Mon Sep 17 00:00:00 2001 From: Kim Barthel Date: Mon, 3 Sep 2012 22:45:34 +0200 Subject: [PATCH] pkg-config: Updated to 0.27.1. - Various fixes for using the internal glib snapshot. It should now be usable pretty much everywhere with the exception that universal builds are not supported on OS X. - Remove usage of gettext from the internal glib to avoid gettext and libintl dependencies. - Update internal glib snapshot to 2.32.4. - Fix check for POSIX shell used in tests to work better. - Handle spaces in autodetected prefix on Windows. - Bugs fixed 3550, 51883, 52031, 53493. See #10214 for further information. --- .../patches/pkg-config-0.25-autoconf-1.patch | 20 ------------------- pkg-config/pkg-config.nm | 12 ++++++----- 2 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 pkg-config/patches/pkg-config-0.25-autoconf-1.patch diff --git a/pkg-config/patches/pkg-config-0.25-autoconf-1.patch b/pkg-config/patches/pkg-config-0.25-autoconf-1.patch deleted file mode 100644 index 8df41fc50..000000000 --- a/pkg-config/patches/pkg-config-0.25-autoconf-1.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pkg-config-0.25/pkg.m4.~1~ 2009-12-06 21:39:02.000000000 +0100 -+++ pkg-config-0.25/pkg.m4 2010-07-07 10:07:12.000000000 +0200 -@@ -135,7 +135,7 @@ 258871_PKG_ERRORS - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --_PKG_TEXT])dnl -+_PKG_TEXT]) - ]) - elif test = untried; then - AC_MSG_RESULT([no]) -@@ -146,7 +146,7 @@ path to pkg-config. - - _PKG_TEXT - --To get pkg-config, see .])dnl -+To get pkg-config, see .]) - ]) - else - []_CFLAGS=[][]_CFLAGS diff --git a/pkg-config/pkg-config.nm b/pkg-config/pkg-config.nm index bc36a26c1..cc3a3f5e2 100644 --- a/pkg-config/pkg-config.nm +++ b/pkg-config/pkg-config.nm @@ -4,8 +4,8 @@ ############################################################################### name = pkg-config -version = 0.25 -release = 2 +version = 0.27.1 +release = 1 groups = Development/Tools url = http://pkg-config.freedesktop.org/ @@ -18,17 +18,19 @@ description compiler and linker flags. end -source_dl = +source_dl = http://pkgconfig.freedesktop.org/releases/ +sources = %{thisapp}.tar.gz build requires m4 - popt-devel + glib2-devel sed end configure_options += \ - --with-installed-popt + --disable-shared \ + --with-installed-glib test make check -- 2.39.5