diff options
author | prspkt <prspkt@protonmail.com> | 2019-11-05 21:56:51 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-11-14 08:42:03 +0000 |
commit | b98fda5bda16a63854ba0eb0314b58b258b99ab3 (patch) | |
tree | 39732039f7da9282ce2ed053d10d01ef2bda2425 | |
parent | f8d13bb1cce3aa323a9da32d47d91c557aa88009 (diff) | |
download | aports-b98fda5bda16a63854ba0eb0314b58b258b99ab3.tar.bz2 aports-b98fda5bda16a63854ba0eb0314b58b258b99ab3.tar.xz |
main/texinfo: upgrade to 6.7
Add patch to avoid including libintl.h with --disable-nls.
-rw-r--r-- | main/texinfo/APKBUILD | 13 | ||||
-rw-r--r-- | main/texinfo/fix-build-without-NLS.patch | 24 |
2 files changed, 32 insertions, 5 deletions
diff --git a/main/texinfo/APKBUILD b/main/texinfo/APKBUILD index 53200e1cc6..8e985ed7d0 100644 --- a/main/texinfo/APKBUILD +++ b/main/texinfo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=texinfo -pkgver=6.6 -pkgrel=2 +pkgver=6.7 +pkgrel=0 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" url="https://www.gnu.org/software/texinfo/" arch="all" @@ -10,7 +10,8 @@ license="GPL-3.0-or-later" depends="perl" makedepends="ncurses-dev perl-dev" subpackages="$pkgname-doc" -source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz" +source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz + fix-build-without-NLS.patch" builddir="$srcdir/$pkgname-$pkgver" build() { @@ -18,7 +19,8 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr + --prefix=/usr \ + --disable-nls make } @@ -30,4 +32,5 @@ package() { gzip "$pkgdir"/usr/share/info/* } -sha512sums="96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0 texinfo-6.6.tar.xz" +sha512sums="da55a0d0a760914386393c5e8e864540265d8550dc576f784781a6d72501918e8afce716ff343e5c2a0ce09cf921bfaf0a48ecb49f6182a7d10e920ae3ea17e7 texinfo-6.7.tar.xz +1c33d8c8bf24ec139fa2a283e12d42a260027d354061d348b66f1d2ef4636573cb88442299595af946366c9e9cc5511450a32d1a1fb827bee30f38a7558b3edb fix-build-without-NLS.patch" diff --git a/main/texinfo/fix-build-without-NLS.patch b/main/texinfo/fix-build-without-NLS.patch new file mode 100644 index 0000000000..105650c856 --- /dev/null +++ b/main/texinfo/fix-build-without-NLS.patch @@ -0,0 +1,24 @@ +--- a/tp/Texinfo/XS/parsetexi/api.c ++++ b/tp/Texinfo/XS/parsetexi/api.c +@@ -25,7 +25,9 @@ + + #undef context + ++#if defined(HAVE_LIBINTL_H) + #include <libintl.h> ++#endif + + #include <stdlib.h> + #include <stdio.h> +--- a/tp/Texinfo/XS/parsetexi/errors.c ++++ b/tp/Texinfo/XS/parsetexi/errors.c +@@ -14,7 +14,9 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + + #include <config.h> ++#if defined(HAVE_LIBINTL_H) + #include <libintl.h> ++#endif + + #include <stdlib.h> + #include <stdarg.h> |