Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=97d950e9e398a6eddb7dd42f2c06c556032b96cf

commit 97d950e9e398a6eddb7dd42f2c06c556032b96cf
Author: James Buren <r...@frugalware.org>
Date:   Tue May 4 14:46:49 2010 -0500

imlib-1.9.15-7-i686
* fix compatibility with libpng 1.4.x

diff --git a/source/xlib-extra/imlib/FrugalBuild 
b/source/xlib-extra/imlib/FrugalBuild
index a6559c9..1b70886 100644
--- a/source/xlib-extra/imlib/FrugalBuild
+++ b/source/xlib-extra/imlib/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=imlib
pkgver=1.9.15
-pkgrel=6
+pkgrel=7
pkgdesc="A display depth-independent image loading and rendering library"
url="http://freshmeat.net/projects/imlib/";
depends=('libtiff' 'libjpeg>=8a' 'libgif' 'gtk+>=1.2.10-5' 'libpng>=1.4.1')
@@ -11,9 +11,10 @@ groups=('xlib-extra')
archs=('i686' 'x86_64' 'ppc')
_F_gnome_devel=y
Finclude gnome
-source=(${sour...@]} imlib-1.9.15-sec2.patch imlib-m4-fix.patch)
+source=(${sour...@]} imlib-1.9.15-sec2.patch imlib-png-1.4.patch 
imlib-m4-fix.patch)
Fconfopts="$Fconfopts --sysconfdir=/etc/imlib"
sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' \
'723e3d44db2cd2f4134efdb7f755bdd07bb61090' \
+          '27e9db6cf73e5bd27e25a7b6a620c62cf42e5bad' \
'a0eac327e61154323de19ecd608ebedbfb9b4708')
# optimization OK
diff --git a/source/xlib-extra/imlib/imlib-png-1.4.patch 
b/source/xlib-extra/imlib/imlib-png-1.4.patch
new file mode 100644
index 0000000..eda3cb7
--- /dev/null
+++ b/source/xlib-extra/imlib/imlib-png-1.4.patch
@@ -0,0 +1,12 @@
+diff -aur imlib-1.9.15/Imlib/load.c imlib-1.9.15-2/Imlib/load.c
+--- imlib-1.9.15/Imlib/load.c  2004-09-20 19:23:20.000000000 -0500
++++ imlib-1.9.15-2/Imlib/load.c        2010-05-04 14:44:41.000000000 -0500
+@@ -1619,7 +1619,7 @@
+     return 0;
+   fread(buf, 1, 8, f);
+   rewind(f);
+-  return (int)png_check_sig(buf, 8);
++  return (int)(png_sig_cmp(buf, 0, 8) == 0);
+ #else
+   return 0;
+ #endif
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to