[arch-commits] Commit in glib2/repos (20 files)
Jan Steffens
heftig at archlinux.org
Fri Apr 21 23:23:55 UTC 2017
Date: Friday, April 21, 2017 @ 23:23:54
Author: heftig
Revision: 293865
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
glib2/repos/testing-i686/PKGBUILD
(from rev 293864, glib2/trunk/PKGBUILD)
glib2/repos/testing-i686/bad-dconf-paths.patch
(from rev 293864, glib2/trunk/bad-dconf-paths.patch)
glib2/repos/testing-i686/gio-querymodules.hook
(from rev 293864, glib2/trunk/gio-querymodules.hook)
glib2/repos/testing-i686/glib-compile-schemas.hook
(from rev 293864, glib2/trunk/glib-compile-schemas.hook)
glib2/repos/testing-i686/skip-broken-timer-test.patch
(from rev 293864, glib2/trunk/skip-broken-timer-test.patch)
glib2/repos/testing-x86_64/PKGBUILD
(from rev 293864, glib2/trunk/PKGBUILD)
glib2/repos/testing-x86_64/bad-dconf-paths.patch
(from rev 293864, glib2/trunk/bad-dconf-paths.patch)
glib2/repos/testing-x86_64/gio-querymodules.hook
(from rev 293864, glib2/trunk/gio-querymodules.hook)
glib2/repos/testing-x86_64/glib-compile-schemas.hook
(from rev 293864, glib2/trunk/glib-compile-schemas.hook)
glib2/repos/testing-x86_64/skip-broken-timer-test.patch
(from rev 293864, glib2/trunk/skip-broken-timer-test.patch)
Deleted:
glib2/repos/testing-i686/PKGBUILD
glib2/repos/testing-i686/gio-querymodules.hook
glib2/repos/testing-i686/glib-compile-schemas.hook
glib2/repos/testing-i686/revert-warn-glib-compile-schemas.patch
glib2/repos/testing-i686/skip-broken-timer-test.patch
glib2/repos/testing-x86_64/PKGBUILD
glib2/repos/testing-x86_64/gio-querymodules.hook
glib2/repos/testing-x86_64/glib-compile-schemas.hook
glib2/repos/testing-x86_64/revert-warn-glib-compile-schemas.patch
glib2/repos/testing-x86_64/skip-broken-timer-test.patch
-------------------------------------------------------+
/PKGBUILD | 178 ++++++++++++++++
/gio-querymodules.hook | 22 +
/glib-compile-schemas.hook | 24 ++
/skip-broken-timer-test.patch | 24 ++
testing-i686/PKGBUILD | 87 -------
testing-i686/bad-dconf-paths.patch | 33 ++
testing-i686/gio-querymodules.hook | 11
testing-i686/glib-compile-schemas.hook | 12 -
testing-i686/revert-warn-glib-compile-schemas.patch | 33 --
testing-i686/skip-broken-timer-test.patch | 17 -
testing-x86_64/PKGBUILD | 87 -------
testing-x86_64/bad-dconf-paths.patch | 33 ++
testing-x86_64/gio-querymodules.hook | 11
testing-x86_64/glib-compile-schemas.hook | 12 -
testing-x86_64/revert-warn-glib-compile-schemas.patch | 33 --
testing-x86_64/skip-broken-timer-test.patch | 17 -
16 files changed, 314 insertions(+), 320 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-04-21 23:22:32 UTC (rev 293864)
+++ testing-i686/PKGBUILD 2017-04-21 23:23:54 UTC (rev 293865)
@@ -1,87 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=glib2
-pkgname=(glib2 glib2-docs)
-pkgver=2.52.1+2+g2b47c8360
-pkgrel=1
-pkgdesc="Low level core library"
-url="http://www.gtk.org/"
-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
-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)
-sha256sums=('SKIP'
- 'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
- '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6'
- '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
- '4a2c7a65195ede4c5db3e8d5bd810b45a3ec2c4402088994dfd516c974cfbf36')
-
-pkgver() {
- cd glib
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd glib
- patch -Np1 -i ../skip-broken-timer-test.patch
- patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd glib
- ./configure --prefix=/usr --libdir=/usr/lib \
- --sysconfdir=/etc \
- --with-pcre=system \
- --disable-fam \
- --enable-gtk-doc \
- $(check_option debug y && echo --enable-debug=yes)
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-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
-}
-
-package_glib2() {
- depends=(pcre libffi libutil-linux)
- optdepends=('python: for gdbus-codegen and gtester-report'
- 'libelf: gresource inspection tool')
- options=(!emptydirs)
- license=(LGPL)
-
- cd glib
- make DESTDIR="$pkgdir" install
- rm -r "$pkgdir/usr/share/gtk-doc"
-
- # install hooks
- install -d "$pkgdir/usr/share/libalpm/hooks/"
- install -m644 "$srcdir"/{glib-compile-schemas,gio-querymodules}.hook \
- "$pkgdir/usr/share/libalpm/hooks/"
-}
-
-package_glib2-docs() {
- pkgdesc="Documentation for glib2"
- conflicts=(gobject2-docs)
- replaces=(gobject2-docs)
- license=(custom)
- options=(!emptydirs)
-
- cd glib/docs
- make DESTDIR="$pkgdir" install
- rm -r "$pkgdir/usr/share/man"
-
- install -Dm644 reference/COPYING "$pkgdir/usr/share/licenses/glib2-docs/COPYING"
-}
Copied: glib2/repos/testing-i686/PKGBUILD (from rev 293864, glib2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-04-21 23:23:54 UTC (rev 293865)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=glib2
+pkgname=(glib2 glib2-docs)
+pkgver=2.52.1+4+g2eddcef1e
+pkgrel=1
+pkgdesc="Low level core library"
+url="http://www.gtk.org/"
+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=2eddcef1e75711c82719875ca80070eb6eb212ae # 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)
+sha256sums=('SKIP'
+ 'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
+ '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6'
+ 'a39dc8c1c1707053d565d5b198b1f03f7c55b31e11335a1bfdc3f9803b114d5d'
+ '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+
+pkgver() {
+ cd glib
+ git describe --tags | sed 's/-/+/g'
+}
+
+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
+
+ # 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 \
+ --sysconfdir=/etc \
+ --with-pcre=system \
+ --disable-fam \
+ --enable-gtk-doc \
+ $(check_option debug y && echo --enable-debug=yes)
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd glib
+ make check
+}
+
+package_glib2() {
+ depends=(pcre libffi libutil-linux)
+ optdepends=('python: for gdbus-codegen and gtester-report'
+ 'libelf: gresource inspection tool')
+ options=(!emptydirs)
+ license=(LGPL)
+
+ cd glib
+ make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/usr/share/gtk-doc"
+
+ # install hooks
+ install -d "$pkgdir/usr/share/libalpm/hooks/"
+ install -m644 "$srcdir"/{glib-compile-schemas,gio-querymodules}.hook \
+ "$pkgdir/usr/share/libalpm/hooks/"
+}
+
+package_glib2-docs() {
+ pkgdesc="Documentation for glib2"
+ conflicts=(gobject2-docs)
+ replaces=(gobject2-docs)
+ license=(custom)
+ options=(!emptydirs)
+
+ cd glib/docs
+ make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/usr/share/man"
+
+ install -Dm644 reference/COPYING "$pkgdir/usr/share/licenses/glib2-docs/COPYING"
+}
Copied: glib2/repos/testing-i686/bad-dconf-paths.patch (from rev 293864, glib2/trunk/bad-dconf-paths.patch)
===================================================================
--- testing-i686/bad-dconf-paths.patch (rev 0)
+++ testing-i686/bad-dconf-paths.patch 2017-04-21 23:23:54 UTC (rev 293865)
@@ -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-i686/gio-querymodules.hook
===================================================================
--- testing-i686/gio-querymodules.hook 2017-04-21 23:22:32 UTC (rev 293864)
+++ testing-i686/gio-querymodules.hook 2017-04-21 23:23:54 UTC (rev 293865)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gio/modules/*.so
-
-[Action]
-Description = Updating GIO module cache...
-When = PostTransaction
-Exec = /usr/bin/gio-querymodules /usr/lib/gio/modules
Copied: glib2/repos/testing-i686/gio-querymodules.hook (from rev 293864, glib2/trunk/gio-querymodules.hook)
===================================================================
--- testing-i686/gio-querymodules.hook (rev 0)
+++ testing-i686/gio-querymodules.hook 2017-04-21 23:23:54 UTC (rev 293865)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gio/modules/*.so
+
+[Action]
+Description = Updating GIO module cache...
+When = PostTransaction
+Exec = /usr/bin/gio-querymodules /usr/lib/gio/modules
Deleted: testing-i686/glib-compile-schemas.hook
===================================================================
--- testing-i686/glib-compile-schemas.hook 2017-04-21 23:22:32 UTC (rev 293864)
+++ testing-i686/glib-compile-schemas.hook 2017-04-21 23:23:54 UTC (rev 293865)
@@ -1,12 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/glib-2.0/schemas/*.gschema.xml
-Target = usr/share/glib-2.0/schemas/*.gschema.override
-
-[Action]
-Description = Compiling GSettings XML schema files...
-When = PostTransaction
-Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
Copied: glib2/repos/testing-i686/glib-compile-schemas.hook (from rev 293864, glib2/trunk/glib-compile-schemas.hook)
===================================================================
--- testing-i686/glib-compile-schemas.hook (rev 0)
+++ testing-i686/glib-compile-schemas.hook 2017-04-21 23:23:54 UTC (rev 293865)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/glib-2.0/schemas/*.gschema.xml
+Target = usr/share/glib-2.0/schemas/*.gschema.override
+
+[Action]
+Description = Compiling GSettings XML schema files...
+When = PostTransaction
+Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
Deleted: testing-i686/revert-warn-glib-compile-schemas.patch
===================================================================
--- testing-i686/revert-warn-glib-compile-schemas.patch 2017-04-21 23:22:32 UTC (rev 293864)
+++ testing-i686/revert-warn-glib-compile-schemas.patch 2017-04-21 23:23:54 UTC (rev 293865)
@@ -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: testing-i686/skip-broken-timer-test.patch
===================================================================
--- testing-i686/skip-broken-timer-test.patch 2017-04-21 23:22:32 UTC (rev 293864)
+++ testing-i686/skip-broken-timer-test.patch 2017-04-21 23:23:54 UTC (rev 293865)
@@ -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);
-
Copied: glib2/repos/testing-i686/skip-broken-timer-test.patch (from rev 293864, glib2/trunk/skip-broken-timer-test.patch)
===================================================================
--- testing-i686/skip-broken-timer-test.patch (rev 0)
+++ testing-i686/skip-broken-timer-test.patch 2017-04-21 23:23:54 UTC (rev 293865)
@@ -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 \
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-04-21 23:22:32 UTC (rev 293864)
+++ testing-x86_64/PKGBUILD 2017-04-21 23:23:54 UTC (rev 293865)
@@ -1,87 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=glib2
-pkgname=(glib2 glib2-docs)
-pkgver=2.52.1+2+g2b47c8360
-pkgrel=1
-pkgdesc="Low level core library"
-url="http://www.gtk.org/"
-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
-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)
-sha256sums=('SKIP'
- 'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
- '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6'
- '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
- '4a2c7a65195ede4c5db3e8d5bd810b45a3ec2c4402088994dfd516c974cfbf36')
-
-pkgver() {
- cd glib
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd glib
- patch -Np1 -i ../skip-broken-timer-test.patch
- patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd glib
- ./configure --prefix=/usr --libdir=/usr/lib \
- --sysconfdir=/etc \
- --with-pcre=system \
- --disable-fam \
- --enable-gtk-doc \
- $(check_option debug y && echo --enable-debug=yes)
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-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
-}
-
-package_glib2() {
- depends=(pcre libffi libutil-linux)
- optdepends=('python: for gdbus-codegen and gtester-report'
- 'libelf: gresource inspection tool')
- options=(!emptydirs)
- license=(LGPL)
-
- cd glib
- make DESTDIR="$pkgdir" install
- rm -r "$pkgdir/usr/share/gtk-doc"
-
- # install hooks
- install -d "$pkgdir/usr/share/libalpm/hooks/"
- install -m644 "$srcdir"/{glib-compile-schemas,gio-querymodules}.hook \
- "$pkgdir/usr/share/libalpm/hooks/"
-}
-
-package_glib2-docs() {
- pkgdesc="Documentation for glib2"
- conflicts=(gobject2-docs)
- replaces=(gobject2-docs)
- license=(custom)
- options=(!emptydirs)
-
- cd glib/docs
- make DESTDIR="$pkgdir" install
- rm -r "$pkgdir/usr/share/man"
-
- install -Dm644 reference/COPYING "$pkgdir/usr/share/licenses/glib2-docs/COPYING"
-}
Copied: glib2/repos/testing-x86_64/PKGBUILD (from rev 293864, glib2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-04-21 23:23:54 UTC (rev 293865)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=glib2
+pkgname=(glib2 glib2-docs)
+pkgver=2.52.1+4+g2eddcef1e
+pkgrel=1
+pkgdesc="Low level core library"
+url="http://www.gtk.org/"
+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=2eddcef1e75711c82719875ca80070eb6eb212ae # 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)
+sha256sums=('SKIP'
+ 'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
+ '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6'
+ 'a39dc8c1c1707053d565d5b198b1f03f7c55b31e11335a1bfdc3f9803b114d5d'
+ '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+
+pkgver() {
+ cd glib
+ git describe --tags | sed 's/-/+/g'
+}
+
+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
+
+ # 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 \
+ --sysconfdir=/etc \
+ --with-pcre=system \
+ --disable-fam \
+ --enable-gtk-doc \
+ $(check_option debug y && echo --enable-debug=yes)
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ cd glib
+ make check
+}
+
+package_glib2() {
+ depends=(pcre libffi libutil-linux)
+ optdepends=('python: for gdbus-codegen and gtester-report'
+ 'libelf: gresource inspection tool')
+ options=(!emptydirs)
+ license=(LGPL)
+
+ cd glib
+ make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/usr/share/gtk-doc"
+
+ # install hooks
+ install -d "$pkgdir/usr/share/libalpm/hooks/"
+ install -m644 "$srcdir"/{glib-compile-schemas,gio-querymodules}.hook \
+ "$pkgdir/usr/share/libalpm/hooks/"
+}
+
+package_glib2-docs() {
+ pkgdesc="Documentation for glib2"
+ conflicts=(gobject2-docs)
+ replaces=(gobject2-docs)
+ license=(custom)
+ options=(!emptydirs)
+
+ cd glib/docs
+ make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/usr/share/man"
+
+ install -Dm644 reference/COPYING "$pkgdir/usr/share/licenses/glib2-docs/COPYING"
+}
Copied: glib2/repos/testing-x86_64/bad-dconf-paths.patch (from rev 293864, glib2/trunk/bad-dconf-paths.patch)
===================================================================
--- testing-x86_64/bad-dconf-paths.patch (rev 0)
+++ testing-x86_64/bad-dconf-paths.patch 2017-04-21 23:23:54 UTC (rev 293865)
@@ -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/gio-querymodules.hook
===================================================================
--- testing-x86_64/gio-querymodules.hook 2017-04-21 23:22:32 UTC (rev 293864)
+++ testing-x86_64/gio-querymodules.hook 2017-04-21 23:23:54 UTC (rev 293865)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gio/modules/*.so
-
-[Action]
-Description = Updating GIO module cache...
-When = PostTransaction
-Exec = /usr/bin/gio-querymodules /usr/lib/gio/modules
Copied: glib2/repos/testing-x86_64/gio-querymodules.hook (from rev 293864, glib2/trunk/gio-querymodules.hook)
===================================================================
--- testing-x86_64/gio-querymodules.hook (rev 0)
+++ testing-x86_64/gio-querymodules.hook 2017-04-21 23:23:54 UTC (rev 293865)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gio/modules/*.so
+
+[Action]
+Description = Updating GIO module cache...
+When = PostTransaction
+Exec = /usr/bin/gio-querymodules /usr/lib/gio/modules
Deleted: testing-x86_64/glib-compile-schemas.hook
===================================================================
--- testing-x86_64/glib-compile-schemas.hook 2017-04-21 23:22:32 UTC (rev 293864)
+++ testing-x86_64/glib-compile-schemas.hook 2017-04-21 23:23:54 UTC (rev 293865)
@@ -1,12 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/glib-2.0/schemas/*.gschema.xml
-Target = usr/share/glib-2.0/schemas/*.gschema.override
-
-[Action]
-Description = Compiling GSettings XML schema files...
-When = PostTransaction
-Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
Copied: glib2/repos/testing-x86_64/glib-compile-schemas.hook (from rev 293864, glib2/trunk/glib-compile-schemas.hook)
===================================================================
--- testing-x86_64/glib-compile-schemas.hook (rev 0)
+++ testing-x86_64/glib-compile-schemas.hook 2017-04-21 23:23:54 UTC (rev 293865)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/glib-2.0/schemas/*.gschema.xml
+Target = usr/share/glib-2.0/schemas/*.gschema.override
+
+[Action]
+Description = Compiling GSettings XML schema files...
+When = PostTransaction
+Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
Deleted: testing-x86_64/revert-warn-glib-compile-schemas.patch
===================================================================
--- testing-x86_64/revert-warn-glib-compile-schemas.patch 2017-04-21 23:22:32 UTC (rev 293864)
+++ testing-x86_64/revert-warn-glib-compile-schemas.patch 2017-04-21 23:23:54 UTC (rev 293865)
@@ -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: testing-x86_64/skip-broken-timer-test.patch
===================================================================
--- testing-x86_64/skip-broken-timer-test.patch 2017-04-21 23:22:32 UTC (rev 293864)
+++ testing-x86_64/skip-broken-timer-test.patch 2017-04-21 23:23:54 UTC (rev 293865)
@@ -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);
-
Copied: glib2/repos/testing-x86_64/skip-broken-timer-test.patch (from rev 293864, glib2/trunk/skip-broken-timer-test.patch)
===================================================================
--- testing-x86_64/skip-broken-timer-test.patch (rev 0)
+++ testing-x86_64/skip-broken-timer-test.patch 2017-04-21 23:23:54 UTC (rev 293865)
@@ -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