From: Valery Kartel <valery.kartel@gmail.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Valery Kartel <valery.kartel@gmail.com>
Subject: [alpine-aports] [PATCH] main/gettext: remove unneeded patch (dont-override-gnulib)
Date: Wed, 24 Feb 2016 00:54:15 +0200
Message-Id: <1456268055-26951-1-git-send-email-valery.kartel@gmail.com>
Precedence: list

---
a weeks ago I added this hack to build php & php7.
I did not investigate the cause of a failed compilation (an error about absence of libintl_*printf while linking)
It was good for php but not for glib.
But now, (after musl upgrade or affection of moonphase?) it became generate correct libintl.h and both glib and php/php7 are compiled without linker errors.
So this patch no longer needed.
---
 main/gettext/APKBUILD                   | 15 +++++----------
 main/gettext/dont-override-gnulib.patch | 12 ------------
 2 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 main/gettext/dont-override-gnulib.patch

diff --git a/main/gettext/APKBUILD b/main/gettext/APKBUILD
index d4554f9..861dc4b 100644
--- a/main/gettext/APKBUILD
+++ b/main/gettext/APKBUILD
@@ -2,16 +2,14 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=gettext
 pkgver=0.19.7
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU locale utilities"
 url="http://www.gnu.org/software/gettext/gettext.html"
 arch="all"
 license="GPL"
 depends=
 makedepends="perl ncurses-dev libxml2-dev glib-dev libcroco-dev libunistring-dev"
-source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
-	dont-override-gnulib.patch
-	"
+source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-lang libintl $pkgname-asprintf $pkgname-libs"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -57,9 +55,6 @@ asprintf() {
 	mv "$pkgdir"/usr/lib/libasprintf.so.* "$subpkgdir"/usr/lib
 }
 
-md5sums="f81e50556da41b44c1d59ac93474dca5  gettext-0.19.7.tar.xz
-f8af0b8a26dae0f054200adfef1f146a  dont-override-gnulib.patch"
-sha256sums="378fa86a091cec3acdece3c961bb8d8c0689906287809a8daa79dc0c6398d934  gettext-0.19.7.tar.xz
-17e5edb5128609476b1102a1ef2a9a6445d89c3f475d02ea23949f065bc0fb50  dont-override-gnulib.patch"
-sha512sums="a8ed47fc38d8730ccd46bfa6620c0b42efcfcbfa39fa94ddecb2fa3b62b377827f29e702dc327fbc682b98534e1f54783d21a3bb5ba629f6358be00bfb4da009  gettext-0.19.7.tar.xz
-9e15b4d0ec0f39031072d8c06a20922c3c02845dbccb3455fba59f9423d970ea19baabb36d21823048a08249f148aa1e5c5e038001bffb8aa2a40051f2138f1e  dont-override-gnulib.patch"
+md5sums="f81e50556da41b44c1d59ac93474dca5  gettext-0.19.7.tar.xz"
+sha256sums="378fa86a091cec3acdece3c961bb8d8c0689906287809a8daa79dc0c6398d934  gettext-0.19.7.tar.xz"
+sha512sums="a8ed47fc38d8730ccd46bfa6620c0b42efcfcbfa39fa94ddecb2fa3b62b377827f29e702dc327fbc682b98534e1f54783d21a3bb5ba629f6358be00bfb4da009  gettext-0.19.7.tar.xz"
diff --git a/main/gettext/dont-override-gnulib.patch b/main/gettext/dont-override-gnulib.patch
deleted file mode 100644
index 6f4c4a5..0000000
--- a/main/gettext/dont-override-gnulib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/gettext-runtime/intl/libgnuintl.in.h
-+++ b/gettext-runtime/intl/libgnuintl.in.h
-@@ -317,6 +317,9 @@
- #include <stdio.h>
- #include <stddef.h>
- 
-+#ifndef _GL_STDIO_H
-+#define _GL_STDIO_H
-+#endif
- /* Get va_list.  */
- #if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
- # include <stdarg.h>
-- 
2.7.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---