[arch-commits] Commit in python-cairo/trunk (2 files)

[Felix Yan]

    Date: Tuesday, September 22, 2015 @ 04:25:45
  Author: fyan
Revision: 247042

upgpkg: python-cairo 1.10.0-6

rebuild for python 3.5

Modified:
  python-cairo/trunk/PKGBUILD
Deleted:
  python-cairo/trunk/pycairo-1.10.0-waf-python3.4.patch

----------+
 PKGBUILD |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-21 19:48:49 UTC (rev 247041)
+++ PKGBUILD	2015-09-22 02:25:45 UTC (rev 247042)
@@ -4,7 +4,8 @@
 
 pkgname=python-cairo
 pkgver=1.10.0
-pkgrel=5
+_waf_version=1.7.15
+pkgrel=6
 pkgdesc="Python bindings for the cairo graphics library"
 arch=('i686' 'x86_64')
 url="http://www.cairographics.org/pycairo"
@@ -11,16 +12,20 @@
 license=('LGPL3')
 depends=('python' 'cairo')
 source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2
-        pycairo-1.10.0-waf-python3.4.patch)
+        http://waf.googlecode.com/files/waf-${_waf_version}.tar.bz2)
 md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5'
-         '418e36055c75392f6501918d1c33d448')
+         'a62272a3b4eb05b7e5842b4f9839cb98')
 
 build() {
   cd pycairo-${pkgver}
+
+  # use newer waf
+  cp "$srcdir/waf-$_waf_version/waf" ./
+
+  # fix compatibility with newer waf
+  # http://cgit.freedesktop.org/pycairo/commit/?id=c57cd129407c904f8c2f752a59d0183df7b01a5e
+  sed -e "s/ctx.\(tool_options\|check_tool\)(/ctx.load(/" -i wscript
   
-  # https://bugs.gentoo.org/show_bug.cgi?id=504342
-  patch -i "$srcdir/pycairo-1.10.0-waf-python3.4.patch"
-
   # Ensure that ./waf has created the cached unpacked version
   # of the wafadmin source tree.
   # This will be created to a subdirectory like

Deleted: pycairo-1.10.0-waf-python3.4.patch
===================================================================
(Binary files differ)