harfbuzz&texlive: Bump after libicu 59.1 update

diff --git a/packages/harfbuzz/build.sh b/packages/harfbuzz/build.sh
index bc4f96e78b7638fd2e68af104c3cf782cd4c6fcd..a2fd97766c30a90e1fd7fa55fd4aaf1911652edd 100644 (file)
--- a/packages/harfbuzz/build.sh
+++ b/packages/harfbuzz/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz/
 TERMUX_PKG_DESCRIPTION="OpenType text shaping engine"
 TERMUX_PKG_VERSION=1.4.5
 TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz/
 TERMUX_PKG_DESCRIPTION="OpenType text shaping engine"
 TERMUX_PKG_VERSION=1.4.5

+TERMUX_PKG_REVISION=1

 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=d0e05438165884f21658154c709075feaf98c93ee5c694b951533ac425a9a711
 TERMUX_PKG_DEPENDS="freetype,glib,libbz2,libpng,libgraphite"
 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=d0e05438165884f21658154c709075feaf98c93ee5c694b951533ac425a9a711
 TERMUX_PKG_DEPENDS="freetype,glib,libbz2,libpng,libgraphite"

diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh
index fd8c9b1d57cd8024df1b772a479637dff53d8875..8b5cb75fadfc731e7b24c7068f1951219f58e0ad 100644 (file)
--- a/packages/texlive/build.sh
+++ b/packages/texlive/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="TeX Live is a distribution of the TeX typesetting system
 _MAJOR_VERSION=20160523
 _MINOR_VERSION=b
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}${_MINOR_VERSION}
 _MAJOR_VERSION=20160523
 _MINOR_VERSION=b
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}${_MINOR_VERSION}

+TERMUX_PKG_REVISION=1

 TERMUX_PKG_SRCURL=ftp://tug.org/historic/systems/texlive/${TERMUX_PKG_VERSION:0:4}/texlive-${TERMUX_PKG_VERSION}-source.tar.xz
 TERMUX_PKG_SHA256="a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed"
 TERMUX_PKG_DEPENDS="freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz-icu, perl, xz-utils"
 TERMUX_PKG_SRCURL=ftp://tug.org/historic/systems/texlive/${TERMUX_PKG_VERSION:0:4}/texlive-${TERMUX_PKG_VERSION}-source.tar.xz
 TERMUX_PKG_SHA256="a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed"
 TERMUX_PKG_DEPENDS="freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz-icu, perl, xz-utils"


@@ -14,6 +15,7 @@ AR=ar \
 RANLIB=ranlib \
 BUILDAR=ar \
 BUILDRANLIB=ranlib \
 RANLIB=ranlib \
 BUILDAR=ar \
 BUILDRANLIB=ranlib \

+ac_cv_c_bigendian=no \

 --prefix=$TERMUX_PREFIX/opt/texlive/${TERMUX_PKG_VERSION:0:4} \
 --bindir=$TERMUX_PREFIX/opt/texlive/${TERMUX_PKG_VERSION:0:4}/bin/pkg \
 --libdir=$TERMUX_PREFIX/lib \
 --prefix=$TERMUX_PREFIX/opt/texlive/${TERMUX_PKG_VERSION:0:4} \
 --bindir=$TERMUX_PREFIX/opt/texlive/${TERMUX_PKG_VERSION:0:4}/bin/pkg \
 --libdir=$TERMUX_PREFIX/lib \


@@ -58,7 +60,12 @@ BUILDRANLIB=ranlib \
 --with-banner-add=/Termux"
 
 termux_step_post_extract_package () {
 --with-banner-add=/Termux"
 
 termux_step_post_extract_package () {

-        rm -rdf $TERMUX_PKG_SRCDIR/libs/luajit
+       rm -rdf $TERMUX_PKG_SRCDIR/libs/luajit
+}
+
+termux_step_pre_configure() {
+       # When building against libicu 59.1 or later we need c++11:
+       CXXFLAGS+=" -std=c++11"

 }
 
 termux_step_post_make_install () {
 }
 
 termux_step_post_make_install () {

diff --git a/packages/texlive/c++11.patch b/packages/texlive/c++11.patch
new file mode 100644 (file)
index 0000000..05b4cf0
--- /dev/null
+++ b/packages/texlive/c++11.patch
@@ -0,0 +1,17 @@
+diff -u -r ../texlive-20160523-source/texk/web2c/luatexdir/image/pdftoepdf.w ./texk/web2c/luatexdir/image/pdftoepdf.w
+--- ../texlive-20160523-source/texk/web2c/luatexdir/image/pdftoepdf.w  2016-03-25 12:44:48.000000000 +0000
++++ ./texk/web2c/luatexdir/image/pdftoepdf.w   2017-04-21 23:48:03.787934684 +0000
+@@ -71,7 +72,12 @@
+         ck = (char *) malloc(PDF_CHECKSUM_SIZE);
+         if (ck == NULL)
+             formatted_error("pdf inclusion","out of memory while processing '%s'", a);
+-        snprintf(ck, PDF_CHECKSUM_SIZE, "%" PRIu64 "_%" PRIu64, (uint64_t) size,(uint64_t) mtime);
++        snprintf(ck, PDF_CHECKSUM_SIZE, "%"
++              PRIu64
++              "_%"
++              PRIu64,
++              (uint64_t) size,
++              (uint64_t) mtime);
+    } else {
+         switch (fe) {
+             case FE_FAIL: