[gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/files/, dev-libs/folks/
commit: 2609ba9466d268b305cc0626b86587a13eb75d96
Author: Mart Raudsepp gentoo org>
AuthorDate: Sun Feb 23 17:35:09 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Feb 23 17:35:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2609ba94
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 gentoo.org>
.../folks/files/0.12.1-meson-0.53-compat2.patch| 31 ++
dev-libs/folks/folks-0.12.1-r1.ebuild | 3 ++-
2 files changed, 33 insertions(+), 1 deletion(-)
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 000..40c3ca601f0
--- /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
+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 51ddb26a5e3..633ff457fbe 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() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/files/, dev-libs/folks/
commit: 61a9ee210b2d44c4fa953342504293a89395bef0
Author: Mart Raudsepp gentoo org>
AuthorDate: Sun Feb 23 12:29:50 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Feb 23 12:30:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61a9ee21
dev-libs/folks: fix USE=bluetooth build with meson-0.53
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
.../folks/files/0.12.1-meson-0.53-compat.patch | 47 ++
dev-libs/folks/folks-0.12.1-r1.ebuild | 1 +
2 files changed, 48 insertions(+)
diff --git a/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
b/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
new file mode 100644
index 000..56f9543ba40
--- /dev/null
+++ b/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
@@ -0,0 +1,47 @@
+From 1853567d79024c6ce960d9dc187cff8aaf9a37ce Mon Sep 17 00:00:00 2001
+From: Niels De Graef
+Date: Mon, 3 Feb 2020 08:57:52 +0100
+Subject: [PATCH] meson: Use python.dependency() correctly
+
+From https://github.com/mesonbuild/meson/issues/6470:
+
+> So, to further clarify, passing an argument to
+> py_installation.dependency() should be an error, since this method
+> will only ever return a python dependency (for embedding python
+> itself, etc.) and not dbusmock or anything else.
+
+Fixxes https://gitlab.gnome.org/GNOME/folks/issues/119
+---
+ meson.build | 9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index d5115e28..f3644457 100644
+--- a/meson.build
b/meson.build
+@@ -1,7 +1,7 @@
+ project('folks', [ 'vala', 'c' ],
+ version: '0.13.2',
+ license: 'LGPL2.1+',
+- meson_version: '>= 0.49',
++ meson_version: '>= 0.51',
+ )
+
+ gnome = import('gnome')
+@@ -132,8 +132,11 @@ if bluez_backend_enabled
+ libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
+ # Needed for the BlueZ tests
+ pymod = import('python')
+- py_installation = pymod.find_installation('python3')
+- python_dbusmock = py_installation.dependency('dbusmock')
++ py_installation = pymod.find_installation('python3',
++modules: [
++ 'dbusmock',
++],
++ )
+ 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 65b227ad231..51ddb26a5e3 100644
--- a/dev-libs/folks/folks-0.12.1-r1.ebuild
+++ b/dev-libs/folks/folks-0.12.1-r1.ebuild
@@ -49,6 +49,7 @@ 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}-meson-0.53-compat.patch #
https://gitlab.gnome.org/GNOME/folks/issues/119
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/files/, dev-libs/folks/
commit: b3475527b8a46235bbf4f80d8aa6424a10c4
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat Sep 7 19:38:16 2019 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Sep 7 22:08:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b347
dev-libs/folks: bump to 0.12.1
Closes: https://bugs.gentoo.org/690544
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp gentoo.org>
dev-libs/folks/Manifest| 1 +
.../folks/files/0.12.1-conditional-tests.patch | 40 ++
dev-libs/folks/files/0.12.1-no-tracker-tests.patch | 26 +++
dev-libs/folks/folks-0.12.1.ebuild | 88 ++
4 files changed, 155 insertions(+)
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index d362ae2148b..a14a94a5d96 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1 +1,2 @@
DIST folks-0.11.4.tar.xz 1972272 BLAKE2B
69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f
SHA512
bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
+DIST folks-0.12.1.tar.xz 522688 BLAKE2B
584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39
SHA512
f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
diff --git a/dev-libs/folks/files/0.12.1-conditional-tests.patch
b/dev-libs/folks/files/0.12.1-conditional-tests.patch
new file mode 100644
index 000..cde0847fe14
--- /dev/null
+++ b/dev-libs/folks/files/0.12.1-conditional-tests.patch
@@ -0,0 +1,40 @@
+From 93c03b9582eb1eac21f084decf86ca5f1340dc53 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp
+Date: Sat, 7 Sep 2019 22:16:43 +0300
+Subject: [PATCH] meson: Allow disabling build of tests
+
+---
+ meson.build | 4 +++-
+ meson_options.txt | 1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 91800654..37e6b5c2 100644
+--- a/meson.build
b/meson.build
+@@ -219,7 +219,9 @@ subdir('tools')
+ subdir('po')
+
+ # Tests
+-subdir('tests')
++if get_option('test')
++ subdir('tests')
++endif
+
+ if docs_enabled
+ subdir('docs')
+diff --git a/meson_options.txt b/meson_options.txt
+index 042a72e8..b4552d49 100644
+--- a/meson_options.txt
b/meson_options.txt
+@@ -9,6 +9,7 @@ option('zeitgeist', type: 'boolean', value: false,
description: 'build Zeitgeist
+ option('import_tool', type: 'boolean', value: true, description: 'Enable
building the meta-contact import tool')
+ option('inspect_tool', type: 'boolean', value: true, description: 'Enable
building the data inspection tool')
+ # Test options
++option('test', type: 'boolean', value: true, description: 'Build test
programs')
+ option('installed_tests', type: 'boolean', value: false, description:
'Install test programs')
+ # Docs
+ option('docs', type: 'boolean', value: false, description: 'Enable
documentation generation')
+--
+2.20.1
+
diff --git a/dev-libs/folks/files/0.12.1-no-tracker-tests.patch
b/dev-libs/folks/files/0.12.1-no-tracker-tests.patch
new file mode 100644
index 000..3dbfadf7452
--- /dev/null
+++ b/dev-libs/folks/files/0.12.1-no-tracker-tests.patch
@@ -0,0 +1,26 @@
+From b2b0832cf69560bdf0692d275d49d4ed6e293426 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp
+Date: Sat, 7 Sep 2019 22:26:38 +0300
+Subject: [PATCH] tests: disable failing tracker tests
+
+All tracker tests fail for me, so disable them for now to at least
+continue testing the rest.
+---
+ tests/meson.build | 4
+ 1 file changed, 4 deletions(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 6a7fa29c..2079051b 100644
+--- a/tests/meson.build
b/tests/meson.build
+@@ -43,7 +43,3 @@ endif
+ if eds_backend_enabled
+ subdir('eds')
+ endif
+-
+-if tracker_backend_enabled
+- subdir('tracker')
+-endif
+--
+2.20.1
+
diff --git a/dev-libs/folks/folks-0.12.1.ebuild
b/dev-libs/folks/folks-0.12.1.ebuild
new file mode 100644
index 000..0809549521c
--- /dev/null
+++ b/dev-libs/folks/folks-0.12.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MAX_API_VERSION="0.44" # tests-utils fails to build with newer with
v0.12.1
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://wiki.gnome.org/Projects/Folks;
+
+LICENSE="LGPL-2.1+"
+SLOT="0/25" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+IUSE="bluetooth eds +telepathy test tracker utils"
+REQUIRED_USE="bluetooth? ( eds )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/files/, dev-libs/folks/
commit: 27649a17ab88e3e80fff518d6f5517d006a41ca6
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat Jul 27 11:53:44 2019 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Jul 28 06:42:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27649a17
dev-libs/folks: fix tests compilation with vala:0.42
Closes: https://bugs.gentoo.org/688964
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp gentoo.org>
.../files/0.11.4-vala-0.42-tests-compat.patch | 39 ++
dev-libs/folks/folks-0.11.4-r1.ebuild | 1 +
2 files changed, 40 insertions(+)
diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
b/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
new file mode 100644
index 000..7b453ebf1a9
--- /dev/null
+++ b/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
@@ -0,0 +1,39 @@
+From 600e2d42e6097502ec0c42ab257d08fc0ca7933a Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz
+Date: Wed, 30 May 2018 14:20:27 +0200
+Subject: [PATCH] tests: Use FileAttribute.* enumeration
+
+---
+ tests/folks/avatar-cache.vala | 2 +-
+ tests/folks/object-cache.vala | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/folks/avatar-cache.vala b/tests/folks/avatar-cache.vala
+index d25245c0..ee32e9e4 100644
+--- a/tests/folks/avatar-cache.vala
b/tests/folks/avatar-cache.vala
+@@ -78,7 +78,7 @@ public class AvatarCacheTests : Folks.TestCase
+ {
+ // Delete the files in the directory
+ var enumerator =
+- dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
++ dir.enumerate_children (FileAttribute.STANDARD_NAME,
+ FileQueryInfoFlags.NONE);
+
+ FileInfo? file_info = enumerator.next_file ();
+diff --git a/tests/folks/object-cache.vala b/tests/folks/object-cache.vala
+index 62d208e6..f2a5188d 100644
+--- a/tests/folks/object-cache.vala
b/tests/folks/object-cache.vala
+@@ -108,7 +108,7 @@ public class ObjectCacheTests : Folks.TestCase
+ {
+ // Delete the files in the directory
+ var enumerator =
+- dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
++ dir.enumerate_children (FileAttribute.STANDARD_NAME,
+ FileQueryInfoFlags.NONE);
+
+ FileInfo? file_info = enumerator.next_file ();
+--
+2.21.0
+
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild
b/dev-libs/folks/folks-0.11.4-r1.ebuild
index e3dd9684ea1..1634f53e928 100644
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ b/dev-libs/folks/folks-0.11.4-r1.ebuild
@@ -58,6 +58,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/${PV}-vala-0.42-compat.patch
+ "${FILESDIR}"/${PV}-vala-0.42-tests-compat.patch
)
src_prepare() {
