aboutsummaryrefslogtreecommitdiffstats
path: root/main/imlib2
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-05-10 13:31:01 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-05-10 13:31:31 +0000
commit20bb03ab35e96ec8b008b3c9646d4380f2eb3eb2 (patch)
tree516e14343ec11d3c65c0f0cc29c55fe4b0b9011d /main/imlib2
parentf13d96db8c5e7439302f727b7a9d9eea07acda80 (diff)
downloadaports-20bb03ab35e96ec8b008b3c9646d4380f2eb3eb2.tar.bz2
aports-20bb03ab35e96ec8b008b3c9646d4380f2eb3eb2.tar.xz
main/imlib2: upgrade to 1.4.4
Diffstat (limited to 'main/imlib2')
-rw-r--r--main/imlib2/APKBUILD15
-rw-r--r--main/imlib2/bufferoverflow.patch13
-rw-r--r--main/imlib2/libpng14.patch12
3 files changed, 5 insertions, 35 deletions
diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD
index 5176e2e58e..fcd4e38a0e 100644
--- a/main/imlib2/APKBUILD
+++ b/main/imlib2/APKBUILD
@@ -1,23 +1,20 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imlib2
-pkgver=1.4.2
-pkgrel=5
+pkgver=1.4.4
+pkgrel=0
pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
url="http://sourceforge.net/projects/enlightenment/"
license="BSD"
subpackages="$pkgname-dev $pkgname-doc"
depends=
makedepends="tiff-dev giflib-dev bzip2-dev freetype-dev libxext-dev
- libpng-dev libid3tag-dev jpeg-dev libsm-dev zlib-dev"
+ libpng-dev libid3tag-dev jpeg-dev libsm-dev zlib-dev util-linux-ng-dev"
source="http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
- bufferoverflow.patch
- libpng14.patch"
+ "
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
- patch -Np0 -i "$srcdir"/bufferoverflow.patch || return 1
- patch -Np1 -i "$srcdir"/libpng14.patch || return 1
}
build() {
@@ -36,6 +33,4 @@ package() {
make DESTDIR=$pkgdir install || return 1
install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
}
-md5sums="9f15568e76ebda9092c571e0df261f54 imlib2-1.4.2.tar.bz2
-76def1fe0ac2ac1686ff24d29979606f bufferoverflow.patch
-68f671641e298ef7eead0aded4087c53 libpng14.patch"
+md5sums="b6de51879502e857d5b1f7622267a030 imlib2-1.4.4.tar.bz2"
diff --git a/main/imlib2/bufferoverflow.patch b/main/imlib2/bufferoverflow.patch
deleted file mode 100644
index 397b43fb8c..0000000000
--- a/main/imlib2/bufferoverflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/modules/loaders/loader_xpm.c
-+++ src/modules/loaders/loader_xpm.c.new
-@@ -246,8 +246,8 @@
- return 0;
- }
- ptr = im->data;
-- end = ptr + (sizeof(DATA32) * w * h);
- pixels = w * h;
-+ end = ptr + pixels;
- }
- else
- {
-
diff --git a/main/imlib2/libpng14.patch b/main/imlib2/libpng14.patch
deleted file mode 100644
index 0409228401..0000000000
--- a/main/imlib2/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur imlib2-1.4.2-orig/src/modules/loaders/loader_png.c imlib2-1.4.2/src/modules/loaders/loader_png.c
---- imlib2-1.4.2-orig/src/modules/loaders/loader_png.c 2010-01-19 03:37:21.000000000 -0500
-+++ imlib2-1.4.2/src/modules/loaders/loader_png.c 2010-01-19 03:38:51.000000000 -0500
-@@ -38,7 +38,7 @@
-
- /* if we haven't read the header before, set the header data */
- fread(buf, 1, PNG_BYTES_TO_CHECK, f);
-- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
- {
- fclose(f);
- return 0;