[arch-commits] Commit in glib2/repos (8 files)
Jan de Groot
jgc at nymeria.archlinux.org
Thu Mar 21 20:13:30 UTC 2013
Date: Thursday, March 21, 2013 @ 21:13:30
Author: jgc
Revision: 180425
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
glib2/repos/gnome-unstable-i686/
glib2/repos/gnome-unstable-i686/0001-Make-gtester-report-work-with-Python-3.x.patch
(from rev 180424, glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch)
glib2/repos/gnome-unstable-i686/PKGBUILD
(from rev 180424, glib2/trunk/PKGBUILD)
glib2/repos/gnome-unstable-i686/revert-warn-glib-compile-schemas.patch
(from rev 180424, glib2/trunk/revert-warn-glib-compile-schemas.patch)
glib2/repos/gnome-unstable-x86_64/
glib2/repos/gnome-unstable-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch
(from rev 180424, glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch)
glib2/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 180424, glib2/trunk/PKGBUILD)
glib2/repos/gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch
(from rev 180424, glib2/trunk/revert-warn-glib-compile-schemas.patch)
---------------------------------------------------------------------------+
gnome-unstable-i686/0001-Make-gtester-report-work-with-Python-3.x.patch | 60 ++++++++++
gnome-unstable-i686/PKGBUILD | 40 ++++++
gnome-unstable-i686/revert-warn-glib-compile-schemas.patch | 33 +++++
gnome-unstable-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch | 60 ++++++++++
gnome-unstable-x86_64/PKGBUILD | 40 ++++++
gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch | 33 +++++
6 files changed, 266 insertions(+)
Copied: glib2/repos/gnome-unstable-i686/0001-Make-gtester-report-work-with-Python-3.x.patch (from rev 180424, glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch)
===================================================================
--- gnome-unstable-i686/0001-Make-gtester-report-work-with-Python-3.x.patch (rev 0)
+++ gnome-unstable-i686/0001-Make-gtester-report-work-with-Python-3.x.patch 2013-03-21 20:13:30 UTC (rev 180425)
@@ -0,0 +1,60 @@
+From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc at 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
+
Copied: glib2/repos/gnome-unstable-i686/PKGBUILD (from rev 180424, glib2/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2013-03-21 20:13:30 UTC (rev 180425)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=glib2
+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' '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
+ 0001-Make-gtester-report-work-with-Python-3.x.patch)
+sha256sums=('75ce10a4c47c830234ce6af8e52dc4ebaf603a9c04b4114eb22dd00335f3943e'
+ '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
+ 'a2b4ff3836fc0a5b03b8e6bfa69be44b9a65f16486e4c1e4bc6c3d50fe2ad632')
+
+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 \
+ --sysconfdir=/etc \
+ --with-pcre=system \
+ --disable-fam
+ make
+}
+
+package() {
+ 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
+}
Copied: glib2/repos/gnome-unstable-i686/revert-warn-glib-compile-schemas.patch (from rev 180424, glib2/trunk/revert-warn-glib-compile-schemas.patch)
===================================================================
--- gnome-unstable-i686/revert-warn-glib-compile-schemas.patch (rev 0)
+++ gnome-unstable-i686/revert-warn-glib-compile-schemas.patch 2013-03-21 20:13:30 UTC (rev 180425)
@@ -0,0 +1,33 @@
+From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Thu, 12 Apr 2012 23:55:34 +0000
+Subject: glib-compile-schemas: warn about bad dconf paths
+
+For quite some time the recommended usage of GSettings and dconf has
+been to use paths like /org/gnome/example/. Use of /apps/ has spilled
+over from GConf and is continuing to make its way into a number of
+applications as they port.
+
+glib-compile-schemas will now warn about these types of paths being
+used. This generates a lot of noise, but hopefully it will reduce the
+number of ported applications making this mistake.
+---
+diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
+index cf02389..27d0181 100644
+--- a/gio/glib-compile-schemas.c
++++ b/gio/glib-compile-schemas.c
+@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state,
+ return;
+ }
+
++ if (path && (g_str_has_prefix (path, "/apps/") ||
++ g_str_has_prefix (path, "/desktop/") ||
++ g_str_has_prefix (path, "/system/")))
++ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with "
++ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
++
+ state->schema_state = schema_state_new (path, gettext_domain,
+ extends, extends_name, list_of);
+
+--
+cgit v0.9.0.2
Copied: glib2/repos/gnome-unstable-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch (from rev 180424, glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch)
===================================================================
--- gnome-unstable-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch (rev 0)
+++ gnome-unstable-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch 2013-03-21 20:13:30 UTC (rev 180425)
@@ -0,0 +1,60 @@
+From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc at 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
+
Copied: glib2/repos/gnome-unstable-x86_64/PKGBUILD (from rev 180424, glib2/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2013-03-21 20:13:30 UTC (rev 180425)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=glib2
+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' '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
+ 0001-Make-gtester-report-work-with-Python-3.x.patch)
+sha256sums=('75ce10a4c47c830234ce6af8e52dc4ebaf603a9c04b4114eb22dd00335f3943e'
+ '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
+ 'a2b4ff3836fc0a5b03b8e6bfa69be44b9a65f16486e4c1e4bc6c3d50fe2ad632')
+
+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 \
+ --sysconfdir=/etc \
+ --with-pcre=system \
+ --disable-fam
+ make
+}
+
+package() {
+ 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
+}
Copied: glib2/repos/gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch (from rev 180424, glib2/trunk/revert-warn-glib-compile-schemas.patch)
===================================================================
--- gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch (rev 0)
+++ gnome-unstable-x86_64/revert-warn-glib-compile-schemas.patch 2013-03-21 20:13:30 UTC (rev 180425)
@@ -0,0 +1,33 @@
+From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Thu, 12 Apr 2012 23:55:34 +0000
+Subject: glib-compile-schemas: warn about bad dconf paths
+
+For quite some time the recommended usage of GSettings and dconf has
+been to use paths like /org/gnome/example/. Use of /apps/ has spilled
+over from GConf and is continuing to make its way into a number of
+applications as they port.
+
+glib-compile-schemas will now warn about these types of paths being
+used. This generates a lot of noise, but hopefully it will reduce the
+number of ported applications making this mistake.
+---
+diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
+index cf02389..27d0181 100644
+--- a/gio/glib-compile-schemas.c
++++ b/gio/glib-compile-schemas.c
+@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state,
+ return;
+ }
+
++ if (path && (g_str_has_prefix (path, "/apps/") ||
++ g_str_has_prefix (path, "/desktop/") ||
++ g_str_has_prefix (path, "/system/")))
++ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with "
++ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
++
+ state->schema_state = schema_state_new (path, gettext_domain,
+ extends, extends_name, list_of);
+
+--
+cgit v0.9.0.2
More information about the arch-commits
mailing list