diff --git a/imlib2/PKGBUILD b/imlib2/PKGBUILD index 443000396..7106c1011 100644 --- a/imlib2/PKGBUILD +++ b/imlib2/PKGBUILD @@ -1,22 +1,18 @@ # Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/imlib2 pkgname=imlib2 -pkgver=1.4.6 +pkgver=1.4.7 pkgrel=1 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('x86_64') license=('BSD') depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng>=1.5.0' 'libid3tag' 'libjpeg-turbo') -options=('!libtool') -source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2" - 'giflib51.patch') -sha1sums=('20e111d822074593e8d657ecf8aafe504e9e2967' - '5ef58774e83b580362c8b8fd0bde15e6737ba73e') +source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2") +sha1sums=('0ed225afbbee8e990c655cf13ed802bda8a5cd8a') prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../giflib51.patch sed -i 's/@my_libs@//' imlib2-config.in } @@ -24,7 +20,8 @@ build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc/imlib2 \ - --x-libraries=/usr/lib $EXTRAOPTS + --x-libraries=/usr/lib \ + --enable-amd64 make } diff --git a/imlib2/giflib51.patch b/imlib2/giflib51.patch deleted file mode 100644 index 97eaeb0b9..000000000 --- a/imlib2/giflib51.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c ---- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c 2013-12-21 10:16:10.000000000 +0000 -+++ imlib2-1.4.6/src/modules/loaders/loader_gif.c 2014-05-27 09:52:35.857291512 +0000 -@@ -36,7 +36,7 @@ - #endif - if (fd < 0) - return 0; -- gif = DGifOpenFileHandle(fd); -+ gif = DGifOpenFileHandle(fd, NULL); - if (!gif) - { - close(fd); -@@ -60,13 +60,13 @@ - h = gif->Image.Height; - if (!IMAGE_DIMENSIONS_OK(w, h)) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - return 0; - } - rows = malloc(h * sizeof(GifRowType *)); - if (!rows) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - return 0; - } - for (i = 0; i < h; i++) -@@ -78,7 +78,7 @@ - rows[i] = malloc(w * sizeof(GifPixelType)); - if (!rows[i]) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - if (rows[i]) -@@ -150,7 +150,7 @@ - im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h); - if (!im->data) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - free(rows); - return 0; - } -@@ -181,7 +181,7 @@ - last_per = (int)per; - if (!(progress(im, (int)per, 0, last_y, w, i))) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - free(rows[i]); -@@ -198,7 +198,7 @@ - { - progress(im, 100, 0, last_y, w, h); - } -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - free(rows[i]); \ No newline at end of file