From 3ece123312f4174cede3b213efcef53bbfdec3cd Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 12 Dec 2019 21:30:49 +0100 Subject: [PATCH] imlib2: Update from 1.5.1 to 1.6.0 --- packages/imlib2/build.sh | 5 ++--- ...ib2-1.5.1_src_modules_loaders_loader_zlib.c.patch | 12 ------------ packages/imlib2/src-bin-imlib2_view.c.patch | 11 +++++++++++ .../imlib2/src-modules-loaders-loader_zlib.c.patch | 12 ++++++++++++ 4 files changed, 25 insertions(+), 15 deletions(-) delete mode 100644 packages/imlib2/imlib2-1.5.1_src_modules_loaders_loader_zlib.c.patch create mode 100644 packages/imlib2/src-bin-imlib2_view.c.patch create mode 100644 packages/imlib2/src-modules-loaders-loader_zlib.c.patch diff --git a/packages/imlib2/build.sh b/packages/imlib2/build.sh index b65c00431..fd4d70d0f 100644 --- a/packages/imlib2/build.sh +++ b/packages/imlib2/build.sh @@ -2,9 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://sourceforge.net/projects/enlightenment/ TERMUX_PKG_DESCRIPTION="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="Leonid Plyushch " -TERMUX_PKG_VERSION=1.5.1 -TERMUX_PKG_REVISION=10 +TERMUX_PKG_VERSION=1.6.0 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/enlightenment/imlib2-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=b25df9347648cf3dfb784c099139ab24157b1dbd1baa9428f103b683b8a78c61 +TERMUX_PKG_SHA256=672a8abed2f6531ff09b69449f58dfb723a0fd6560d6f94a71e7abdb77d6f987 TERMUX_PKG_DEPENDS="freetype, giflib, libandroid-shmem, libbz2, libid3tag, libjpeg-turbo, libpng, libtiff, libxext, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="LIBS=-landroid-shmem" diff --git a/packages/imlib2/imlib2-1.5.1_src_modules_loaders_loader_zlib.c.patch b/packages/imlib2/imlib2-1.5.1_src_modules_loaders_loader_zlib.c.patch deleted file mode 100644 index 84a262157..000000000 --- a/packages/imlib2/imlib2-1.5.1_src_modules_loaders_loader_zlib.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr imlib2-1.5.1/src/modules/loaders/loader_zlib.c imlib2-1.5.1.mod/src/modules/loaders/loader_zlib.c ---- imlib2-1.5.1/src/modules/loaders/loader_zlib.c 2017-12-16 15:03:10.000000000 +0200 -+++ imlib2-1.5.1.mod/src/modules/loaders/loader_zlib.c 2018-11-14 19:06:27.008030924 +0200 -@@ -44,7 +44,7 @@ - { - ImlibLoader *loader; - int src, dest, res; -- char *file, *p, *q, tmp[] = "/tmp/imlib2_loader_zlib-XXXXXX"; -+ char *file, *p, *q, tmp[] = "@TERMUX_PREFIX@/tmp/imlib2_loader_zlib-XXXXXX"; - char *real_ext; - struct stat st; - diff --git a/packages/imlib2/src-bin-imlib2_view.c.patch b/packages/imlib2/src-bin-imlib2_view.c.patch new file mode 100644 index 000000000..66ef640e3 --- /dev/null +++ b/packages/imlib2/src-bin-imlib2_view.c.patch @@ -0,0 +1,11 @@ +diff -u -r ../imlib2-1.6.0/src/bin/imlib2_view.c ./src/bin/imlib2_view.c +--- ../imlib2-1.6.0/src/bin/imlib2_view.c 2019-11-23 16:59:35.000000000 +0000 ++++ ./src/bin/imlib2_view.c 2019-12-12 20:27:59.394947223 +0000 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + #include "Imlib2.h" + diff --git a/packages/imlib2/src-modules-loaders-loader_zlib.c.patch b/packages/imlib2/src-modules-loaders-loader_zlib.c.patch new file mode 100644 index 000000000..15ac1e084 --- /dev/null +++ b/packages/imlib2/src-modules-loaders-loader_zlib.c.patch @@ -0,0 +1,12 @@ +diff -u -r ../imlib2-1.6.0/src/modules/loaders/loader_zlib.c ./src/modules/loaders/loader_zlib.c +--- ../imlib2-1.6.0/src/modules/loaders/loader_zlib.c 2019-11-23 05:36:44.000000000 +0000 ++++ ./src/modules/loaders/loader_zlib.c 2019-12-12 20:15:28.361709201 +0000 +@@ -44,7 +44,7 @@ + ImlibLoader *loader; + int src; + int dest, res; +- char *file, *p, *q, tmp[] = "/tmp/imlib2_loader_zlib-XXXXXX"; ++ char *file, *p, *q, tmp[] = "@TERMUX_PREFIX@/tmp/imlib2_loader_zlib-XXXXXX"; + char *real_ext; + + /* make sure this file ends in ".gz" and that there's another ext