diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-09-01 16:06:06 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-09-01 16:07:18 +0300 |
| commit | 1997ebdedb85701fd11105a98de22bedf735545d (patch) | |
| tree | 534bee097df92f3c52f17527bdb37160d6248a08 | |
| parent | c1096955e6399676db141ed98a4fdf4905808db4 (diff) | |
| download | aports-1997ebdedb85701fd11105a98de22bedf735545d.tar.bz2 aports-1997ebdedb85701fd11105a98de22bedf735545d.tar.xz | |
main/gnupg: fix i18n
setlocale() was not called if configured with --disable-nls. fix this
as setlocale() needs to be set in musl for nl_langinfo to work.
| -rw-r--r-- | main/gnupg/APKBUILD | 12 | ||||
| -rw-r--r-- | main/gnupg/fix-i18n.patch | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD index d24db1d94c..5687a17c4a 100644 --- a/main/gnupg/APKBUILD +++ b/main/gnupg/APKBUILD @@ -2,7 +2,7 @@ pkgname=gnupg pkgver=2.1.7 _ver=${pkgver/_beta/-beta} -pkgrel=0 +pkgrel=1 pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool" url="http://www.gnupg.org/" arch="all" @@ -14,6 +14,7 @@ makedepends="curl-dev libassuan libksba-dev libgcrypt-dev libgpg-error-dev subpackages="$pkgname-doc" source="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$_ver.tar.bz2 0001-Include-sys-select.h-for-FD_SETSIZE.patch + fix-i18n.patch " _builddir="$srcdir"/$pkgname-$_ver @@ -43,8 +44,11 @@ package() { ln -s gpg2 "$pkgdir"/usr/bin/gpg } md5sums="ebdf92b15b8bcd8579b643c7f41a3238 gnupg-2.1.7.tar.bz2 -1d944009f039912d92e4f119bd6826e4 0001-Include-sys-select.h-for-FD_SETSIZE.patch" +1d944009f039912d92e4f119bd6826e4 0001-Include-sys-select.h-for-FD_SETSIZE.patch +27d7489ecb666f27bce449ce536376c0 fix-i18n.patch" sha256sums="c18a3776d47fec98892d51d28b6574ef16bf0a25eabb0956231058aaf2e7846e gnupg-2.1.7.tar.bz2 -6ce103e1bf68ba8e35b0e6d5805632deddded62b3224b185589f7bd9243ddb9e 0001-Include-sys-select.h-for-FD_SETSIZE.patch" +6ce103e1bf68ba8e35b0e6d5805632deddded62b3224b185589f7bd9243ddb9e 0001-Include-sys-select.h-for-FD_SETSIZE.patch +635669c56ed5c5e004fb8146b2fa1fc578ea9d8671d4ef51370a19dfdafbc8b9 fix-i18n.patch" sha512sums="7c3efb9bd5d1509a9b2a6264293542b3d5db979bf443754f96d77322a96e18cba2ac6142665459d161eb7222fae44ce5b89eff88dca1c7abf47449fcafd3eb00 gnupg-2.1.7.tar.bz2 -c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch" +c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch +b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch" diff --git a/main/gnupg/fix-i18n.patch b/main/gnupg/fix-i18n.patch new file mode 100644 index 0000000000..00d71dd5cf --- /dev/null +++ b/main/gnupg/fix-i18n.patch @@ -0,0 +1,12 @@ +--- gnupg-2.1.7/common/i18n.c.orig 2015-08-31 20:40:18.752742866 +0300 ++++ gnupg-2.1.7/common/i18n.c 2015-08-31 20:40:41.806336224 +0300 +@@ -85,8 +85,8 @@ + bindtextdomain (PACKAGE_GT, gnupg_localedir ()); + textdomain (PACKAGE_GT); + #else +-# ifdef ENABLE_NLS + setlocale (LC_ALL, "" ); ++# ifdef ENABLE_NLS + bindtextdomain (PACKAGE_GT, LOCALEDIR); + textdomain (PACKAGE_GT); + # endif |