From e984bc457f138cc27202daf1a9cdb457e82586a2 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 17 Apr 2019 23:34:00 +0000
Subject: system/pkgconf: bump to 1.6.1

---
 system/pkgconf/APKBUILD          |  9 +++----
 system/pkgconf/personality.patch | 55 ----------------------------------------
 2 files changed, 3 insertions(+), 61 deletions(-)
 delete mode 100644 system/pkgconf/personality.patch

(limited to 'system')

diff --git a/system/pkgconf/APKBUILD b/system/pkgconf/APKBUILD
index 777af1613..0ccefb0b9 100644
--- a/system/pkgconf/APKBUILD
+++ b/system/pkgconf/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=pkgconf
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=0
 pkgdesc="Toolkit for maintaining development package metadata"
 url="https://git.dereferenced.org/pkgconf/pkgconf/"
@@ -10,9 +10,7 @@ replaces="pkgconfig"
 provides="pkgconfig=1"
 subpackages="$pkgname-doc $pkgname-dev"
 checkdepends="kyua atf"
-source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz
-	personality.patch
-	"
+source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz"
 
 build() {
 	./configure \
@@ -47,5 +45,4 @@ dev() {
 	mv "$subpkgdir"/usr/share/aclocal/pkg.m4 "$pkgdir"/usr/share/aclocal/
 }
 
-sha512sums="eddb9354b3e0a4b91eb49c7b81ed4cbeb92b96b1931f25185b37fa66f25604315f0e1cc8cf13a415508b5a07c1b0d85ddb39a988648787b968083ddc82e73fda  pkgconf-1.6.0.tar.xz
-94d7749fa5d751f9207c9f6168dcce52bbe6108e9440721a640b6bc3492867c3fce5231d779a780a611009f1c1ad65bc9db8e81452c059f7b34b97314b38844a  personality.patch"
+sha512sums="d7314da008ca90858be2ad2599a1bc017da465ef3eae5ab8f18893539ffd557fff3316ae2f2ecf97d34550de6f7a3a3ab3f82ec5eb45e4f0a239b89fe3877835  pkgconf-1.6.1.tar.xz"
diff --git a/system/pkgconf/personality.patch b/system/pkgconf/personality.patch
deleted file mode 100644
index e7ff9ad9a..000000000
--- a/system/pkgconf/personality.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d926e75b345a6948e4e976828d3331cd7f0db660 Mon Sep 17 00:00:00 2001
-From: Emil Renner Berthing <esmil@mailme.dk>
-Date: Wed, 6 Mar 2019 16:03:32 +0100
-Subject: [PATCH] main: fix personalities when argv[0] contains path
-
----
- cli/main.c | 31 ++++++++++++++++++++-----------
- 1 file changed, 20 insertions(+), 11 deletions(-)
-
-diff --git a/cli/main.c b/cli/main.c
-index b52cc85..caa2525 100644
---- a/cli/main.c
-+++ b/cli/main.c
-@@ -740,21 +740,30 @@ dump_personality(const pkgconf_cross_personality_t *p)
- static pkgconf_cross_personality_t *
- deduce_personality(char *argv[])
- {
--	char *workbuf = strdup(argv[0]), *i;
--	pkgconf_cross_personality_t *out = pkgconf_cross_personality_default(), *deduced;
-+	const char *argv0 = argv[0];
-+	char *i, *prefix;
-+	pkgconf_cross_personality_t *out;
-+
-+	i = strrchr(argv0, '/');
-+	if (i != NULL)
-+		argv0 = i + 1;
-+
-+#if defined(_WIN32) || defined(_WIN64)
-+	i = strrchr(argv0, '\\');
-+	if (i != NULL)
-+		argv0 = i + 1;
-+#endif
- 
--	i = strstr(workbuf, "-pkg");
-+	i = strstr(argv0, "-pkg");
- 	if (i == NULL)
--		goto finish;
--
--	*i = 0;
-+		return pkgconf_cross_personality_default();
- 
--	deduced = pkgconf_cross_personality_find(workbuf);
--	if (deduced != NULL)
--		out = deduced;
-+	prefix = strndup(argv0, i - argv0);
-+	out = pkgconf_cross_personality_find(prefix);
-+	free(prefix);
-+	if (out == NULL)
-+		return pkgconf_cross_personality_default();
- 
--finish:
--	free(workbuf);
- 	return out;
- }
- 
-- 
cgit v1.2.3-70-g09d2