[arch-commits] Commit in lib32-cairo/trunk (PKGBUILD)

[Laurent Carlier]

    Date: Tuesday, August 27, 2013 @ 16:39:51
  Author: lcarlier
Revision: 96400

upgpkg: lib32-cairo 1.12.16-1

Sync with testing

Modified:
  lib32-cairo/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-27 14:10:08 UTC (rev 96399)
+++ PKGBUILD	2013-08-27 14:39:51 UTC (rev 96400)
@@ -3,18 +3,18 @@
 
 _pkgbasename=cairo
 pkgname=lib32-$_pkgbasename
-pkgver=1.12.14
-pkgrel=4
+pkgver=1.12.16
+pkgrel=1
 pkgdesc="Cairo vector graphics library (32-bit)"
 arch=('x86_64')
 url="http://cairographics.org/"
 license=('LGPL' 'MPL')
-makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa>=9.1' 'lib32-mesa-libgl>=9.1' 'mesa-libgl') # we need to avoid old libgl in [extra]
-source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz
-        libpng16.patch)
+makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl')
+depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
+         'lib32-pixman' 'lib32-glib2' 'lib32-mesa' 'lib32-libgl' ${_pkgbasename})
+source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz)
 options=(!libtool)
-sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15'
-          'c9911f185637d266ce1d2985bd6fb7d0df3d75b2')
+sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec')
 
 build() {
   export CC="gcc -m32"
@@ -23,7 +23,6 @@
 
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
    
-  patch -Np1 -i ../libpng16.patch
   ./configure --prefix=/usr \
       --libdir=/usr/lib32 \
       --sysconfdir=/etc \
@@ -37,10 +36,8 @@
 }
 
 package() {
-  depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
-           'lib32-pixman' 'lib32-glib2' 'lib32-mesa>=9.1' 'lib32-libgl' ${_pkgbasename})
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
 
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/{include,share,bin}
 }