[arch-commits] Commit in imlib/repos (3 files)

[Eric Bélanger]

    Date: Monday, January 18, 2010 @ 21:14:41
  Author: eric
Revision: 63920

Merged revisions 63918 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/imlib/trunk

........
  r63918 | eric | 2010-01-18 21:13:04 -0500 (Mon, 18 Jan 2010) | 2 lines
  
  upgpkg: imlib 1.9.15-8
      Removed undefined symbol
........

Added:
  imlib/repos/jpng-x86_64/libpng14.patch
    (from rev 63918, imlib/trunk/libpng14.patch)
Modified:
  imlib/repos/jpng-x86_64/	(properties)
  imlib/repos/jpng-x86_64/PKGBUILD

----------------+
 PKGBUILD       |   11 ++++++++---
 libpng14.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)


Property changes on: imlib/repos/jpng-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /imlib/trunk:1-63404
   + /imlib/trunk:1-63919

Modified: jpng-x86_64/PKGBUILD
===================================================================
--- jpng-x86_64/PKGBUILD	2010-01-19 02:13:44 UTC (rev 63919)
+++ jpng-x86_64/PKGBUILD	2010-01-19 02:14:41 UTC (rev 63920)
@@ -4,7 +4,7 @@
 
 pkgname=imlib
 pkgver=1.9.15
-pkgrel=7
+pkgrel=8
 pkgdesc="General image handling library for X11 and Gtk"
 arch=('i686' 'x86_64')
 url="http://freshmeat.net/projects/imlib/"
@@ -13,15 +13,20 @@
 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)
+        debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch libpng14.patch)
 md5sums=('7db987e6c52e4daf70d7d0f471238eae' '5f9da697934b6bd3b497ac9160ce4f5c'\
-         'b273d36aa60adbfaacaf6062234e4c1f' '33b832f0dc6c9723cd0dfe9c8d0a6797')
+         'b273d36aa60adbfaacaf6062234e4c1f' '33b832f0dc6c9723cd0dfe9c8d0a6797'\
+         'e7c5783a02a370cacd74f76f699c4f99')
+sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' 'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'\
+         'ec1b47281c1a7fb21abe841f948ecc56ed13f310' 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'\
+         '793862d7a239d0b4a10f395f99640978f2bb1739')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/debian-bug448360.patch" || return 1
   patch -Np1 -i "${srcdir}/CAN-2004-1026.patch" || return 1
   patch -Np0 -i "${srcdir}/aclocal-fixes.patch" || return 1
+  patch -Np1 -i "${srcdir}/libpng14.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Copied: imlib/repos/jpng-x86_64/libpng14.patch (from rev 63918, imlib/trunk/libpng14.patch)
===================================================================
--- jpng-x86_64/libpng14.patch	                        (rev 0)
+++ jpng-x86_64/libpng14.patch	2010-01-19 02:14:41 UTC (rev 63920)
@@ -0,0 +1,12 @@
+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	2010-01-18 20:58:27.000000000 -0500
++++ imlib-1.9.15/Imlib/load.c	2010-01-18 21:02:04.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);
+ #else
+   return 0;
+ #endif