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

[Jan de Groot]

    Date: Tuesday, March 26, 2013 @ 13:41:30
  Author: jgc
Revision: 180817

Depend on python2. This is still to buggy for Python 3.x. As gobject-introspection needs python2 anyways, let's do the same for glib2 tools.

upgpkg: glib2 2.36.0-2

Modified:
  glib2/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-26 12:17:36 UTC (rev 180816)
+++ PKGBUILD	2013-03-26 12:41:30 UTC (rev 180817)
@@ -3,27 +3,24 @@
 
 pkgname=glib2
 pkgver=2.36.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('pcre' 'libffi')
-makedepends=('pkg-config' 'python' 'libxslt' 'docbook-xml')
-optdepends=('python: for gdbus-codegen and gtester-report')
+makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml')
+optdepends=('python2: for gdbus-codegen and gtester-report')
 options=('!libtool' '!docs' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
-        revert-warn-glib-compile-schemas.patch
-        0001-Make-gtester-report-work-with-Python-3.x.patch)
+        revert-warn-glib-compile-schemas.patch)
 sha256sums=('455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
-            'a2b4ff3836fc0a5b03b8e6bfa69be44b9a65f16486e4c1e4bc6c3d50fe2ad632')
+            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
 build() {
   cd glib-$pkgver
   patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
-  patch -Np1 -i ../0001-Make-gtester-report-work-with-Python-3.x.patch
-  ./configure --prefix=/usr --libdir=/usr/lib \
+  PYTHON=python2 ./configure --prefix=/usr --libdir=/usr/lib \
       --sysconfdir=/etc \
       --with-pcre=system \
       --disable-fam
@@ -37,4 +34,6 @@
   for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
       chmod -x "$_i"
   done
+
+   sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
 }