[arch-commits] Commit in imlib/trunk (3 files)
Date: Tuesday, May 27, 2014 @ 11:50:27
Author: jgc
Revision: 213646
upgpkg: imlib 1.9.15-15
giflib 5.1 rebuild
Added:
imlib/trunk/imlib-giflib51.patch
Modified:
imlib/trunk/PKGBUILD
Deleted:
imlib/trunk/imlib-giflib5.patch
--+
PKGBUILD |9 +--
imlib-giflib5.patch | 110 --
imlib-giflib51.patch | 126 +
3 files changed, 131 insertions(+), 114 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-27 09:23:51 UTC (rev 213645)
+++ PKGBUILD2014-05-27 09:50:27 UTC (rev 213646)
@@ -3,7 +3,7 @@
pkgname=imlib
pkgver=1.9.15
-pkgrel=14
+pkgrel=15
pkgdesc=General image handling library for X11 and Gtk
arch=('i686' 'x86_64')
url=http://freshmeat.net/projects/imlib/;
@@ -12,13 +12,13 @@
makedepends=('libxt')
source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2
debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch
-imlib-1.9.15-libpng15.patch imlib-giflib5.patch imlib-gtk.patch)
+imlib-1.9.15-libpng15.patch imlib-giflib51.patch imlib-gtk.patch)
sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720'
'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'
'ec1b47281c1a7fb21abe841f948ecc56ed13f310'
'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'
'33c3aaa43eb624f2a6ab0406285a851590e3'
- '56e9d65e05a347452fd608d2dfc8538f7ce09893'
+ '3c33b3d7f7125a6fbfcf48ca585739b71b1d8ebf'
'7cf962f8d7488200910ba4bdee00473f035b054a')
prepare() {
@@ -27,9 +27,10 @@
patch -p1 -i ${srcdir}/CAN-2004-1026.patch
patch -p0 -i ${srcdir}/aclocal-fixes.patch
patch -p0 -i ${srcdir}/imlib-1.9.15-libpng15.patch
- patch -p1 -i ${srcdir}/imlib-giflib5.patch
+ patch -p1 -i ${srcdir}/imlib-giflib51.patch
patch -p1 -i ${srcdir}/imlib-gtk.patch
sed '/AC_PATH_XTRA/d' -i configure.in
+ mv configure.in configure.ac
libtoolize --force
cp /usr/bin/libtool .
}
Deleted: imlib-giflib5.patch
===
--- imlib-giflib5.patch 2014-05-27 09:23:51 UTC (rev 213645)
+++ imlib-giflib5.patch 2014-05-27 09:50:27 UTC (rev 213646)
@@ -1,110 +0,0 @@
-diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
imlib-1.9.15-orig/Imlib/load.c 2013-07-29 17:33:54.656601713 -0400
-+++ imlib-1.9.15/Imlib/load.c 2013-07-29 17:39:39.063991823 -0400
-@@ -444,6 +444,7 @@
- int intjump[] = {8, 8, 4, 2};
- int istransp, transp;
- int fd;
-+ int Error;
-
- done = 0;
- istransp = 0;
-@@ -454,7 +455,7 @@
- fd = fileno(f);
- /* Apparently rewind(f) isn't sufficient */
- lseek(fd, (long) 0, 0);
-- gif = DGifOpenFileHandle(fd);
-+ gif = DGifOpenFileHandle(fd, Error);
-
- if (!gif)
- return NULL;
-diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c
imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 17:33:54.656601713
-0400
-+++ imlib-1.9.15/gdk_imlib/io-gif.c2013-07-29 17:37:11.941783903 -0400
-@@ -23,6 +23,7 @@
- int intjump[] = {8, 8, 4, 2};
- int istransp, transp;
- int fd;
-+ int Error;
-
- done = 0;
- istransp = 0;
-@@ -30,7 +31,7 @@
- fd = fileno(f);
- /* Apparently rewind(f) isn't sufficient */
- lseek(fd, (long) 0, 0);
-- gif = DGifOpenFileHandle(fd);
-+ gif = DGifOpenFileHandle(fd, Error);
-
- transp = -1;
- data = NULL;
-diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
imlib-1.9.15-orig/Imlib/load.c 2013-07-29 22:06:15.111285191 -0400
-+++ imlib-1.9.15/Imlib/load.c 2013-07-29 22:07:36.926673905 -0400
-@@ -6,6 +6,14 @@
-
- #define G_MAXINT ((int) 0x7fff)
-
-+static void
-+localPrintGifError(void)
-+{
-+int ErrorCode=0;
-+GifErrorString(ErrorCode);
-+fprintf(stderr, \nGIF-LIB error: %i.\n, ErrorCode);
-+}
-+
- /* Split the ID - damages input*/
-
- static char*
-@@ -462,14 +470,14 @@
- {
- if (DGifGetRecordType(gif, rec) == GIF_ERROR)
- {
--PrintGifError();
-+localPrintGifError();
- rec = TERMINATE_RECORD_TYPE;
- }
- if ((rec == IMAGE_DESC_RECORD_TYPE) (!done))
- {
- if (DGifGetImageDesc(gif) == GIF_ERROR)
- {
--PrintGifError();
-+localPrintGifError();
- rec = TERMINATE_RECORD_TYPE;
- }
- *w = gif-Image.Width;
-diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c
imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 22:06:15.111285191
-0400
-+++ imlib-1.9.15/gdk_imlib/io-gif.c2013-07-29 22:08:46.182265058 -0400
-@@ -10,6 +10,14 @@
- #else
- #include gif_lib.h
-
-+static void
[arch-commits] Commit in imlib/trunk (3 files)
Date: Wednesday, January 18, 2012 @ 15:30:41
Author: eric
Revision: 146848
upgpkg: imlib 1.9.15-11
Rebuild against libpng 1.5 and libtiff 4.0
Added:
imlib/trunk/imlib-1.9.15-libpng15.patch
Modified:
imlib/trunk/PKGBUILD
Deleted:
imlib/trunk/libpng14.patch
-+
PKGBUILD| 32 +
imlib-1.9.15-libpng15.patch | 142 ++
libpng14.patch | 12 ---
3 files changed, 159 insertions(+), 27 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-18 20:25:31 UTC (rev 146847)
+++ PKGBUILD2012-01-18 20:30:41 UTC (rev 146848)
@@ -1,32 +1,30 @@
# $Id$
-# Maintainer: Eric Belanger e...@archlinux.org
-# Contributor: Judd Vinet jvi...@zeroflux.org
+# Maintainer: Eric Bélanger e...@archlinux.org
pkgname=imlib
pkgver=1.9.15
-pkgrel=10
+pkgrel=11
pkgdesc=General image handling library for X11 and Gtk
arch=('i686' 'x86_64')
url=http://freshmeat.net/projects/imlib/;
license=('GPL')
-depends=('gtk' 'giflib' 'libpng=1.4.0' 'libtiff=3.9.2-2' 'libjpeg=8')
+depends=('gtk' 'giflib' 'libpng' 'libtiff')
makedepends=('libxt')
options=('!libtool')
source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2
-debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch
libpng14.patch)
-md5sums=('7db987e6c52e4daf70d7d0f471238eae' '5f9da697934b6bd3b497ac9160ce4f5c'\
- 'b273d36aa60adbfaacaf6062234e4c1f' '33b832f0dc6c9723cd0dfe9c8d0a6797'\
- '9d8a029f5fb05978db0dbcd4ff38fe23')
-sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720'
'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'\
- 'ec1b47281c1a7fb21abe841f948ecc56ed13f310'
'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'\
- '20ed6063ba787ac7c2677bb4b135c0b7285c52af')
+debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch
imlib-1.9.15-libpng15.patch)
+sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720'
+ 'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'
+ 'ec1b47281c1a7fb21abe841f948ecc56ed13f310'
+ 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'
+ '33c3aaa43eb624f2a6ab0406285a851590e3')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/debian-bug448360.patch
- patch -Np1 -i ${srcdir}/CAN-2004-1026.patch
- patch -Np0 -i ${srcdir}/aclocal-fixes.patch
- patch -Np1 -i ${srcdir}/libpng14.patch
+ patch -p1 -i ${srcdir}/debian-bug448360.patch
+ patch -p1 -i ${srcdir}/CAN-2004-1026.patch
+ patch -p0 -i ${srcdir}/aclocal-fixes.patch
+ patch -p0 -i ${srcdir}/imlib-1.9.15-libpng15.patch
sed '/AC_PATH_XTRA/d' -i configure.in
libtoolize --force
cp /usr/bin/libtool .
@@ -34,5 +32,9 @@
./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
--enable-shm --disable-static
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
}
Added: imlib-1.9.15-libpng15.patch
===
--- imlib-1.9.15-libpng15.patch (rev 0)
+++ imlib-1.9.15-libpng15.patch 2012-01-18 20:30:41 UTC (rev 146848)
@@ -0,0 +1,142 @@
+--- gdk_imlib/io-png.c
gdk_imlib/io-png.c
+@@ -40,13 +40,13 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr-jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(png_ptr, info_ptr, NULL);
+ return NULL;
+ }
+
+- if (info_ptr-color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ png_destroy_read_struct(png_ptr, info_ptr, NULL);
+ return NULL;
+@@ -275,13 +275,13 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr-jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(png_ptr, info_ptr, NULL);
+ return NULL;
+ }
+
+- if (info_ptr-color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ png_destroy_read_struct(png_ptr, info_ptr, NULL);
+ return NULL;
+@@ -301,6 +301,9 @@
+ /* Setup Translators */
+ if (color_type == PNG_COLOR_TYPE_PALETTE)
+ png_set_expand(png_ptr);
++ if (color_type == PNG_COLOR_TYPE_GRAY bit_depth 8)
++png_set_expand(png_ptr);
++
+ png_set_strip_16(png_ptr);
+ png_set_packing(png_ptr);
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+@@ -440,13 +443,13 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr-jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(png_ptr, info_ptr, NULL);
+ return NULL;
+ }
+
+- if (info_ptr-color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+
