Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libpeas/files/
Date: Tue, 01 Jun 2021 19:02:15
Message-Id: 1622574088.220891c9ec0a4584eb2706f5184f05bd4c806b3e.mattst88@gentoo
1 commit: 220891c9ec0a4584eb2706f5184f05bd4c806b3e
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Tue Jun 1 17:23:20 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 1 19:01:28 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220891c9
7
8 dev-libs/libpeas: remove unused patch
9
10 Package-Manager: Portage-3.0.19, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
13
14 ...-Explicitly-depend-on-the-GIR-and-typelib.patch | 41 ----------------------
15 1 file changed, 41 deletions(-)
16
17 diff --git a/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch b/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch
18 deleted file mode 100644
19 index 55a425c9d51..00000000000
20 --- a/dev-libs/libpeas/files/libpeas-1.28.0-tests-Explicitly-depend-on-the-GIR-and-typelib.patch
21 +++ /dev/null
22 @@ -1,41 +0,0 @@
23 -From 6d053ec0a4108be59f5e30a04ab4e6539e694e53 Mon Sep 17 00:00:00 2001
24 -From: Simon McVittie <smcv@××××××.org>
25 -Date: Fri, 18 Sep 2020 11:31:52 +0100
26 -Subject: [PATCH] tests: Explicitly depend on the GIR and typelib
27 -
28 -In Meson since 0.55.0, having the test executable depend on the GIR
29 -dependency is not enough to ensure that uninstalled GIR and typelib
30 -files are generated: we also need to have the test itself depend on
31 -the GIR build target.
32 -
33 -It is not clear to me whether this is a workaround for a Meson
34 -regression (if what libpeas previously did was meant to work), or a
35 -solution to a libpeas bug (if it was never meant to be guaranteed to
36 -work). For more details see
37 -<https://github.com/mesonbuild/meson/issues/7756>.
38 -
39 -Resolves: https://gitlab.gnome.org/GNOME/libpeas/-/issues/40
40 -Bug-Debian: https://bugs.debian.org/966951
41 ----
42 - tests/libpeas/meson.build | 7 ++++++-
43 - 1 file changed, 6 insertions(+), 1 deletion(-)
44 -
45 -diff --git a/tests/libpeas/meson.build b/tests/libpeas/meson.build
46 -index 32cf5e9..c95190a 100644
47 ---- a/tests/libpeas/meson.build
48 -+++ b/tests/libpeas/meson.build
49 -@@ -53,5 +53,10 @@ foreach test: libpeas_tests_sources
50 - c_args: libpeas_tests_c_args,
51 - )
52 -
53 -- test('test-@0@'.format(test_name), test_exe, env: test_env)
54 -+ test(
55 -+ 'test-@0@'.format(test_name),
56 -+ test_exe,
57 -+ depends: [libintrospection_gir],
58 -+ env: test_env,
59 -+ )
60 - endforeach
61 ---
62 -2.26.2
63 -