From 6609934a845fed865aca0e0cc5b3dd38cc1407f7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 5 Apr 2015 08:58:41 +0200 Subject: [PATCH] imlib2: update to 1.4.7. --- srcpkgs/imlib2/patches/giflib-5.0.patch | 24 ------------------------ srcpkgs/imlib2/template | 19 ++++++------------- 2 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/imlib2/patches/giflib-5.0.patch diff --git a/srcpkgs/imlib2/patches/giflib-5.0.patch b/srcpkgs/imlib2/patches/giflib-5.0.patch deleted file mode 100644 index 647775202f6..00000000000 --- a/srcpkgs/imlib2/patches/giflib-5.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -Adapt DGifOpenFileHandle() to the 5.x API. - ---- src/modules/loaders/loader_gif.c.orig 2012-10-15 16:29:26.667044054 +0200 -+++ src/modules/loaders/loader_gif.c 2012-10-15 16:29:43.329649211 +0200 -@@ -19,7 +19,7 @@ load(ImlibImage * im, ImlibProgressFunct - int intoffset[] = { 0, 4, 2, 1 }; - int intjump[] = { 8, 8, 4, 2 }; - int transp; -- int fd; -+ int fd, err = 0; - - done = 0; - rows = NULL; -@@ -36,8 +36,8 @@ load(ImlibImage * im, ImlibProgressFunct - #endif - if (fd < 0) - return 0; -- gif = DGifOpenFileHandle(fd); -- if (!gif) -+ gif = DGifOpenFileHandle(fd, &err); -+ if (err) - { - close(fd); - return 0; diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template index 9cfcd01df03..abc6d8c69e7 100644 --- a/srcpkgs/imlib2/template +++ b/srcpkgs/imlib2/template @@ -1,10 +1,10 @@ # Template build file for 'imlib2'. pkgname=imlib2 -version=1.4.6 -revision=4 +version=1.4.7 +revision=1 build_style=gnu-configure configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding" -hostmakedepends="libtool autoconf pkg-config" +hostmakedepends="automake libtool pkg-config" makedepends="freetype-devel libjpeg-turbo-devel libpng-devel tiff-devel libid3tag-devel giflib-devel libXext-devel libSM-devel" short_desc="Image manipulation library" @@ -12,16 +12,10 @@ maintainer="Juan RP " distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-$version.tar.gz" homepage="http://sourceforge.net/projects/enlightenment/" license="BSD" -checksum=17cc128c0e61974d59c423b59d0fb5cb85c97169adf5b05184cc58f7c87b4f4e +checksum=48e98337a560d8904f685447f41c43914fec1f8cd3745a9fd86cba9fd24a6563 pre_configure() { - libtoolize -f - # prevent regenerating Makefile.in and aclocal.m4 - touch aclocal.m4 Makefile.in - # make it build with giflib-5.1.0 - # see http://wiki.linuxfromscratch.org/blfs/ticket/5076#comment:2 - sed -i "/DGifCloseFile/s:gif:&, NULL:g" src/modules/loaders/loader_gif.c - sed -e 's,@my_libs@,@LIBS@,g' -i imlib2-config.in + autoreconf -fi } imlib2-tools_package() { @@ -30,9 +24,8 @@ imlib2-tools_package() { vmove usr/bin } } - imlib2-devel_package() { - depends="imlib2>=${version}_${revision}" + depends="${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/bin/imlib2-config