From 62373d30680279d2c298b1e1f7c698859feb102e Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 15 Oct 2015 09:47:56 +0000 Subject: Update to 0.29. Regen patches. pkg-config 0.29 === - Fixed a regression from 0.28 in system -L flag handling. If the pc file has multiple system -L flags, every other flag will be left as is. Thanks to Andrew Oakley for the fix. (#78077) - Quoting of variables queried through --variable is removed so that the output can be used verbatim in subsequent shell commands. Thanks to Marek Kasik for the fix. (#67904) - Fixed a regression from 0.28 in -L flag handling on Windows. A .libs suffix was inadvertantly being added to the library path. - Added a --validate option to check pc file syntax. This works just like --exists, but package dependencies are disabled. (#7000) - Added the PKG_PREREQ autoconf macro. Whereas PKG_PROG_PKG_CONFIG is used to check the version of the pkg-config tool, this is used to check the version of the pkg-config autoconf macros in use. - Added the PKG_CHECK_MODULES_STATIC autoconf macro. This will temporarily add --static to the pkg-config calls while invoking PKG_CHECK_MODULES. (#19541) - Many fixes to the testsuite for Windows. It should now pass for a MinGW, Cygwin, and cross-compiled MinGW using Wine for test execution. (#66939) - More consistent handling of prefix redefinition. On Windows, the prefix was always being redefined based on the pc file path. This feature can now be enabled or disabled at runtime on all platforms using the --define-prefix and --dont-define-prefix options. (#63602) - Continue listing packages with --list-all even if there are errors in pc files. (#26615) - Various documentation improvements. (#62018, #62374, #66155) - Fixed a bug when multiple -isystem arguments are used. (#72584) - pkg-config is now built with largefile support to ensure that it works correctly on filesystems with 64 bit inodes. Thanks to Peter Jones for the fix. (#90078) - Bugs fixed: 7000, 19541, 26615, 62018, 62374, 63602, 66155, 66939, 67904, 70690, 72584, 78077, 80378, 80380, 89267, 90078, 90437, 92002. --- devel/pkg-config/Makefile | 4 ++-- devel/pkg-config/distinfo | 14 ++++++++------ devel/pkg-config/patches/patch-configure | 6 +++--- devel/pkg-config/patches/patch-glib_configure | 15 +++++++++++++++ devel/pkg-config/patches/patch-glib_glib_gtimer.c | 6 +++--- 5 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 devel/pkg-config/patches/patch-glib_configure (limited to 'devel') diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index ab276b22053..080607340ef 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.31 2014/10/09 14:06:30 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2015/10/15 09:47:56 wiz Exp $ -DISTNAME= pkg-config-0.28 +DISTNAME= pkg-config-0.29 CATEGORIES= devel MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo index 46bb60413af..0787beda501 100644 --- a/devel/pkg-config/distinfo +++ b/devel/pkg-config/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.27 2014/10/01 08:50:33 obache Exp $ +$NetBSD: distinfo,v 1.28 2015/10/15 09:47:56 wiz Exp $ -SHA1 (pkg-config-0.28.tar.gz) = 71853779b12f958777bffcb8ca6d849b4d3bed46 -RMD160 (pkg-config-0.28.tar.gz) = 233f0b667cfb8f2e6a5647984d6389a770132173 -Size (pkg-config-0.28.tar.gz) = 1931203 bytes -SHA1 (patch-configure) = 286dcc405ae8f4d4c6e8598960ed03ba5822dfb1 -SHA1 (patch-glib_glib_gtimer.c) = abd8b5fa7d3a748385b91d47728531da37e1b4e5 +SHA1 (pkg-config-0.29.tar.gz) = f4b19d203b3896a4293af4b62c7f908063c88a5a +RMD160 (pkg-config-0.29.tar.gz) = 79036ecce25b2fc74ddf03b93e082d3b70f1e73a +SHA512 (pkg-config-0.29.tar.gz) = c2857cd67801c0db5d204912453ff6bdc7da3ea61f8b1c6b38983d48dffb958725e7723f909abbc057c7b34a85c27290eec6943808312a75909306076064aa63 +Size (pkg-config-0.29.tar.gz) = 1973875 bytes +SHA1 (patch-configure) = 6847644b9df3e3e2334f7c45bcbb2d3b7734d165 +SHA1 (patch-glib_configure) = 5411687502079f143a66a045ce20961e85e98789 +SHA1 (patch-glib_glib_gtimer.c) = ee877a6c148b148a86f9087960863cfa8305bbf7 diff --git a/devel/pkg-config/patches/patch-configure b/devel/pkg-config/patches/patch-configure index 41411d7f185..b2620147496 100644 --- a/devel/pkg-config/patches/patch-configure +++ b/devel/pkg-config/patches/patch-configure @@ -1,10 +1,10 @@ -$NetBSD: patch-configure,v 1.2 2012/08/26 18:10:25 adam Exp $ +$NetBSD: patch-configure,v 1.3 2015/10/15 09:47:56 wiz Exp $ Arbitrary strings should not be passed to "eval". ---- configure.orig 2011-08-06 14:17:45.000000000 +0000 +--- configure.orig 2015-09-27 14:07:21.000000000 +0000 +++ configure -@@ -13429,7 +13429,7 @@ echo use_indirect_deps=$use_indirect_dep +@@ -14023,7 +14023,7 @@ echo use_indirect_deps=$use_indirect_dep $as_echo_n "checking whether to list both direct and indirect dependencies... " >&6; } case $use_indirect_deps in auto) diff --git a/devel/pkg-config/patches/patch-glib_configure b/devel/pkg-config/patches/patch-glib_configure new file mode 100644 index 00000000000..5aff2be2ca4 --- /dev/null +++ b/devel/pkg-config/patches/patch-glib_configure @@ -0,0 +1,15 @@ +$NetBSD: patch-glib_configure,v 1.3 2015/10/15 09:47:56 wiz Exp $ + +Fix unportable test construct. + +--- glib/configure.orig 2015-09-27 14:07:16.000000000 +0000 ++++ glib/configure +@@ -5885,7 +5885,7 @@ else + ENABLE_ALWAYS_BUILD_TESTS_FALSE= + fi + +- if test "$ENABLE_INSTALLED_TESTS" == "1"; then ++ if test "$ENABLE_INSTALLED_TESTS" = "1"; then + installed_test_metadir=${datadir}/installed-tests/glib + + installed_testdir=${libexecdir}/installed-tests/glib diff --git a/devel/pkg-config/patches/patch-glib_glib_gtimer.c b/devel/pkg-config/patches/patch-glib_glib_gtimer.c index ff7669804ac..8ce25419fbe 100644 --- a/devel/pkg-config/patches/patch-glib_glib_gtimer.c +++ b/devel/pkg-config/patches/patch-glib_glib_gtimer.c @@ -1,8 +1,8 @@ -$NetBSD: patch-glib_glib_gtimer.c,v 1.1 2014/07/18 19:50:47 ryoon Exp $ +$NetBSD: patch-glib_glib_gtimer.c,v 1.2 2015/10/15 09:47:56 wiz Exp $ ---- glib/glib/gtimer.c.orig 2012-10-02 05:49:07.000000000 +0000 +--- glib/glib/gtimer.c.orig 2014-02-08 17:57:06.000000000 +0000 +++ glib/glib/gtimer.c -@@ -252,6 +252,8 @@ g_usleep (gulong microseconds) +@@ -254,6 +254,8 @@ g_usleep (gulong microseconds) { #ifdef G_OS_WIN32 Sleep (microseconds / 1000); -- cgit v1.2.3