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

[Douglas Soares de Andrade]

    Date: Sunday, August 17, 2008 @ 03:46:49
  Author: douglas
Revision: 9436

Merged revisions 9432-9435 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/libpng/trunk

........
  r9435 | douglas | 2008-08-17 04:46:08 -0300 (Dom, 17 Ago 2008) | 2 lines
  
  upgpkg: libpng 1.2.29-2
      Updated for i686: 1.2.29 - 1.2.30 (broke xulrunner)
........

Modified:
  libpng/repos/extra-i686/	(properties)
  libpng/repos/extra-i686/ChangeLog
  libpng/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |    9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)


Property changes on: libpng/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /libpng/trunk:1-9431
   + /libpng/trunk:1-9435

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2008-08-17 07:46:08 UTC (rev 9435)
+++ extra-i686/ChangeLog	2008-08-17 07:46:49 UTC (rev 9436)
@@ -1,6 +1,11 @@
 
 2008-08-17  Douglas Soares de Andrade  <douglas at archlinux.org>
 
+	* Had to return to 1.2.29 because xul depends on 
+	  png with apng patch
+
+2008-08-17  Douglas Soares de Andrade  <douglas at archlinux.org>
+
 	* Updated for i686: 1.2.30
 	* Fixes some security issues
 	* Remove the apng patch as there was no compatible version

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-08-17 07:46:08 UTC (rev 9435)
+++ extra-i686/PKGBUILD	2008-08-17 07:46:49 UTC (rev 9436)
@@ -4,8 +4,8 @@
 # Maintainer: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=libpng
-pkgver=1.2.30
-pkgrel=1
+pkgver=1.2.29
+pkgrel=2
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64')
 url="http://www.libpng.org/pub/png/libpng.html"
@@ -15,15 +15,16 @@
         # http://littlesvr.ca/apng/diff/${pkgname}-${pkgver}-apng.patch
 	    ${pkgname}-${pkgver}-apng.patch )
 options=('!libtool')
+replaces=('libpng=1.2.30')
 
-md5sums=('2e42cc17231231bdc9be8c5928535c8a'
+md5sums=('f588cb4ee39e3a333604096f937ea157'
          '8aa74a2912d68d0f9351f3bd137ab05d')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
 
   # Add animated PNG (apng) support
-  # patch -Np1 -i $startdir/src/${pkgname}-${pkgver}-apng.patch || return 1
+  patch -Np1 -i $startdir/src/${pkgname}-${pkgver}-apng.patch || return 1
 
   libtoolize --force --copy || return 1
   aclocal || return 1