summaryrefslogtreecommitdiffstats
path: root/abs/core/gdk-pixbuf
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/gdk-pixbuf')
-rw-r--r--abs/core/gdk-pixbuf/PKGBUILD41
-rw-r--r--abs/core/gdk-pixbuf/libpng15.patch30
2 files changed, 50 insertions, 21 deletions
diff --git a/abs/core/gdk-pixbuf/PKGBUILD b/abs/core/gdk-pixbuf/PKGBUILD
index 27e662a..7b0059d 100644
--- a/abs/core/gdk-pixbuf/PKGBUILD
+++ b/abs/core/gdk-pixbuf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63580 2010-01-17 23:27:59Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 66703 2012-02-27 17:09:51Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=gdk-pixbuf
pkgver=0.22.0
-pkgrel=7
+pkgrel=9
pkgdesc="Image loading and manipulation library"
arch=('i686' 'x86_64')
url="http://www.gtk.org/"
@@ -17,28 +17,27 @@ source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.22/${pkgname}-${pkgve
gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
gdk-pixbuf-0.22.0-bmp_secure.patch
gdk-pixbuf-0.22.0-loaders.patch
- gdk-pixbuf-0.22.0.patch)
+ gdk-pixbuf-0.22.0.patch
+ libpng15.patch)
md5sums=('05fcb68ceaa338614ab650c775efc2f2'
- 'd1fb93f1ae994875158a7e0c108c36f8'
- '5f59d5772b1482d885a180dbc581cf84'
- '3cf31ae0509747f72ac27a9fd96109c2'
- 'e0f5f301ce958b7cea0be631ed7b8e56')
+ 'd1fb93f1ae994875158a7e0c108c36f8'
+ '5f59d5772b1482d885a180dbc581cf84'
+ '3cf31ae0509747f72ac27a9fd96109c2'
+ 'e0f5f301ce958b7cea0be631ed7b8e56'
+ '16db4dc83d507ebcf15d1beb753a77bc')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
export SED=/bin/sed
- patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch || return 1
- patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch || return 1
- patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch || return 1
- patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch || return 1
- libtoolize --force --copy --automake || return 1
- autoreconf --force --install || return 1
- ./configure --prefix=/usr --disable-gtk-doc || return 1
- make || return 1
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
+ patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
+ patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch
+ patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch
+ patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch
+ patch -Np1 -i ${srcdir}/libpng15.patch
+ libtoolize --force --copy --automake
+ autoreconf --force --install
+ ./configure --prefix=/usr --disable-gtk-doc
+ make
+ make DESTDIR=${pkgdir} install
rm -rf ${pkgdir}/usr/share/gnome
}
diff --git a/abs/core/gdk-pixbuf/libpng15.patch b/abs/core/gdk-pixbuf/libpng15.patch
new file mode 100644
index 0000000..e667288
--- /dev/null
+++ b/abs/core/gdk-pixbuf/libpng15.patch
@@ -0,0 +1,30 @@
+diff -wbBur gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c
+--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c 2001-01-24 23:59:23.000000000 +0300
++++ gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c 2012-01-23 13:33:08.000000000 +0400
+@@ -175,7 +175,7 @@
+ return NULL;
+ }
+
+- if (setjmp (png_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
+ return NULL;
+ }
+@@ -311,7 +311,7 @@
+ return NULL;
+ }
+
+- if (setjmp (lc->png_read_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
+ if (lc->png_info_ptr)
+ png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
+ g_free(lc);
+@@ -366,7 +366,7 @@
+ lc->max_row_seen_in_chunk = -1;
+
+ /* Invokes our callbacks as needed */
+- if (setjmp (lc->png_read_ptr->jmpbuf)) {
++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
+ return FALSE;
+ } else {
+ png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size);