[arch-commits] Commit in glib2/trunk (5 files)

Jan Steffens heftig at archlinux.org
Fri Apr 21 23:22:33 UTC 2017


    Date: Friday, April 21, 2017 @ 23:22:32
  Author: heftig
Revision: 293864

2.52.1+4+g2eddcef1e-1

Added:
  glib2/trunk/bad-dconf-paths.patch
    (from rev 293863, glib2/trunk/revert-warn-glib-compile-schemas.patch)
  glib2/trunk/skip-broken-timer-test.patch
Modified:
  glib2/trunk/PKGBUILD
Deleted:
  glib2/trunk/revert-warn-glib-compile-schemas.patch
  glib2/trunk/skip-broken-timer-test.patch

----------------------------------------+
 PKGBUILD                               |   32 +++++++++++++++---------------
 bad-dconf-paths.patch                  |   33 +++++++++++++++++++++++++++++++
 revert-warn-glib-compile-schemas.patch |   33 -------------------------------
 skip-broken-timer-test.patch           |   29 +++++++++++----------------
 4 files changed, 62 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-21 22:25:02 UTC (rev 293863)
+++ PKGBUILD	2017-04-21 23:22:32 UTC (rev 293864)
@@ -3,7 +3,7 @@
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.52.1+2+g2b47c8360
+pkgver=2.52.1+4+g2eddcef1e
 pkgrel=1
 pkgdesc="Low level core library"
 url="http://www.gtk.org/"
@@ -10,17 +10,17 @@
 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=2b47c8360c70a8455d61fa4bb94ec57b93bf228e  # glib-2-52
+_commit=2eddcef1e75711c82719875ca80070eb6eb212ae  # glib-2-52
 source=("git+https://git.gnome.org/browse/glib#commit=$_commit"
         glib-compile-schemas.hook
         gio-querymodules.hook
-        revert-warn-glib-compile-schemas.patch
-        skip-broken-timer-test.patch)
+        skip-broken-timer-test.patch
+        bad-dconf-paths.patch)
 sha256sums=('SKIP'
             'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
             '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
-            '4a2c7a65195ede4c5db3e8d5bd810b45a3ec2c4402088994dfd516c974cfbf36')
+            'a39dc8c1c1707053d565d5b198b1f03f7c55b31e11335a1bfdc3f9803b114d5d'
+            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
 pkgver() {
   cd glib
@@ -29,11 +29,17 @@
 
 prepare() {
   cd glib
-  patch -Np1 -i ../skip-broken-timer-test.patch
-  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+  git revert -n e4ce400e8f7f  # https://bugzilla.gnome.org/show_bug.cgi?id=781601
+  git cherry-pick -n 9ba95e25b74a  # https://bugs.archlinux.org/task/53730
+
+  # 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
 }
-  
+
 build() {
   cd glib
   ./configure --prefix=/usr --libdir=/usr/lib \
@@ -48,11 +54,7 @@
 
 check() {
   cd glib
-  if ! make check; then
-    # Rounding error in timer tests?
-    # GLib:ERROR:timer.c:38:test_timer_basic: assertion failed (micros == ((guint64)(elapsed * 1e6)) % 1000000): (1 == 0)
-    make check
-  fi
+  make check
 }
 
 package_glib2() {
@@ -78,7 +80,7 @@
   replaces=(gobject2-docs)
   license=(custom)
   options=(!emptydirs)
-  
+
   cd glib/docs
   make DESTDIR="$pkgdir" install
   rm -r "$pkgdir/usr/share/man"

Copied: glib2/trunk/bad-dconf-paths.patch (from rev 293863, glib2/trunk/revert-warn-glib-compile-schemas.patch)
===================================================================
--- bad-dconf-paths.patch	                        (rev 0)
+++ bad-dconf-paths.patch	2017-04-21 23:22:32 UTC (rev 293864)
@@ -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: revert-warn-glib-compile-schemas.patch
===================================================================
--- revert-warn-glib-compile-schemas.patch	2017-04-21 22:25:02 UTC (rev 293863)
+++ revert-warn-glib-compile-schemas.patch	2017-04-21 23:22:32 UTC (rev 293864)
@@ -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

Deleted: skip-broken-timer-test.patch
===================================================================
--- skip-broken-timer-test.patch	2017-04-21 22:25:02 UTC (rev 293863)
+++ skip-broken-timer-test.patch	2017-04-21 23:22:32 UTC (rev 293864)
@@ -1,17 +0,0 @@
-Description: Skip test which performs some unreliable floating point comparisons
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=722604
-
-Index: b/glib/tests/timer.c
-===================================================================
---- a/glib/tests/timer.c
-+++ b/glib/tests/timer.c
-@@ -203,7 +203,7 @@
- {
-   g_test_init (&argc, &argv, NULL);
- 
--  g_test_add_func ("/timer/basic", test_timer_basic);
-+/*  g_test_add_func ("/timer/basic", test_timer_basic);*/
-   g_test_add_func ("/timer/stop", test_timer_stop);
-   g_test_add_func ("/timer/continue", test_timer_continue);
-   g_test_add_func ("/timer/reset", test_timer_reset);
-

Added: skip-broken-timer-test.patch
===================================================================
--- skip-broken-timer-test.patch	                        (rev 0)
+++ skip-broken-timer-test.patch	2017-04-21 23:22:32 UTC (rev 293864)
@@ -0,0 +1,12 @@
+diff --git i/glib/tests/Makefile.am w/glib/tests/Makefile.am
+index 43b11f05da63fa02..37406ecdf17e0094 100644
+--- i/glib/tests/Makefile.am
++++ w/glib/tests/Makefile.am
+@@ -106,7 +106,6 @@ test_programs = \
+ 	test-printf			\
+ 	thread				\
+ 	timeout				\
+-	timer				\
+ 	tree				\
+ 	utf8-performance		\
+ 	utf8-pointer			\



More information about the arch-commits mailing list