diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2017-04-01 23:47:06 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-04-01 23:47:06 +0000 |
| commit | 9bb9fa6f7728ef01816980a3b81aa947030e4c3d (patch) | |
| tree | 86664f0188f4aeeace743f70894d069fe7c64781 /main/pkgconf | |
| parent | c300fc060138ff4ecd2af21ab238422db1c7de5a (diff) | |
| download | aports-9bb9fa6f7728ef01816980a3b81aa947030e4c3d.tar.bz2 aports-9bb9fa6f7728ef01816980a3b81aa947030e4c3d.tar.xz | |
main/pkgconf: add a regression fix against gtkmm
Diffstat (limited to 'main/pkgconf')
| -rw-r--r-- | main/pkgconf/APKBUILD | 8 | ||||
| -rw-r--r-- | main/pkgconf/variable.patch | 41 |
2 files changed, 46 insertions, 3 deletions
diff --git a/main/pkgconf/APKBUILD b/main/pkgconf/APKBUILD index b7fcfbe395..8d09105a44 100644 --- a/main/pkgconf/APKBUILD +++ b/main/pkgconf/APKBUILD @@ -2,14 +2,15 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=pkgconf pkgver=1.3.4 -pkgrel=0 +pkgrel=1 pkgdesc="development framework configuration tools" url="https://github.com/pkgconf/pkgconf" arch="all" license="ISC" replaces="pkgconfig" provides="pkgconfig=1" -source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz" +source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz + variable.patch" subpackages="$pkgname-doc $pkgname-dev" checkdepends="kyua atf" builddir="$srcdir/$pkgname-$pkgver" @@ -52,4 +53,5 @@ dev() { mv "$subpkgdir"/usr/share/aclocal/pkg.m4 "$pkgdir"/usr/share/aclocal/ } -sha512sums="9771e33521cce2128de43b6f8a88f26f3028ac4470fe9e618859e29d07c0c116772e61cfc626bbf3faa6e12eecde94125e9e92020f6b32a4e2914da3f74de06a pkgconf-1.3.4.tar.xz" +sha512sums="9771e33521cce2128de43b6f8a88f26f3028ac4470fe9e618859e29d07c0c116772e61cfc626bbf3faa6e12eecde94125e9e92020f6b32a4e2914da3f74de06a pkgconf-1.3.4.tar.xz +51f2ba8bcf2625d24e7347e2f2b47fec4bd6f6bac06555c593e86986843d8dc5b697b60544ccc31c8edcc182c47427a88a48c461761fe6d6efdd6c109738e52f variable.patch" diff --git a/main/pkgconf/variable.patch b/main/pkgconf/variable.patch new file mode 100644 index 0000000000..6c26dc6edc --- /dev/null +++ b/main/pkgconf/variable.patch @@ -0,0 +1,41 @@ +From 30c35b709627d8fd73f86033f4c7845ad5937c12 Mon Sep 17 00:00:00 2001 +From: William Pitcock <nenolod@dereferenced.org> +Date: Sat, 1 Apr 2017 18:30:12 -0500 +Subject: [PATCH] main: re-enable --variable pkg-config bug emulation because + downstreams take advantage of it + +--- + main.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/main.c b/main.c +index 31693e5..35a4854 100644 +--- a/main.c ++++ b/main.c +@@ -337,7 +337,7 @@ print_variable(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *variabl + + var = pkgconf_tuple_find(client, &pkg->vars, variable); + if (var != NULL) +- printf("%s\n", var); ++ printf("%s", var); + } + + static bool +@@ -352,11 +352,17 @@ apply_variable(pkgconf_client_t *client, pkgconf_pkg_t *world, void *variable, i + pkgconf_dependency_t *dep = iter->data; + + pkg = pkgconf_pkg_verify_dependency(client, dep, NULL); ++ ++ if (iter->prev != NULL) ++ printf(" "); ++ + print_variable(client, pkg, variable); + + pkgconf_pkg_free(&pkg_client, pkg); + } + ++ printf("\n"); ++ + return true; + } + |