[arch-commits] Commit in glib2/repos (16 files)
Jan de Groot
jgc at nymeria.archlinux.org
Thu Apr 25 11:34:18 UTC 2013
Date: Thursday, April 25, 2013 @ 13:34:18
Author: jgc
Revision: 183610
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
glib2/repos/testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch
(from rev 183609, glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch)
glib2/repos/testing-i686/PKGBUILD
(from rev 183609, glib2/trunk/PKGBUILD)
glib2/repos/testing-i686/gvariant-fix-annotation.patch
(from rev 183609, glib2/trunk/gvariant-fix-annotation.patch)
glib2/repos/testing-i686/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch
(from rev 183609, glib2/trunk/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch)
glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch
(from rev 183609, glib2/trunk/revert-warn-glib-compile-schemas.patch)
glib2/repos/testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch
(from rev 183609, glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch)
glib2/repos/testing-x86_64/PKGBUILD
(from rev 183609, glib2/trunk/PKGBUILD)
glib2/repos/testing-x86_64/gvariant-fix-annotation.patch
(from rev 183609, glib2/trunk/gvariant-fix-annotation.patch)
glib2/repos/testing-x86_64/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch
(from rev 183609, glib2/trunk/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch)
glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch
(from rev 183609, glib2/trunk/revert-warn-glib-compile-schemas.patch)
Deleted:
glib2/repos/testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch
glib2/repos/testing-i686/PKGBUILD
glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch
glib2/repos/testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch
glib2/repos/testing-x86_64/PKGBUILD
glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch
--------------------------------------------------------------------------------+
/0001-Make-gtester-report-work-with-Python-3.x.patch | 120 ++++++++
/PKGBUILD | 150 ++++++++++
/revert-warn-glib-compile-schemas.patch | 66 ++++
testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch | 60 ----
testing-i686/PKGBUILD | 67 ----
testing-i686/gvariant-fix-annotation.patch | 25 +
testing-i686/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch | 132 ++++++++
testing-i686/revert-warn-glib-compile-schemas.patch | 33 --
testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch | 60 ----
testing-x86_64/PKGBUILD | 67 ----
testing-x86_64/gvariant-fix-annotation.patch | 25 +
testing-x86_64/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch | 132 ++++++++
testing-x86_64/revert-warn-glib-compile-schemas.patch | 33 --
13 files changed, 650 insertions(+), 320 deletions(-)
Deleted: testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch
===================================================================
--- testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch 2013-04-25 11:34:05 UTC (rev 183609)
+++ testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -1,60 +0,0 @@
-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/testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch (from rev 183609, glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch)
===================================================================
--- testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch (rev 0)
+++ testing-i686/0001-Make-gtester-report-work-with-Python-3.x.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -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
+
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-04-25 11:34:05 UTC (rev 183609)
+++ testing-i686/PKGBUILD 2013-04-25 11:34:18 UTC (rev 183610)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=glib2
-pkgname=(glib2 glib2-docs)
-pkgver=2.36.1
-pkgrel=2
-pkgdesc="Common C routines used by GTK+ and other libs"
-url="http://www.gtk.org/"
-arch=(i686 x86_64)
-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=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24'
- '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
-
-build() {
- cd glib-$pkgver
-
- # fix FS#34630 https://bugs.archlinux.org/task/34630
- export CFLAGS+=" -Wall"
-
- patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
- --sysconfdir=/etc \
- --with-pcre=system \
- --disable-fam
- make
-}
-
-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
-
- # 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"
-}
Copied: glib2/repos/testing-i686/PKGBUILD (from rev 183609, glib2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-04-25 11:34:18 UTC (rev 183610)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=glib2
+pkgname=(glib2 glib2-docs)
+pkgver=2.36.1
+pkgrel=3
+pkgdesc="Common C routines used by GTK+ and other libs"
+url="http://www.gtk.org/"
+arch=(i686 x86_64)
+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
+ gvariant-fix-annotation.patch
+ partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch)
+sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24'
+ '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
+ 'ebbb0581322b1fc546f93f9d77f39f37584004086d2f6f2637a8bb7894e36b2b'
+ '5928ac4fd114cda846fe38a3b8bedc5b038dbf9e47f76029af7d75e5dc8ae5be')
+
+build() {
+ cd glib-$pkgver
+
+ # fix FS#34630 https://bugs.archlinux.org/task/34630
+ export CFLAGS+=" -Wall"
+
+ # Upstream fixes from 2.36 branch
+ patch -Np1 -i ../gvariant-fix-annotation.patch
+ patch -Np1 -i ../partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.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 \
+ --disable-fam
+ make
+}
+
+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
+
+ # 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"
+}
Copied: glib2/repos/testing-i686/gvariant-fix-annotation.patch (from rev 183609, glib2/trunk/gvariant-fix-annotation.patch)
===================================================================
--- testing-i686/gvariant-fix-annotation.patch (rev 0)
+++ testing-i686/gvariant-fix-annotation.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -0,0 +1,25 @@
+From 7304bbd5d8ad56dcf3ee9fadf74f6104c49d4df7 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna at src.gnome.org>
+Date: Fri, 12 Apr 2013 15:25:15 +0000
+Subject: GVariant: fix transfer annotation
+
+g_variant_new_from_bytes() returns a floating reference, so it
+must be annotated (transfer none)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=697887
+---
+diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
+index b96bc90..f823e01 100644
+--- a/glib/gvariant-core.c
++++ b/glib/gvariant-core.c
+@@ -498,7 +498,7 @@ g_variant_alloc (const GVariantType *type,
+ *
+ * A reference is taken on @bytes.
+ *
+- * Returns: a new #GVariant with a floating reference
++ * Returns: (transfer none): a new #GVariant with a floating reference
+ *
+ * Since: 2.36
+ */
+--
+cgit v0.9.1
Copied: glib2/repos/testing-i686/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch (from rev 183609, glib2/trunk/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch)
===================================================================
--- testing-i686/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch (rev 0)
+++ testing-i686/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -0,0 +1,132 @@
+From f3b1054b0ebb4912f700e08da0c3d35c30113e79 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Tue, 23 Apr 2013 17:26:48 +0000
+Subject: Partially revert "Merge waitpid() from g_spawn_sync into gmain()"
+
+This partially reverts commit ce0022933c255313e010b27f977f4ae02aad1e7e.
+
+It used to be safe to use g_spawn_sync() from processes that had their
+own SIGCHLD handler because it simply called wait(). When it was
+changed to depend on the GLib child watching infrastructure this meant
+that GLib had to own the SIGCHLD handler.
+
+This caused hangs in at least Pidgin.
+
+The patch contained two other improvements to the child watch code which
+we want to keep, so only revert the changes to gspawn itself.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=698081
+---
+diff --git a/glib/gspawn.c b/glib/gspawn.c
+index 381ed5c..01cedf6 100644
+--- a/glib/gspawn.c
++++ b/glib/gspawn.c
+@@ -47,7 +47,6 @@
+
+ #include "genviron.h"
+ #include "gmem.h"
+-#include "gmain.h"
+ #include "gshell.h"
+ #include "gstring.h"
+ #include "gstrfuncs.h"
+@@ -207,21 +206,6 @@ read_data (GString *str,
+ }
+ }
+
+-typedef struct {
+- GMainLoop *loop;
+- gint *status_p;
+-} SyncWaitpidData;
+-
+-static void
+-on_sync_waitpid (GPid pid,
+- gint status,
+- gpointer user_data)
+-{
+- SyncWaitpidData *data = user_data;
+- *(data->status_p) = status;
+- g_main_loop_quit (data->loop);
+-}
+-
+ /**
+ * g_spawn_sync:
+ * @working_directory: (allow-none): child's current working directory, or %NULL to inherit parent's
+@@ -277,7 +261,6 @@ g_spawn_sync (const gchar *working_directory,
+ GString *errstr = NULL;
+ gboolean failed;
+ gint status;
+- SyncWaitpidData waitpid_data;
+
+ g_return_val_if_fail (argv != NULL, FALSE);
+ g_return_val_if_fail (!(flags & G_SPAWN_DO_NOT_REAP_CHILD), FALSE);
+@@ -410,32 +393,45 @@ g_spawn_sync (const gchar *working_directory,
+ close_and_invalidate (&outpipe);
+ if (errpipe >= 0)
+ close_and_invalidate (&errpipe);
+-
+- /* Now create a temporary main context and loop, with just one
+- * waitpid source. We used to invoke waitpid() directly here, but
+- * this way we unify with the worker thread in gmain.c.
++
++ /* Wait for child to exit, even if we have
++ * an error pending.
+ */
+- {
+- GMainContext *context;
+- GMainLoop *loop;
+- GSource *source;
+-
+- context = g_main_context_new ();
+- loop = g_main_loop_new (context, TRUE);
++ again:
++
++ ret = waitpid (pid, &status, 0);
+
+- waitpid_data.loop = loop;
+- waitpid_data.status_p = &status;
+-
+- source = g_child_watch_source_new (pid);
+- g_source_set_callback (source, (GSourceFunc)on_sync_waitpid, &waitpid_data, NULL);
+- g_source_attach (source, context);
+- g_source_unref (source);
+-
+- g_main_loop_run (loop);
++ if (ret < 0)
++ {
++ if (errno == EINTR)
++ goto again;
++ else if (errno == ECHILD)
++ {
++ if (exit_status)
++ {
++ g_warning ("In call to g_spawn_sync(), exit status of a child process was requested but ECHILD was received by waitpid(). Most likely the process is ignoring SIGCHLD, or some other thread is invoking waitpid() with a nonpositive first argument; either behavior can break applications that use g_spawn_sync either directly or indirectly.");
++ }
++ else
++ {
++ /* We don't need the exit status. */
++ }
++ }
++ else
++ {
++ if (!failed) /* avoid error pileups */
++ {
++ int errsv = errno;
+
+- g_main_context_unref (context);
+- g_main_loop_unref (loop);
+- }
++ failed = TRUE;
++
++ g_set_error (error,
++ G_SPAWN_ERROR,
++ G_SPAWN_ERROR_READ,
++ _("Unexpected error in waitpid() (%s)"),
++ g_strerror (errsv));
++ }
++ }
++ }
+
+ if (failed)
+ {
+--
+cgit v0.9.1
Deleted: testing-i686/revert-warn-glib-compile-schemas.patch
===================================================================
--- testing-i686/revert-warn-glib-compile-schemas.patch 2013-04-25 11:34:05 UTC (rev 183609)
+++ testing-i686/revert-warn-glib-compile-schemas.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -1,33 +0,0 @@
-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/testing-i686/revert-warn-glib-compile-schemas.patch (from rev 183609, glib2/trunk/revert-warn-glib-compile-schemas.patch)
===================================================================
--- testing-i686/revert-warn-glib-compile-schemas.patch (rev 0)
+++ testing-i686/revert-warn-glib-compile-schemas.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -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
Deleted: testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch
===================================================================
--- testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch 2013-04-25 11:34:05 UTC (rev 183609)
+++ testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -1,60 +0,0 @@
-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/testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch (from rev 183609, glib2/trunk/0001-Make-gtester-report-work-with-Python-3.x.patch)
===================================================================
--- testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch (rev 0)
+++ testing-x86_64/0001-Make-gtester-report-work-with-Python-3.x.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -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
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-04-25 11:34:05 UTC (rev 183609)
+++ testing-x86_64/PKGBUILD 2013-04-25 11:34:18 UTC (rev 183610)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=glib2
-pkgname=(glib2 glib2-docs)
-pkgver=2.36.1
-pkgrel=2
-pkgdesc="Common C routines used by GTK+ and other libs"
-url="http://www.gtk.org/"
-arch=(i686 x86_64)
-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=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24'
- '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
-
-build() {
- cd glib-$pkgver
-
- # fix FS#34630 https://bugs.archlinux.org/task/34630
- export CFLAGS+=" -Wall"
-
- patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
- --sysconfdir=/etc \
- --with-pcre=system \
- --disable-fam
- make
-}
-
-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
-
- # 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"
-}
Copied: glib2/repos/testing-x86_64/PKGBUILD (from rev 183609, glib2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-04-25 11:34:18 UTC (rev 183610)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=glib2
+pkgname=(glib2 glib2-docs)
+pkgver=2.36.1
+pkgrel=3
+pkgdesc="Common C routines used by GTK+ and other libs"
+url="http://www.gtk.org/"
+arch=(i686 x86_64)
+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
+ gvariant-fix-annotation.patch
+ partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch)
+sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24'
+ '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
+ 'ebbb0581322b1fc546f93f9d77f39f37584004086d2f6f2637a8bb7894e36b2b'
+ '5928ac4fd114cda846fe38a3b8bedc5b038dbf9e47f76029af7d75e5dc8ae5be')
+
+build() {
+ cd glib-$pkgver
+
+ # fix FS#34630 https://bugs.archlinux.org/task/34630
+ export CFLAGS+=" -Wall"
+
+ # Upstream fixes from 2.36 branch
+ patch -Np1 -i ../gvariant-fix-annotation.patch
+ patch -Np1 -i ../partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.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 \
+ --disable-fam
+ make
+}
+
+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
+
+ # 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"
+}
Copied: glib2/repos/testing-x86_64/gvariant-fix-annotation.patch (from rev 183609, glib2/trunk/gvariant-fix-annotation.patch)
===================================================================
--- testing-x86_64/gvariant-fix-annotation.patch (rev 0)
+++ testing-x86_64/gvariant-fix-annotation.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -0,0 +1,25 @@
+From 7304bbd5d8ad56dcf3ee9fadf74f6104c49d4df7 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna at src.gnome.org>
+Date: Fri, 12 Apr 2013 15:25:15 +0000
+Subject: GVariant: fix transfer annotation
+
+g_variant_new_from_bytes() returns a floating reference, so it
+must be annotated (transfer none)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=697887
+---
+diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
+index b96bc90..f823e01 100644
+--- a/glib/gvariant-core.c
++++ b/glib/gvariant-core.c
+@@ -498,7 +498,7 @@ g_variant_alloc (const GVariantType *type,
+ *
+ * A reference is taken on @bytes.
+ *
+- * Returns: a new #GVariant with a floating reference
++ * Returns: (transfer none): a new #GVariant with a floating reference
+ *
+ * Since: 2.36
+ */
+--
+cgit v0.9.1
Copied: glib2/repos/testing-x86_64/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch (from rev 183609, glib2/trunk/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch)
===================================================================
--- testing-x86_64/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch (rev 0)
+++ testing-x86_64/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -0,0 +1,132 @@
+From f3b1054b0ebb4912f700e08da0c3d35c30113e79 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Tue, 23 Apr 2013 17:26:48 +0000
+Subject: Partially revert "Merge waitpid() from g_spawn_sync into gmain()"
+
+This partially reverts commit ce0022933c255313e010b27f977f4ae02aad1e7e.
+
+It used to be safe to use g_spawn_sync() from processes that had their
+own SIGCHLD handler because it simply called wait(). When it was
+changed to depend on the GLib child watching infrastructure this meant
+that GLib had to own the SIGCHLD handler.
+
+This caused hangs in at least Pidgin.
+
+The patch contained two other improvements to the child watch code which
+we want to keep, so only revert the changes to gspawn itself.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=698081
+---
+diff --git a/glib/gspawn.c b/glib/gspawn.c
+index 381ed5c..01cedf6 100644
+--- a/glib/gspawn.c
++++ b/glib/gspawn.c
+@@ -47,7 +47,6 @@
+
+ #include "genviron.h"
+ #include "gmem.h"
+-#include "gmain.h"
+ #include "gshell.h"
+ #include "gstring.h"
+ #include "gstrfuncs.h"
+@@ -207,21 +206,6 @@ read_data (GString *str,
+ }
+ }
+
+-typedef struct {
+- GMainLoop *loop;
+- gint *status_p;
+-} SyncWaitpidData;
+-
+-static void
+-on_sync_waitpid (GPid pid,
+- gint status,
+- gpointer user_data)
+-{
+- SyncWaitpidData *data = user_data;
+- *(data->status_p) = status;
+- g_main_loop_quit (data->loop);
+-}
+-
+ /**
+ * g_spawn_sync:
+ * @working_directory: (allow-none): child's current working directory, or %NULL to inherit parent's
+@@ -277,7 +261,6 @@ g_spawn_sync (const gchar *working_directory,
+ GString *errstr = NULL;
+ gboolean failed;
+ gint status;
+- SyncWaitpidData waitpid_data;
+
+ g_return_val_if_fail (argv != NULL, FALSE);
+ g_return_val_if_fail (!(flags & G_SPAWN_DO_NOT_REAP_CHILD), FALSE);
+@@ -410,32 +393,45 @@ g_spawn_sync (const gchar *working_directory,
+ close_and_invalidate (&outpipe);
+ if (errpipe >= 0)
+ close_and_invalidate (&errpipe);
+-
+- /* Now create a temporary main context and loop, with just one
+- * waitpid source. We used to invoke waitpid() directly here, but
+- * this way we unify with the worker thread in gmain.c.
++
++ /* Wait for child to exit, even if we have
++ * an error pending.
+ */
+- {
+- GMainContext *context;
+- GMainLoop *loop;
+- GSource *source;
+-
+- context = g_main_context_new ();
+- loop = g_main_loop_new (context, TRUE);
++ again:
++
++ ret = waitpid (pid, &status, 0);
+
+- waitpid_data.loop = loop;
+- waitpid_data.status_p = &status;
+-
+- source = g_child_watch_source_new (pid);
+- g_source_set_callback (source, (GSourceFunc)on_sync_waitpid, &waitpid_data, NULL);
+- g_source_attach (source, context);
+- g_source_unref (source);
+-
+- g_main_loop_run (loop);
++ if (ret < 0)
++ {
++ if (errno == EINTR)
++ goto again;
++ else if (errno == ECHILD)
++ {
++ if (exit_status)
++ {
++ g_warning ("In call to g_spawn_sync(), exit status of a child process was requested but ECHILD was received by waitpid(). Most likely the process is ignoring SIGCHLD, or some other thread is invoking waitpid() with a nonpositive first argument; either behavior can break applications that use g_spawn_sync either directly or indirectly.");
++ }
++ else
++ {
++ /* We don't need the exit status. */
++ }
++ }
++ else
++ {
++ if (!failed) /* avoid error pileups */
++ {
++ int errsv = errno;
+
+- g_main_context_unref (context);
+- g_main_loop_unref (loop);
+- }
++ failed = TRUE;
++
++ g_set_error (error,
++ G_SPAWN_ERROR,
++ G_SPAWN_ERROR_READ,
++ _("Unexpected error in waitpid() (%s)"),
++ g_strerror (errsv));
++ }
++ }
++ }
+
+ if (failed)
+ {
+--
+cgit v0.9.1
Deleted: testing-x86_64/revert-warn-glib-compile-schemas.patch
===================================================================
--- testing-x86_64/revert-warn-glib-compile-schemas.patch 2013-04-25 11:34:05 UTC (rev 183609)
+++ testing-x86_64/revert-warn-glib-compile-schemas.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -1,33 +0,0 @@
-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/testing-x86_64/revert-warn-glib-compile-schemas.patch (from rev 183609, glib2/trunk/revert-warn-glib-compile-schemas.patch)
===================================================================
--- testing-x86_64/revert-warn-glib-compile-schemas.patch (rev 0)
+++ testing-x86_64/revert-warn-glib-compile-schemas.patch 2013-04-25 11:34:18 UTC (rev 183610)
@@ -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