[arch-commits] Commit in glib2/trunk (PKGBUILD bad-dconf-paths.patch)

[Jan Steffens]

    Date: Saturday, June 3, 2017 @ 14:00:15
  Author: heftig
Revision: 297748

2.52.2+9+g3245eba16-1

Modified:
  glib2/trunk/PKGBUILD
Deleted:
  glib2/trunk/bad-dconf-paths.patch

-----------------------+
 PKGBUILD              |   14 +++++---------
 bad-dconf-paths.patch |   33 ---------------------------------
 2 files changed, 5 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-03 12:08:05 UTC (rev 297747)
+++ PKGBUILD	2017-06-03 14:00:15 UTC (rev 297748)
@@ -3,7 +3,7 @@
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.52.2+1+gb8bd46bc8
+pkgver=2.52.2+9+g3245eba16
 pkgrel=1
 pkgdesc="Low level core library"
 url="http://www.gtk.org/"
@@ -10,17 +10,15 @@
 arch=(i686 x86_64)
 makedepends=(gettext gtk-doc libffi pcre zlib shared-mime-info python libelf git util-linux)
 checkdepends=(desktop-file-utils dbus)
-_commit=b8bd46bc862598db41013f4b56b0d74126e25c52  # glib-2-52
+_commit=3245eba169c439180cc13ed3c76f47298d723031  # glib-2-52
 source=("git+https://git.gnome.org/browse/glib#commit=$_commit"
         glib-compile-schemas.hook
         gio-querymodules.hook
-        skip-broken-timer-test.patch
-        bad-dconf-paths.patch)
+        skip-broken-timer-test.patch)
 sha256sums=('SKIP'
             'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
             '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6'
-            'a39dc8c1c1707053d565d5b198b1f03f7c55b31e11335a1bfdc3f9803b114d5d'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+            'a39dc8c1c1707053d565d5b198b1f03f7c55b31e11335a1bfdc3f9803b114d5d')
 
 pkgver() {
   cd glib
@@ -29,14 +27,12 @@
 
 prepare() {
   cd glib
-  git revert -n e4ce400e8f7f  # https://bugzilla.gnome.org/show_bug.cgi?id=781601
-  git cherry-pick -n 9ba95e25b74a  # https://bugs.archlinux.org/task/53730
+  git revert -n 6560b37450cd  # Noisy glib-compile-schemas
 
   # Rounding error in timer tests?
   # GLib:ERROR:timer.c:38:test_timer_basic: assertion failed (micros == ((guint64)(elapsed * 1e6)) % 1000000): (1 == 0)
   [[ $CARCH == i686 ]] && patch -Np1 -i ../skip-broken-timer-test.patch
 
-  patch -Rp1 -i ../bad-dconf-paths.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 

Deleted: bad-dconf-paths.patch
===================================================================
--- bad-dconf-paths.patch	2017-06-03 12:08:05 UTC (rev 297747)
+++ bad-dconf-paths.patch	2017-06-03 14:00:15 UTC (rev 297748)
@@ -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