diff --git a/packages/leptonica/build.sh b/packages/leptonica/build.sh index 6380fb858..c0df462cb 100644 --- a/packages/leptonica/build.sh +++ b/packages/leptonica/build.sh @@ -1,7 +1,12 @@ TERMUX_PKG_HOMEPAGE=http://www.leptonica.com/ -TERMUX_PKG_DESCRIPTION="Leptonica is a pedagogically-oriented open source site containing software that is broadly useful for image processing and image analysis applications" -TERMUX_PKG_VERSION=1.74.1 +TERMUX_PKG_DESCRIPTION="Library for image processing and image analysis" +TERMUX_PKG_VERSION=1.74.2 TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff" -TERMUX_PKG_SRCURL=http://www.leptonica.com/source/leptonica-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=746a517a47a3bd2a90bc8d581ca6464c10f30e91a60209735efe45b3778bec62 +TERMUX_PKG_SRCURL=https://github.com/DanBloomberg/leptonica/archive/${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=8b2e9bacd23597d0ee21625a7d8443177b1cb85daf196d86b67ad75044e29c27 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-giflib --without-libwebp --without-libopenjpeg" +TERMUX_PKG_FOLDERNAME=leptonica-$TERMUX_PKG_VERSION + +termux_step_pre_configure() { + ./autobuild +} diff --git a/packages/leptonica/silence-tmpfile-warnings.patch b/packages/leptonica/silence-tmpfile-warnings.patch index ae991cc62..a84e09e01 100644 --- a/packages/leptonica/silence-tmpfile-warnings.patch +++ b/packages/leptonica/silence-tmpfile-warnings.patch @@ -1,14 +1,3 @@ -diff -u -r ../leptonica-1.74.1/src/bmpio.c ./src/bmpio.c ---- ../leptonica-1.74.1/src/bmpio.c 2016-12-02 20:42:42.000000000 +0100 -+++ ./src/bmpio.c 2017-01-29 22:11:16.268072245 +0100 -@@ -645,7 +645,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = pixWriteStreamBmp(fp, pix); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); diff -u -r ../leptonica-1.74.1/src/boxbasic.c ./src/boxbasic.c --- ../leptonica-1.74.1/src/boxbasic.c 2016-12-02 20:42:49.000000000 +0100 +++ ./src/boxbasic.c 2017-01-29 22:11:16.276072146 +0100 @@ -148,17 +137,6 @@ diff -u -r ../leptonica-1.74.1/src/pixcomp.c ./src/pixcomp.c #ifdef _WIN32 if ((fp = fopenWriteWinTempfile()) == NULL) return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/pngio.c ./src/pngio.c ---- ../leptonica-1.74.1/src/pngio.c 2016-12-02 20:43:37.000000000 +0100 -+++ ./src/pngio.c 2017-01-29 22:11:16.508069269 +0100 -@@ -1344,7 +1344,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = pixWriteStreamPng(fp, pix, gamma); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); diff -u -r ../leptonica-1.74.1/src/pnmio.c ./src/pnmio.c --- ../leptonica-1.74.1/src/pnmio.c 2016-12-27 19:30:34.000000000 +0100 +++ ./src/pnmio.c 2017-01-29 22:11:16.512069219 +0100 @@ -197,25 +175,6 @@ diff -u -r ../leptonica-1.74.1/src/ptabasic.c ./src/ptabasic.c #ifdef _WIN32 if ((fp = fopenWriteWinTempfile()) == NULL) return ERROR_INT("tmpfile stream not opened", procName, 1); -diff -u -r ../leptonica-1.74.1/src/recogbasic.c ./src/recogbasic.c ---- ../leptonica-1.74.1/src/recogbasic.c 2016-12-02 20:43:53.000000000 +0100 -+++ ./src/recogbasic.c 2017-01-29 22:11:16.532068971 +0100 -@@ -1306,7 +1306,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = recogaWriteStream(fp, recoga); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); -@@ -1608,7 +1607,6 @@ - return ERROR_INT("stream not opened", procName, 1); - ret = recogWriteStream(fp, recog); - #else -- L_INFO("work-around: writing to a temp file\n", procName); - #ifdef _WIN32 - if ((fp = fopenWriteWinTempfile()) == NULL) - return ERROR_INT("tmpfile stream not opened", procName, 1); diff -u -r ../leptonica-1.74.1/src/sarray1.c ./src/sarray1.c --- ../leptonica-1.74.1/src/sarray1.c 2016-12-21 21:11:34.000000000 +0100 +++ ./src/sarray1.c 2017-01-29 22:11:16.552068723 +0100 diff --git a/packages/leptonica/src-recogbasic.c.patch b/packages/leptonica/src-recogbasic.c.patch new file mode 100644 index 000000000..55f5efec1 --- /dev/null +++ b/packages/leptonica/src-recogbasic.c.patch @@ -0,0 +1,11 @@ +diff -u -r ../leptonica-1.74.2/src/recogbasic.c ./src/recogbasic.c +--- ../leptonica-1.74.2/src/recogbasic.c 2017-05-20 03:30:27.000000000 +0200 ++++ ./src/recogbasic.c 2017-06-07 01:17:15.994340419 +0200 +@@ -1065,7 +1065,6 @@ + return ERROR_INT("stream not opened", procName, 1); + ret = recogWriteStream(fp, recog); + #else +- L_INFO("work-around: writing to a temp file\n", procName); + #ifdef _WIN32 + if ((fp = fopenWriteWinTempfile()) == NULL) + return ERROR_INT("tmpfile stream not opened", procName, 1);