Date: Wednesday, March 11, 2020 @ 13:36:22 Author: heftig Revision: 594208
2.64.1-1 Modified: lib32-glib2/trunk/PKGBUILD Deleted: lib32-glib2/trunk/0001-tests-Move-memory_monitor_tests-under-installed_test.patch -----------------------------------------------------------------+ 0001-tests-Move-memory_monitor_tests-under-installed_test.patch | 52 ---------- PKGBUILD | 9 - 2 files changed, 2 insertions(+), 59 deletions(-) Deleted: 0001-tests-Move-memory_monitor_tests-under-installed_test.patch =================================================================== --- 0001-tests-Move-memory_monitor_tests-under-installed_test.patch 2020-03-11 13:35:28 UTC (rev 594207) +++ 0001-tests-Move-memory_monitor_tests-under-installed_test.patch 2020-03-11 13:36:22 UTC (rev 594208) @@ -1,52 +0,0 @@ -From 9be108136dc5e7ef0143a3ae4338476ffa6377e9 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -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-03-11 13:35:28 UTC (rev 594207) +++ PKGBUILD 2020-03-11 13:36:22 UTC (rev 594208) @@ -3,7 +3,7 @@ # Contributor: Mikko Seppälä <[email protected]> pkgname=lib32-glib2 -pkgver=2.64.0 +pkgver=2.64.1 pkgrel=1 pkgdesc="Low level core library (32-bit)" url="https://wiki.gnome.org/Projects/GLib"; @@ -13,14 +13,12 @@ makedepends=(gettext gtk-doc shared-mime-info python lib32-libelf git util-linux meson lib32-dbus) checkdepends=(desktop-file-utils lib32-glib2) -_commit=369626e3105d688afaa316d89d34e8927a8a0171 # tags/2.64.0^0 +_commit=24d272511c7ae8bb4c46dce0b0c67eca8d2ca3e5 # tags/2.64.1^0 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"; multilib.diff - 0001-tests-Move-memory_monitor_tests-under-installed_test.patch gio-querymodules-32.hook) sha256sums=('SKIP' '2611ec4c97346c3c4eea61786ee20c801207135a9d52a771f5f340b41bf69fbc' - '3f7f20c817ef970f9d1bc6606023eca44df5c31dd2334847bc8df2dbcf8e0e43' 'c37b2777d6c7b9d2eb6003d8bdb72175f889013bc4d582b3f7a12fc7419a2d6d') pkgver() { @@ -33,9 +31,6 @@ # Test suite workaround git apply -3 ../multilib.diff - - # Clean installed tests - git apply -3 ../0001-tests-Move-memory_monitor_tests-under-installed_test.patch } build() {
