[arch-commits] Commit in glib2/trunk (2 files)
Jan Steffens
heftig at archlinux.org
Thu Feb 27 22:10:42 UTC 2020
Date: Thursday, February 27, 2020 @ 22:10:41
Author: heftig
Revision: 376333
2.64.0-1
Added:
glib2/trunk/0001-tests-Move-memory_monitor_tests-under-installed_test.patch
Modified:
glib2/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-tests-Move-memory_monitor_tests-under-installed_test.patch | 52 ++++++++++
PKGBUILD | 9 +
2 files changed, 59 insertions(+), 2 deletions(-)
Added: 0001-tests-Move-memory_monitor_tests-under-installed_test.patch
===================================================================
--- 0001-tests-Move-memory_monitor_tests-under-installed_test.patch (rev 0)
+++ 0001-tests-Move-memory_monitor_tests-under-installed_test.patch 2020-02-27 22:10:41 UTC (rev 376333)
@@ -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
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-27 22:07:24 UTC (rev 376332)
+++ PKGBUILD 2020-02-27 22:10:41 UTC (rev 376333)
@@ -3,7 +3,7 @@
pkgbase=glib2
pkgname=(glib2 glib2-docs)
-pkgver=2.62.5
+pkgver=2.64.0
pkgrel=1
pkgdesc="Low level core library"
url="https://wiki.gnome.org/Projects/GLib"
@@ -13,12 +13,14 @@
makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux
meson dbus)
checkdepends=(desktop-file-utils)
-_commit=86c2832f950c389e230ec09c8bf0b92b475f0ee3 # tags/2.62.5^0
+_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')
@@ -32,6 +34,9 @@
# 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() {
More information about the arch-commits
mailing list