From e7d20bb26ad8d2e20a8757b02c07d31bf832161f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 13 May 2011 12:15:08 +0000 Subject: main/gdk-pixbuf: rebuild against libpng-1.5 and remove libtool archives --- main/gdk-pixbuf/APKBUILD | 14 +++++-- main/gdk-pixbuf/gdk-pixbuf-libpng15.patch | 67 +++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 main/gdk-pixbuf/gdk-pixbuf-libpng15.patch diff --git a/main/gdk-pixbuf/APKBUILD b/main/gdk-pixbuf/APKBUILD index 36ec7adeac..bebcecf5ec 100644 --- a/main/gdk-pixbuf/APKBUILD +++ b/main/gdk-pixbuf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=gdk-pixbuf pkgver=2.22.1 -pkgrel=0 +pkgrel=1 pkgdesc="GDK Pixbuf library" url="http://www.gtk.org/" arch="all" @@ -12,13 +12,19 @@ makedepends="tiff-dev libpng-dev glib-dev jpeg-dev gobject-introspection" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger:/usr/lib/gdk-pixbuf-2.0/*/loaders" subpackages="$pkgname-dev $pkgname-doc" -source="http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.bz2" +source="http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.bz2 + gdk-pixbuf-libpng15.patch" replaces="gtk+" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { @@ -33,6 +39,7 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install + rm -f "$pkgdir"/usr/lib/*.la } doc() { @@ -45,4 +52,5 @@ dev() { default_dev } -md5sums="716c4593ead3f9c8cca63b8b1907a561 gdk-pixbuf-2.22.1.tar.bz2" +md5sums="716c4593ead3f9c8cca63b8b1907a561 gdk-pixbuf-2.22.1.tar.bz2 +7153731aba3204b4e7173581360ddf37 gdk-pixbuf-libpng15.patch" diff --git a/main/gdk-pixbuf/gdk-pixbuf-libpng15.patch b/main/gdk-pixbuf/gdk-pixbuf-libpng15.patch new file mode 100644 index 0000000000..424938e815 --- /dev/null +++ b/main/gdk-pixbuf/gdk-pixbuf-libpng15.patch @@ -0,0 +1,67 @@ +From e6a5b2472a4a5d554b587dfcb798b95035caa6fd Mon Sep 17 00:00:00 2001 +From: Maarten Bosmans +Date: Mon, 24 Jan 2011 10:39:22 +0000 +Subject: Use png_jmpbuf macro + +This makes the png loader compatible with libpng 1.5 +--- +diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c +index 79c81fd..76f3304 100644 +--- a/gdk-pixbuf/io-png.c ++++ b/gdk-pixbuf/io-png.c +@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr, + error_msg); + } + +- longjmp (png_save_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf(png_save_ptr), 1); + } + + static void +@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + g_free (rows); + + if (pixbuf) +@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func, + 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); +@@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context, + lc->error = error; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + lc->error = NULL; + return FALSE; + } else { +@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr, + error_msg); + } + +- longjmp (png_read_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf(png_read_ptr), 1); + } + + static void +@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf *pixbuf, + success = FALSE; + goto cleanup; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + success = FALSE; + goto cleanup; + } +-- +cgit v0.9 -- cgit v1.2.3