aboutsummaryrefslogtreecommitdiffstats
path: root/main/imlib2
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-02-13 17:07:49 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-02-13 17:07:49 +0000
commitfbb1a8ef5b0939214e9b45136dd240db1026dc1b (patch)
treee063f9d975be1123abe35c24d01f30ea6b3bccfc /main/imlib2
parent11b27a2f090cd34e002f0d1fe1cbf85c5594dc8b (diff)
downloadaports-fbb1a8ef5b0939214e9b45136dd240db1026dc1b.tar.bz2
aports-fbb1a8ef5b0939214e9b45136dd240db1026dc1b.tar.xz
main/imlib2: fix for libpng-1.4
Diffstat (limited to 'main/imlib2')
-rw-r--r--main/imlib2/APKBUILD11
-rw-r--r--main/imlib2/libpng14.patch12
2 files changed, 19 insertions, 4 deletions
diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD
index 9e7fdea9d6..ff9944a9f8 100644
--- a/main/imlib2/APKBUILD
+++ b/main/imlib2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imlib2
pkgver=1.4.2
-pkgrel=3
+pkgrel=4
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"
@@ -10,12 +10,14 @@ depends=
makedepends="tiff-dev giflib-dev bzip2-dev freetype-dev libxext-dev
libpng-dev libid3tag-dev jpeg-dev libsm-dev zlib-dev"
source="http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
- bufferoverflow.patch"
+ bufferoverflow.patch
+ libpng14.patch"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
- patch -Np0 -i $srcdir/bufferoverflow.patch || return 1
+ patch -Np0 -i "$srcdir"/bufferoverflow.patch || return 1
+ patch -Np1 -i "$srcdir"/libpng14.patch || return 1
}
build() {
@@ -35,4 +37,5 @@ package() {
install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
}
md5sums="9f15568e76ebda9092c571e0df261f54 imlib2-1.4.2.tar.bz2
-76def1fe0ac2ac1686ff24d29979606f bufferoverflow.patch"
+76def1fe0ac2ac1686ff24d29979606f bufferoverflow.patch
+68f671641e298ef7eead0aded4087c53 libpng14.patch"
diff --git a/main/imlib2/libpng14.patch b/main/imlib2/libpng14.patch
new file mode 100644
index 0000000000..0409228401
--- /dev/null
+++ b/main/imlib2/libpng14.patch
@@ -0,0 +1,12 @@
+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;