Date: Thursday, March 21, 2013 @ 21:13:23 Author: jgc Revision: 180424
upgpkg: glib2 2.35.9-1 Added: glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch Modified: glib2/trunk/PKGBUILD -----------------------------------------------------+ 0001-Make-gtester-report-work-with-Python-3.x.patch | 60 ++++++++++++++++++ PKGBUILD | 20 +++--- 2 files changed, 71 insertions(+), 9 deletions(-) Added: 0001-Make-gtester-report-work-with-Python-3.x.patch =================================================================== --- 0001-Make-gtester-report-work-with-Python-3.x.patch (rev 0) +++ 0001-Make-gtester-report-work-with-Python-3.x.patch 2013-03-21 20:13:23 UTC (rev 180424) @@ -0,0 +1,60 @@ +From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001 +From: Jan de Groot <j...@archlinux.org> +Date: Thu, 21 Mar 2013 20:47:57 +0100 +Subject: [PATCH] Make gtester-report work with Python 3.x: - fix indentations + (tabs to spaces) - Replace print with print(), still works with Python 2.x + +--- + glib/gtester-report | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/glib/gtester-report b/glib/gtester-report +index 0fcdd9a..00296ea 100755 +--- a/glib/gtester-report ++++ b/glib/gtester-report +@@ -308,20 +308,20 @@ class HTMLReportWriter(ReportWriter): + if binary.success_cases: + oklink = 'href="javascript:toggle_display (\'ResultTable\', \'tr\', \'b%u_\', \'success\')"' % self.bcounter + if real_cases != 0: +- self.oprint ('<a %s>ER</a>\n' % erlink) +- self.oprint ('<a %s>OK</a>\n' % oklink) +- self.oprint ('</td>\n') +- perc = binary.success_cases * 100.0 / real_cases +- pcolor = { +- 100 : 'bgcolor="lightgreen"', +- 0 : 'bgcolor="red"', +- }.get (int (perc), 'bgcolor="yellow"') +- self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc)) +- self.oprint ('</tr>\n') ++ self.oprint ('<a %s>ER</a>\n' % erlink) ++ self.oprint ('<a %s>OK</a>\n' % oklink) ++ self.oprint ('</td>\n') ++ perc = binary.success_cases * 100.0 / real_cases ++ pcolor = { ++ 100 : 'bgcolor="lightgreen"', ++ 0 : 'bgcolor="red"', ++ }.get (int (perc), 'bgcolor="yellow"') ++ self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc)) ++ self.oprint ('</tr>\n') + else: +- self.oprint ('Empty\n') +- self.oprint ('</td>\n') +- self.oprint ('</tr>\n') ++ self.oprint ('Empty\n') ++ self.oprint ('</td>\n') ++ self.oprint ('</tr>\n') + for tc in binary.testcases: + self.handle_testcase (tc, binary) + def handle_totals (self): +@@ -466,7 +466,7 @@ def parse_opts(): + " Needs python-subunit]") + options, files = parser.parse_args() + if options.version: +- print parser.epilog ++ print(parser.epilog) + return None, None + if len(files) != 1: + parser.error("Must supply a log file to parse.") +-- +1.8.2 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-21 19:48:29 UTC (rev 180423) +++ PKGBUILD 2013-03-21 20:13:23 UTC (rev 180424) @@ -2,25 +2,28 @@ # Maintainer: Jan de Groot <j...@archlinux.org> pkgname=glib2 -pkgver=2.34.3 +pkgver=2.35.9 pkgrel=1 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' 'python2' 'libxslt' 'docbook-xml') -optdepends=('python2: for gdbus-codegen') +makedepends=('pkg-config' 'python' 'libxslt' 'docbook-xml') +optdepends=('python: 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) -sha256sums=('855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7' - '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') + revert-warn-glib-compile-schemas.patch + 0001-Make-gtester-report-work-with-Python-3.x.patch) +sha256sums=('75ce10a4c47c830234ce6af8e52dc4ebaf603a9c04b4114eb22dd00335f3943e' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97' + 'a2b4ff3836fc0a5b03b8e6bfa69be44b9a65f16486e4c1e4bc6c3d50fe2ad632') build() { cd glib-$pkgver - patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ + 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 \ --sysconfdir=/etc \ --with-pcre=system \ --disable-fam @@ -34,5 +37,4 @@ 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 }