From d1d93fafb9ef98fdd0c9a5a486c179c03cbbfb33 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 23 Apr 2013 01:16:16 -0700 Subject: Tue Apr 23 01:16:16 PDT 2013 --- ...-Make-gtester-report-work-with-Python-3.x.patch | 60 ++++++++++++++++++++++ core/glib2/PKGBUILD | 49 +++++++++++++----- 2 files changed, 97 insertions(+), 12 deletions(-) create mode 100644 core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch (limited to 'core/glib2') diff --git a/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch b/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch new file mode 100644 index 000000000..b4ce93e83 --- /dev/null +++ b/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch @@ -0,0 +1,60 @@ +From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001 +From: Jan de Groot +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 ('ER\n' % erlink) +- self.oprint ('OK\n' % oklink) +- self.oprint ('\n') +- perc = binary.success_cases * 100.0 / real_cases +- pcolor = { +- 100 : 'bgcolor="lightgreen"', +- 0 : 'bgcolor="red"', +- }.get (int (perc), 'bgcolor="yellow"') +- self.oprint ('%.2f%%\n' % (pcolor, perc)) +- self.oprint ('\n') ++ self.oprint ('ER\n' % erlink) ++ self.oprint ('OK\n' % oklink) ++ self.oprint ('\n') ++ perc = binary.success_cases * 100.0 / real_cases ++ pcolor = { ++ 100 : 'bgcolor="lightgreen"', ++ 0 : 'bgcolor="red"', ++ }.get (int (perc), 'bgcolor="yellow"') ++ self.oprint ('%.2f%%\n' % (pcolor, perc)) ++ self.oprint ('\n') + else: +- self.oprint ('Empty\n') +- self.oprint ('\n') +- self.oprint ('\n') ++ self.oprint ('Empty\n') ++ self.oprint ('\n') ++ self.oprint ('\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 + diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 9a79b47ed..d277d9892 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 172097 2012-11-28 10:31:12Z jgc $ +# $Id: PKGBUILD 183313 2013-04-21 22:06:25Z heftig $ # Maintainer: Jan de Groot -pkgname=glib2 -pkgver=2.34.3 +pkgbase=glib2 +pkgname=(glib2 glib2-docs) +pkgver=2.36.1 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') -options=('!libtool' '!docs' '!emptydirs') +makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz revert-warn-glib-compile-schemas.patch) -sha256sums=('855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7' +sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { cd glib-$pkgver - patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" + patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ --with-pcre=system \ @@ -27,12 +24,40 @@ build() { make } -package() { +check() { + cd glib-$pkgver + #make -k check || : +} + +package_glib2() { + depends=('pcre' 'libffi') + optdepends=('python2: for gdbus-codegen and gtester-report' + 'elfutils: gresource inspection tool') + options=('!docs' '!libtool' '!emptydirs') + license=('LGPL') + cd glib-$pkgver make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install 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 + + # Our gdb does not ship the required python modules, so remove it + rm -rf "$pkgdir/usr/share/gdb/" +} + +package_glib2-docs() { + pkgdesc="Documentation for glib2" + conflicts=('gobject2-docs') + replaces=('gobject2-docs') + license=('custom') + options=('docs' '!emptydirs') + + cd glib-$pkgver/docs + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs" + install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/" + + rm -rf "${pkgdir}/usr/share/man" } -- cgit v1.2.3-54-g00ecf