[arch-commits] Commit in glib2/repos (6 files)
Jan Steffens
heftig at archlinux.org
Thu Feb 27 22:11:46 UTC 2020
Date: Thursday, February 27, 2020 @ 22:11:46
Author: heftig
Revision: 376335
archrelease: copy trunk to testing-x86_64
Added:
glib2/repos/testing-x86_64/
glib2/repos/testing-x86_64/0001-tests-Move-memory_monitor_tests-under-installed_test.patch
(from rev 376333, glib2/trunk/0001-tests-Move-memory_monitor_tests-under-installed_test.patch)
glib2/repos/testing-x86_64/PKGBUILD
(from rev 376333, glib2/trunk/PKGBUILD)
glib2/repos/testing-x86_64/gio-querymodules.hook
(from rev 376333, glib2/trunk/gio-querymodules.hook)
glib2/repos/testing-x86_64/glib-compile-schemas.hook
(from rev 376333, glib2/trunk/glib-compile-schemas.hook)
glib2/repos/testing-x86_64/noisy-glib-compile-schemas.diff
(from rev 376334, glib2/trunk/noisy-glib-compile-schemas.diff)
-----------------------------------------------------------------+
0001-tests-Move-memory_monitor_tests-under-installed_test.patch | 52 ++++++
PKGBUILD | 85 ++++++++++
gio-querymodules.hook | 11 +
glib-compile-schemas.hook | 12 +
noisy-glib-compile-schemas.diff | 24 ++
5 files changed, 184 insertions(+)
Copied: glib2/repos/testing-x86_64/0001-tests-Move-memory_monitor_tests-under-installed_test.patch (from rev 376333, glib2/trunk/0001-tests-Move-memory_monitor_tests-under-installed_test.patch)
===================================================================
--- testing-x86_64/0001-tests-Move-memory_monitor_tests-under-installed_test.patch (rev 0)
+++ testing-x86_64/0001-tests-Move-memory_monitor_tests-under-installed_test.patch 2020-02-27 22:11:46 UTC (rev 376335)
@@ -0,0 +1,52 @@
+From 9be108136dc5e7ef0143a3ae4338476ffa6377e9 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Thu, 27 Feb 2020 21:13:19 +0100
+Subject: [PATCH] tests: Move memory_monitor_tests under
+ installed_tests_enabled
+
+So they're not installed when the latter is disabled.
+---
+ gio/tests/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/tests/meson.build b/gio/tests/meson.build
+index 695ad1f8f..76e28fc76 100644
+--- a/gio/tests/meson.build
++++ b/gio/tests/meson.build
+@@ -521,32 +521,32 @@ if installed_tests_enabled
+ )
+ install_subdir('static-link', install_dir : installed_tests_execdir)
+ install_data('static-link.py', install_dir : installed_tests_execdir)
+-endif
+
+ memory_monitor_tests = [
+ 'memory-monitor-dbus',
+ 'memory-monitor-portal',
+ ]
+
+ foreach memory_monitor_test : memory_monitor_tests
+ cdata = configuration_data()
+ cdata.set('installed_tests_dir', installed_tests_execdir)
+ cdata.set('program', memory_monitor_test + '.py')
+ configure_file(
+ input: installed_tests_template,
+ output: memory_monitor_test + '.test',
+ install_dir: installed_tests_metadir,
+ configuration: cdata
+ )
+ cdata = configuration_data()
+ cdata.set('libexecdir', join_paths(glib_prefix, get_option('libexecdir')))
+ configure_file(
+ input: memory_monitor_test + '.py.in',
+ output: memory_monitor_test + '.py',
+ install_dir : installed_tests_execdir,
+ configuration: cdata,
+ )
+ endforeach
++endif
+
+ if not meson.is_cross_build() or meson.has_exe_wrapper()
+
+--
+2.25.1
+
Copied: glib2/repos/testing-x86_64/PKGBUILD (from rev 376333, glib2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2020-02-27 22:11:46 UTC (rev 376335)
@@ -0,0 +1,85 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=glib2
+pkgname=(glib2 glib2-docs)
+pkgver=2.64.0
+pkgrel=1
+pkgdesc="Low level core library"
+url="https://wiki.gnome.org/Projects/GLib"
+license=(LGPL2.1)
+arch=(x86_64)
+depends=(pcre libffi libutil-linux zlib)
+makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux
+ meson dbus)
+checkdepends=(desktop-file-utils)
+_commit=369626e3105d688afaa316d89d34e8927a8a0171 # tags/2.64.0^0
+source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
+ noisy-glib-compile-schemas.diff
+ 0001-tests-Move-memory_monitor_tests-under-installed_test.patch
+ glib-compile-schemas.hook gio-querymodules.hook)
+sha256sums=('SKIP'
+ '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
+ '3f7f20c817ef970f9d1bc6606023eca44df5c31dd2334847bc8df2dbcf8e0e43'
+ '64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25'
+ '557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8')
+
+pkgver() {
+ cd glib
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd glib
+
+ # Suppress noise from glib-compile-schemas.hook
+ git apply -3 ../noisy-glib-compile-schemas.diff
+
+ # Clean installed tests
+ git apply -3 ../0001-tests-Move-memory_monitor_tests-under-installed_test.patch
+}
+
+build() {
+ CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
+ arch-meson glib build \
+ -D selinux=disabled \
+ -D man=true \
+ -D gtk_doc=true
+ ninja -C build
+}
+
+check() {
+ meson test -C build --no-suite flaky --print-errorlogs
+}
+
+package_glib2() {
+ depends+=(libmount.so)
+ provides+=(libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
+ libgthread-2.0.so)
+ optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
+ 'libelf: gresource inspection tool')
+
+ DESTDIR="$pkgdir" meson install -C build
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
+
+ python -m compileall -d /usr/share/glib-2.0/codegen \
+ "$pkgdir/usr/share/glib-2.0/codegen"
+ python -O -m compileall -d /usr/share/glib-2.0/codegen \
+ "$pkgdir/usr/share/glib-2.0/codegen"
+
+ # Split docs
+ mv "$pkgdir/usr/share/gtk-doc" "$srcdir"
+}
+
+package_glib2-docs() {
+ pkgdesc="Documentation for GLib"
+ depends=()
+ license+=(custom)
+
+ mkdir -p "$pkgdir/usr/share"
+ mv gtk-doc "$pkgdir/usr/share"
+
+ install -Dt "$pkgdir/usr/share/licenses/glib2-docs" -m644 glib/docs/reference/COPYING
+}
+
+# vim:set sw=2 et:
Copied: glib2/repos/testing-x86_64/gio-querymodules.hook (from rev 376333, glib2/trunk/gio-querymodules.hook)
===================================================================
--- testing-x86_64/gio-querymodules.hook (rev 0)
+++ testing-x86_64/gio-querymodules.hook 2020-02-27 22:11:46 UTC (rev 376335)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+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/glib-compile-schemas.hook (from rev 376333, glib2/trunk/glib-compile-schemas.hook)
===================================================================
--- testing-x86_64/glib-compile-schemas.hook (rev 0)
+++ testing-x86_64/glib-compile-schemas.hook 2020-02-27 22:11:46 UTC (rev 376335)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = Path
+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/noisy-glib-compile-schemas.diff (from rev 376334, glib2/trunk/noisy-glib-compile-schemas.diff)
===================================================================
--- testing-x86_64/noisy-glib-compile-schemas.diff (rev 0)
+++ testing-x86_64/noisy-glib-compile-schemas.diff 2020-02-27 22:11:46 UTC (rev 376335)
@@ -0,0 +1,24 @@
+diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c
+index b8de0907248f6860..130f89b1728f7932 100644
+--- i/gio/glib-compile-schemas.c
++++ w/gio/glib-compile-schemas.c
+@@ -1219,19 +1219,6 @@ 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/")))
+- {
+- gchar *message = NULL;
+- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. "
+- "Paths starting with "
+- "“/apps/”, “/desktop/” or “/system/” are deprecated."),
+- id, path);
+- g_printerr ("%s\n", message);
+- g_free (message);
+- }
+-
+ state->schema_state = schema_state_new (path, gettext_domain,
+ extends, extends_name, list_of);
+
More information about the arch-commits
mailing list