diff options
| -rw-r--r-- | main/gdk-pixbuf/APKBUILD | 13 | ||||
| -rw-r--r-- | main/gdk-pixbuf/gdk-pixbuf-libpng15.patch | 67 |
2 files changed, 6 insertions, 74 deletions
diff --git a/main/gdk-pixbuf/APKBUILD b/main/gdk-pixbuf/APKBUILD index dea9d8583c..25b7262ab4 100644 --- a/main/gdk-pixbuf/APKBUILD +++ b/main/gdk-pixbuf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gdk-pixbuf -pkgver=2.22.1 -pkgrel=3 +pkgver=2.24.0 +pkgrel=0 pkgdesc="GDK Pixbuf library" url="http://www.gtk.org/" arch="all" @@ -12,8 +12,7 @@ makedepends="tiff-dev libpng-dev glib-dev jpeg-dev gobject-introspection-dev" 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 - gdk-pixbuf-libpng15.patch" +source="http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.bz2" replaces="gtk+" _builddir="$srcdir"/$pkgname-$pkgver @@ -39,7 +38,8 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install - rm "$pkgdir"/usr/lib/*.la + rm "$pkgdir"/usr/lib/*.la \ + "$pkgdir"/usr/lib/gdk-pixbuf-*/*/loaders/*.la } doc() { @@ -52,5 +52,4 @@ dev() { default_dev } -md5sums="716c4593ead3f9c8cca63b8b1907a561 gdk-pixbuf-2.22.1.tar.bz2 -7153731aba3204b4e7173581360ddf37 gdk-pixbuf-libpng15.patch" +md5sums="d8ece3a4ade4a91c768328620e473ab8 gdk-pixbuf-2.24.0.tar.bz2" diff --git a/main/gdk-pixbuf/gdk-pixbuf-libpng15.patch b/main/gdk-pixbuf/gdk-pixbuf-libpng15.patch deleted file mode 100644 index 424938e815..0000000000 --- a/main/gdk-pixbuf/gdk-pixbuf-libpng15.patch +++ /dev/null @@ -1,67 +0,0 @@ -From e6a5b2472a4a5d554b587dfcb798b95035caa6fd Mon Sep 17 00:00:00 2001 -From: Maarten Bosmans <mkbosmans@gmail.com> -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 |