| 1 |
commit: 2609ba9466d268b305cc0626b86587a13eb75d96 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 23 17:35:09 2020 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 23 17:35:53 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2609ba94 |
| 7 |
|
| 8 |
dev-libs/folks: don't require dbusmock without tests being built |
| 9 |
|
| 10 |
The upstream meson-0.53 fix made the dbusmock check actually effective, |
| 11 |
erroring out if not found when bluetooth is enabled. We already have |
| 12 |
a patch downstream to make build of tests conditional, so build on |
| 13 |
top of that to skip the dbusmock check when tests aren't being built. |
| 14 |
|
| 15 |
Fixes: 61a9ee210b2d44c4fa953342504293a89395bef0 |
| 16 |
Closes: https://bugs.gentoo.org/710548 |
| 17 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 18 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 19 |
|
| 20 |
.../folks/files/0.12.1-meson-0.53-compat2.patch | 31 ++++++++++++++++++++++ |
| 21 |
dev-libs/folks/folks-0.12.1-r1.ebuild | 3 ++- |
| 22 |
2 files changed, 33 insertions(+), 1 deletion(-) |
| 23 |
|
| 24 |
diff --git a/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch |
| 25 |
new file mode 100644 |
| 26 |
index 00000000000..40c3ca601f0 |
| 27 |
--- /dev/null |
| 28 |
+++ b/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch |
| 29 |
@@ -0,0 +1,31 @@ |
| 30 |
+From f8a59fb6bf12be06595c94d0b00afed4e1d2f1ee Mon Sep 17 00:00:00 2001 |
| 31 |
+From: Mart Raudsepp <leio@g.o> |
| 32 |
+Date: Sun, 23 Feb 2020 19:28:51 +0200 |
| 33 |
+Subject: [PATCH] meson: Conditionalize dbusmock check to tests being built |
| 34 |
+ |
| 35 |
+--- |
| 36 |
+ meson.build | 2 ++ |
| 37 |
+ 1 file changed, 2 insertions(+) |
| 38 |
+ |
| 39 |
+diff --git a/meson.build b/meson.build |
| 40 |
+index 74320634..64f28d2b 100644 |
| 41 |
+--- a/meson.build |
| 42 |
++++ b/meson.build |
| 43 |
+@@ -131,12 +131,14 @@ endif |
| 44 |
+ if bluez_backend_enabled |
| 45 |
+ libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version) |
| 46 |
+ # Needed for the BlueZ tests |
| 47 |
++ if get_option('test') |
| 48 |
+ pymod = import('python') |
| 49 |
+ py_installation = pymod.find_installation('python3', |
| 50 |
+ modules: [ |
| 51 |
+ 'dbusmock', |
| 52 |
+ ], |
| 53 |
+ ) |
| 54 |
++ endif |
| 55 |
+ endif |
| 56 |
+ |
| 57 |
+ if import_tool_enabled |
| 58 |
+-- |
| 59 |
+2.20.1 |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/dev-libs/folks/folks-0.12.1-r1.ebuild b/dev-libs/folks/folks-0.12.1-r1.ebuild |
| 63 |
index 51ddb26a5e3..633ff457fbe 100644 |
| 64 |
--- a/dev-libs/folks/folks-0.12.1-r1.ebuild |
| 65 |
+++ b/dev-libs/folks/folks-0.12.1-r1.ebuild |
| 66 |
@@ -48,8 +48,9 @@ BDEPEND=" |
| 67 |
|
| 68 |
PATCHES=( |
| 69 |
"${FILESDIR}"/${PV}-conditional-tests.patch # Allow not building lots of test executables when tests are disabled |
| 70 |
- "${FILESDIR}"/${PV}-no-tracker-tests.patch # TODO: Tracker tests fail; this removed them for now |
| 71 |
+ "${FILESDIR}"/${PV}-no-tracker-tests.patch # TODO: Tracker tests fail; this removes them for now |
| 72 |
"${FILESDIR}"/${PV}-meson-0.53-compat.patch # https://gitlab.gnome.org/GNOME/folks/issues/119 |
| 73 |
+ "${FILESDIR}"/${PV}-meson-0.53-compat2.patch # Don't require dbusmock if tests aren't built (with our downstream conditional-tests patch) |
| 74 |
) |
| 75 |
|
| 76 |
src_prepare() { |
Archives