diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2020-02-23 19:35:09 +0200 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2020-02-23 19:35:53 +0200 |
| commit | 2609ba9466d268b305cc0626b86587a13eb75d96 (patch) | |
| tree | 91d92eef7bbfad840b0f45c183d050a524fe1059 /dev-libs/folks | |
| parent | sys-fs/snapraid: 11.3 bump; drop old; add myself to maintainers. (diff) | |
| download | gentoo-2609ba9466d268b305cc0626b86587a13eb75d96.tar.gz gentoo-2609ba9466d268b305cc0626b86587a13eb75d96.tar.bz2 gentoo-2609ba9466d268b305cc0626b86587a13eb75d96.zip | |
dev-libs/folks: don't require dbusmock without tests being built
The upstream meson-0.53 fix made the dbusmock check actually effective,
erroring out if not found when bluetooth is enabled. We already have
a patch downstream to make build of tests conditional, so build on
top of that to skip the dbusmock check when tests aren't being built.
Fixes: 61a9ee210b2d44c4fa953342504293a89395bef0
Closes: https://bugs.gentoo.org/710548
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'dev-libs/folks')
| -rw-r--r-- | dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch | 31 | ||||
| -rw-r--r-- | dev-libs/folks/folks-0.12.1-r1.ebuild | 3 |
2 files changed, 33 insertions, 1 deletions
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 new file mode 100644 index 000000000000..40c3ca601f05 --- /dev/null +++ b/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch @@ -0,0 +1,31 @@ +From f8a59fb6bf12be06595c94d0b00afed4e1d2f1ee Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Sun, 23 Feb 2020 19:28:51 +0200 +Subject: [PATCH] meson: Conditionalize dbusmock check to tests being built + +--- + meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/meson.build b/meson.build +index 74320634..64f28d2b 100644 +--- a/meson.build ++++ b/meson.build +@@ -131,12 +131,14 @@ endif + if bluez_backend_enabled + libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version) + # Needed for the BlueZ tests ++ if get_option('test') + pymod = import('python') + py_installation = pymod.find_installation('python3', + modules: [ + 'dbusmock', + ], + ) ++ endif + endif + + if import_tool_enabled +-- +2.20.1 + diff --git a/dev-libs/folks/folks-0.12.1-r1.ebuild b/dev-libs/folks/folks-0.12.1-r1.ebuild index 51ddb26a5e31..633ff457fbe2 100644 --- a/dev-libs/folks/folks-0.12.1-r1.ebuild +++ b/dev-libs/folks/folks-0.12.1-r1.ebuild @@ -48,8 +48,9 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PV}-conditional-tests.patch # Allow not building lots of test executables when tests are disabled - "${FILESDIR}"/${PV}-no-tracker-tests.patch # TODO: Tracker tests fail; this removed them for now + "${FILESDIR}"/${PV}-no-tracker-tests.patch # TODO: Tracker tests fail; this removes them for now "${FILESDIR}"/${PV}-meson-0.53-compat.patch # https://gitlab.gnome.org/GNOME/folks/issues/119 + "${FILESDIR}"/${PV}-meson-0.53-compat2.patch # Don't require dbusmock if tests aren't built (with our downstream conditional-tests patch) ) src_prepare() { |