From 38070073842ba70ebd1dc2037646ae66767757d5 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 1 Mar 2022 09:14:02 +0900 Subject: [PATCH] graphicsmagick: Update to 1.3.37 * Add dependency on libwebp --- packages/graphicsmagick/build.sh | 8 +++----- packages/graphicsmagick/coders-jp2.c.patch | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 packages/graphicsmagick/coders-jp2.c.patch diff --git a/packages/graphicsmagick/build.sh b/packages/graphicsmagick/build.sh index d9c55d6b5..f221c9e9b 100644 --- a/packages/graphicsmagick/build.sh +++ b/packages/graphicsmagick/build.sh @@ -2,17 +2,15 @@ TERMUX_PKG_HOMEPAGE=http://www.graphicsmagick.org/ TERMUX_PKG_DESCRIPTION="Collection of image processing tools" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.3.36 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1.3.37 # Bandwith limited on main ftp site, so it's asked to use sourceforge instead: TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${TERMUX_PKG_VERSION}/GraphicsMagick-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=5d5b3fde759cdfc307aaf21df9ebd8c752e3f088bb051dd5df8aac7ba7338f46 -TERMUX_PKG_DEPENDS="littlecms, libc++, libtiff, freetype, libjasper, libjpeg-turbo, libpng, libbz2, libxml2, liblzma, zstd, zlib" +TERMUX_PKG_SHA256=90dc22f1a7bd240e4c9065a940962bf13da43c99bcc36cb111cc3c1a0d7477d4 +TERMUX_PKG_DEPENDS="libwebp, littlecms, libc++, libtiff, freetype, libjasper, libjpeg-turbo, libpng, libbz2, libxml2, liblzma, zstd, zlib" TERMUX_PKG_BREAKS="graphicsmagick-dev" TERMUX_PKG_REPLACES="graphicsmagick++, graphicsmagick-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_func_ftime=no --with-fontpath=/system/fonts ---without-webp --without-x " diff --git a/packages/graphicsmagick/coders-jp2.c.patch b/packages/graphicsmagick/coders-jp2.c.patch new file mode 100644 index 000000000..53c8a8a46 --- /dev/null +++ b/packages/graphicsmagick/coders-jp2.c.patch @@ -0,0 +1,20 @@ +--- a/coders/jp2.c ++++ b/coders/jp2.c +@@ -313,7 +313,7 @@ + #if MAGICK_JP2_OLD_STREAM_INTERFACE + static int BlobRead(jas_stream_obj_t *object,char *buffer,const int length) + #else +-static int BlobRead(jas_stream_obj_t *object,char *buffer,unsigned length) ++static ssize_t BlobRead(jas_stream_obj_t *object,char *buffer,size_t length) + #endif + { + size_t +@@ -329,7 +329,7 @@ + #if MAGICK_JP2_OLD_STREAM_INTERFACE + static int BlobWrite(jas_stream_obj_t *object,char *buffer,const int length) + #else +-static int BlobWrite(jas_stream_obj_t *object,const char *buffer,unsigned length) ++static ssize_t BlobWrite(jas_stream_obj_t *object,const char *buffer,size_t length) + #endif + { + size_t