From a39e5b0832dc7992b871b172b7cd3d9dd9b04ac7 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 3 Dec 2017 10:06:49 +0100 Subject: [PATCH] gdk-pixbuf: Update from 2.36.7 to 2.36.9 --- packages/gdk-pixbuf/Makefile.in.patch | 14 +++++++------- packages/gdk-pixbuf/build.sh | 13 +++++++------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/gdk-pixbuf/Makefile.in.patch b/packages/gdk-pixbuf/Makefile.in.patch index 2903ba76b..f0367ced1 100644 --- a/packages/gdk-pixbuf/Makefile.in.patch +++ b/packages/gdk-pixbuf/Makefile.in.patch @@ -1,12 +1,12 @@ -diff -u -r ../gdk-pixbuf-2.36.7/Makefile.in ./Makefile.in ---- ../gdk-pixbuf-2.36.7/Makefile.in 2017-07-18 17:00:16.000000000 +0000 -+++ ./Makefile.in 2017-07-26 11:24:41.324018359 +0000 -@@ -449,7 +449,7 @@ +diff -u -r ../gdk-pixbuf-2.36.9/Makefile.in ./Makefile.in +--- ../gdk-pixbuf-2.36.9/Makefile.in 2017-08-19 17:24:08.000000000 +0000 ++++ ./Makefile.in 2017-12-02 00:17:57.592766016 +0000 +@@ -451,7 +451,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = gdk-pixbuf po docs thumbnailer tests contrib win32 +SUBDIRS = gdk-pixbuf po docs tests contrib win32 - EXTRA_DIST = \ - config.h.win32 \ - glib-tap.mk \ + meson_files = \ + meson.build \ + meson_options.txt \ diff --git a/packages/gdk-pixbuf/build.sh b/packages/gdk-pixbuf/build.sh index de9369fa6..a1030278c 100644 --- a/packages/gdk-pixbuf/build.sh +++ b/packages/gdk-pixbuf/build.sh @@ -1,10 +1,11 @@ TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/gdk-pixbuf/ TERMUX_PKG_DESCRIPTION="Library for image loading and manipulation" -_MAJOR_VERSION=2.36 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.7 -TERMUX_PKG_SHA256=1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8 -TERMUX_PKG_SRCURL=ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${_MAJOR_VERSION}/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_VERSION=2.36.9 +TERMUX_PKG_SHA256=8013b271ff1a691514b5bbc9b99f6ed456422d4da4a721a9db0b783abe8e740a +TERMUX_PKG_SRCURL=ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${TERMUX_PKG_VERSION:0:4}/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo" TERMUX_PKG_DEVPACKAGE_DEPENDS="libpng-dev" -# Avoid runtime test which does not work when cross compiling: -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gio-sniffing --disable-glibtest" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +gio_can_sniff=no +--disable-glibtest +"