* [gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/, dev-libs/folks/files/
@ 2019-02-24 9:31 Mart Raudsepp
0 siblings, 0 replies; 8+ messages in thread
From: Mart Raudsepp @ 2019-02-24 9:31 UTC (permalink / raw
To: gentoo-commits
commit: 74532d57375250a9f3e1b71bbe825cc273f741c6
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 24 09:28:06 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb 24 09:28:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74532d57
dev-libs/folks: fix compatibility with vala-0.42+
Closes: https://bugs.gentoo.org/678384
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-libs/folks/files/0.11.4-vala-0.42-compat.patch | 32 ++++++++++++++++++++++
dev-libs/folks/folks-0.11.4-r1.ebuild | 5 +++-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
new file mode 100644
index 00000000000..21b0e44ab96
--- /dev/null
+++ b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
@@ -0,0 +1,32 @@
+From 6a5c9e7e8daf4e1361709a75719c17c8c28a6c4b Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Fri, 23 Mar 2018 17:55:11 +0100
+Subject: [PATCH] inspect: Adapt to binding change of
+ Signal.add_emission_hook() in vala 0.41
+
+https://git.gnome.org/browse/vala/commit/?id=1d4db9f276c2593f072313864c743c6dd16acf35
+
+Reviewed-by: Philip Withnall <withnall@endlessm.com>
+---
+ tools/inspect/signal-manager.vala | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tools/inspect/signal-manager.vala b/tools/inspect/signal-manager.vala
+index 4d1b6480..7c5b17a0 100644
+--- a/tools/inspect/signal-manager.vala
++++ b/tools/inspect/signal-manager.vala
+@@ -430,7 +430,11 @@ public class Folks.Inspect.SignalManager : Object
+ return false;
+
+ ulong hook_id = Signal.add_emission_hook (signal_id,
++#if VALA_0_42
++ detail_quark, this.emission_hook_cb);
++#else
+ detail_quark, this.emission_hook_cb, null);
++#endif
+
+ /* Store the hook ID so we can list or remove it later */
+ HashMap<uint, ulong> hook_ids =
+--
+2.18.1
+
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
index 9e8680df222..9b5eebac778 100644
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ b/dev-libs/folks/folks-0.11.4-r1.ebuild
@@ -4,7 +4,6 @@
EAPI=6
GNOME2_LA_PUNT="yes"
VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.40"
inherit gnome2 vala virtualx
@@ -57,6 +56,10 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/glib-2.40:2 ) )
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-vala-0.42-compat.patch
+)
+
src_prepare() {
# Force re-generation of introspection files, otherwise it does not match installed libs
find -name "*.vala" -exec touch {} \; || die
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/, dev-libs/folks/files/
@ 2019-12-22 20:47 Mart Raudsepp
0 siblings, 0 replies; 8+ messages in thread
From: Mart Raudsepp @ 2019-12-22 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 2da4596d8383d9222cc494f0ff966c3e1b21ac1f
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 22 20:40:55 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 20:46:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da4596d
dev-libs/folks: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-libs/folks/Manifest | 1 -
dev-libs/folks/files/0.11.4-vala-0.42-compat.patch | 32 --------
.../files/0.11.4-vala-0.42-tests-compat.patch | 39 ---------
dev-libs/folks/folks-0.11.4-r1.ebuild | 94 ----------------------
4 files changed, 166 deletions(-)
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index a14a94a5d96..499f5bcc9ef 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,2 +1 @@
-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.11.4-vala-0.42-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
deleted file mode 100644
index 21b0e44ab96..00000000000
--- a/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6a5c9e7e8daf4e1361709a75719c17c8c28a6c4b Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Fri, 23 Mar 2018 17:55:11 +0100
-Subject: [PATCH] inspect: Adapt to binding change of
- Signal.add_emission_hook() in vala 0.41
-
-https://git.gnome.org/browse/vala/commit/?id=1d4db9f276c2593f072313864c743c6dd16acf35
-
-Reviewed-by: Philip Withnall <withnall@endlessm.com>
----
- tools/inspect/signal-manager.vala | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/inspect/signal-manager.vala b/tools/inspect/signal-manager.vala
-index 4d1b6480..7c5b17a0 100644
---- a/tools/inspect/signal-manager.vala
-+++ b/tools/inspect/signal-manager.vala
-@@ -430,7 +430,11 @@ public class Folks.Inspect.SignalManager : Object
- return false;
-
- ulong hook_id = Signal.add_emission_hook (signal_id,
-+#if VALA_0_42
-+ detail_quark, this.emission_hook_cb);
-+#else
- detail_quark, this.emission_hook_cb, null);
-+#endif
-
- /* Store the hook ID so we can list or remove it later */
- HashMap<uint, ulong> hook_ids =
---
-2.18.1
-
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
deleted file mode 100644
index 7b453ebf1a9..00000000000
--- a/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 600e2d42e6097502ec0c42ab257d08fc0ca7933a Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-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
deleted file mode 100644
index 01e0bbbfc3f..00000000000
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.42"
-
-inherit gnome2 vala virtualx
-
-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"
-
-# TODO: --enable-profiling
-# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
-IUSE="bluetooth debug eds +telepathy test tracker utils"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="bluetooth? ( eds )"
-
-COMMON_DEPEND="
- $(vala_depend)
- >=dev-libs/glib-2.40:2
- dev-libs/dbus-glib
- >=dev-libs/gobject-introspection-1.30:=
- >=dev-libs/libgee-0.10:0.8[introspection]
- dev-libs/libxml2
- sys-libs/ncurses:0=
- sys-libs/readline:0=
-
- bluetooth? ( >=net-wireless/bluez-5 )
- eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
- telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
- tracker? ( >=app-misc/tracker-1:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${COMMON_DEPEND}
- net-im/telepathy-mission-control
-"
-# folks socialweb backend requires that libsocialweb be built with USE=vala,
-# even when building folks with --disable-vala.
-#
-# FIXME:
-# test? ( bluetooth? ( dbusmock is missing in the tree ) )
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.50.0
- sys-devel/gettext
- virtual/pkgconfig
-
- test? (
- sys-apps/dbus
- bluetooth? (
- >=gnome-extra/evolution-data-server-3.9.1
- >=dev-libs/glib-2.40:2 ) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-vala-0.42-compat.patch
- "${FILESDIR}"/${PV}-vala-0.42-tests-compat.patch
-)
-
-src_prepare() {
- # Force re-generation of introspection files, otherwise it does not match installed libs
- find -name "*.vala" -exec touch {} \; || die
-
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # Rebuilding docs needs valadoc, which has no release
- gnome2_src_configure \
- $(use_enable bluetooth bluez-backend) \
- $(use_enable debug) \
- $(use_enable eds eds-backend) \
- $(use_enable eds ofono-backend) \
- $(use_enable telepathy telepathy-backend) \
- $(use_enable tracker tracker-backend) \
- $(use_enable utils inspect-tool) \
- $(use_enable test modular-tests) \
- --enable-vala \
- --enable-import-tool \
- --disable-docs \
- --disable-fatal-warnings \
- --disable-libsocialweb-backend
-}
-
-src_test() {
- dbus-launch virtx emake check
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/, dev-libs/folks/files/
@ 2020-03-01 16:18 Mart Raudsepp
0 siblings, 0 replies; 8+ messages in thread
From: Mart Raudsepp @ 2020-03-01 16:18 UTC (permalink / raw
To: gentoo-commits
commit: d3644542d9a1733f4d9da11f05084ea9ae5b6396
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 1 08:48:10 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Mar 1 16:17:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3644542
dev-libs/folks: bump to 0.13.1
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-libs/folks/Manifest | 1 +
.../folks/files/0.13.1-meson-0.53-compat.patch | 31 ++++++++
dev-libs/folks/folks-0.13.1.ebuild | 83 ++++++++++++++++++++++
3 files changed, 115 insertions(+)
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 499f5bcc9ef..7b6fbc09eb5 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1 +1,2 @@
DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
+DIST folks-0.13.1.tar.xz 515584 BLAKE2B fe4e368e60dd41a72f449f130993eb7b8792b2a38218ff7117a8e5ec192d53d2b8f5ab09a2318267cf2fd7a717048b8715289b2f411c59846c6c98235ec32149 SHA512 b134172077bed1655cd7f24b1402ed347d405b22114c33d6638040a5e475632ea33cde898a08fc143eaefc7057d4b6dccceac7e797e1976fdf88c58764818afe
diff --git a/dev-libs/folks/files/0.13.1-meson-0.53-compat.patch b/dev-libs/folks/files/0.13.1-meson-0.53-compat.patch
new file mode 100644
index 00000000000..a31a5c697e2
--- /dev/null
+++ b/dev-libs/folks/files/0.13.1-meson-0.53-compat.patch
@@ -0,0 +1,31 @@
+From c973f2910322a2b6cfae210730bfd6d3d8259e01 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 1 Mar 2020 10:41:30 +0200
+Subject: [PATCH] meson: Disable unused dbusmock check as tests are commented
+ out
+
+This avoids issues with meson-0.53 like commit 1853567d79024, but
+by just dropping the check, because the 0.13.1 release had tests
+commented out fully anyhow.
+---
+ meson.build | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 8d09149e..8f52bb7e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -123,10 +123,6 @@ endif
+
+ 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')
+ endif
+
+ if import_tool_enabled
+--
+2.20.1
+
diff --git a/dev-libs/folks/folks-0.13.1.ebuild b/dev-libs/folks/folks-0.13.1.ebuild
new file mode 100644
index 00000000000..600f6208d59
--- /dev/null
+++ b/dev-libs/folks/folks-0.13.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 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 tracker utils"
+REQUIRED_USE="bluetooth? ( eds )"
+RESTRICT="test"
+
+DEPEND="
+ >=dev-libs/glib-2.44:2
+ >=dev-libs/libgee-0.10:0.8[introspection]
+ >=dev-libs/gobject-introspection-1.54:=
+ telepathy? (
+ >=net-libs/telepathy-glib-0.19.9
+ dev-libs/dbus-glib
+ )
+ tracker? ( app-misc/tracker:0/2.0 )
+ eds? ( >=gnome-extra/evolution-data-server-3.33.2:= )
+ dev-libs/libxml2:2
+ utils? ( sys-libs/readline:0= )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${DEPEND}
+ bluetooth? ( >=net-wireless/bluez-5[obex] )
+ telepathy? ( net-im/telepathy-mission-control )
+"
+BDEPEND="
+ >=dev-util/meson-0.49
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ $(vala_depend)
+ telepathy? ( net-libs/telepathy-glib[vala] )
+ eds? ( gnome-extra/evolution-data-server[vala] )
+"
+
+PATCHES=(
+ # Alternative to https://gitlab.gnome.org/GNOME/folks/issues/119 as tests are commented out in 0.13.1 release
+ "${FILESDIR}"/${PV}-meson-0.53-compat.patch
+)
+
+src_prepare() {
+ vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use bluetooth bluez_backend)
+ $(meson_use eds eds_backend)
+ $(meson_use eds ofono_backend)
+ $(meson_use telepathy telepathy_backend)
+ $(meson_use tracker tracker_backend)
+ -Dzeitgeist=false # last rited package
+ -Dimport_tool=true
+ $(meson_use utils inspect_tool)
+ -Dinstalled_tests=false
+ -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/, dev-libs/folks/files/
@ 2020-04-20 20:30 Mart Raudsepp
0 siblings, 0 replies; 8+ messages in thread
From: Mart Raudsepp @ 2020-04-20 20:30 UTC (permalink / raw
To: gentoo-commits
commit: dc3f289f33ded05752ef49e0f5186e0ed0e6e531
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 20:24:06 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 20:24:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3f289f
dev-libs/folks: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-libs/folks/Manifest | 1 -
.../folks/files/0.12.1-conditional-tests.patch | 40 ----------
.../folks/files/0.12.1-meson-0.53-compat.patch | 47 -----------
.../folks/files/0.12.1-meson-0.53-compat2.patch | 31 --------
dev-libs/folks/files/0.12.1-no-tracker-tests.patch | 26 -------
dev-libs/folks/folks-0.12.1-r1.ebuild | 89 ---------------------
dev-libs/folks/folks-0.12.1.ebuild | 90 ----------------------
7 files changed, 324 deletions(-)
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 7b6fbc09eb5..08bba6a984a 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,2 +1 @@
-DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
DIST folks-0.13.1.tar.xz 515584 BLAKE2B fe4e368e60dd41a72f449f130993eb7b8792b2a38218ff7117a8e5ec192d53d2b8f5ab09a2318267cf2fd7a717048b8715289b2f411c59846c6c98235ec32149 SHA512 b134172077bed1655cd7f24b1402ed347d405b22114c33d6638040a5e475632ea33cde898a08fc143eaefc7057d4b6dccceac7e797e1976fdf88c58764818afe
diff --git a/dev-libs/folks/files/0.12.1-conditional-tests.patch b/dev-libs/folks/files/0.12.1-conditional-tests.patch
deleted file mode 100644
index cde0847fe14..00000000000
--- a/dev-libs/folks/files/0.12.1-conditional-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 93c03b9582eb1eac21f084decf86ca5f1340dc53 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-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-meson-0.53-compat.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
deleted file mode 100644
index 56f9543ba40..00000000000
--- a/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1853567d79024c6ce960d9dc187cff8aaf9a37ce Mon Sep 17 00:00:00 2001
-From: Niels De Graef <nielsdegraef@gmail.com>
-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/files/0.12.1-meson-0.53-compat2.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch
deleted file mode 100644
index 40c3ca601f0..00000000000
--- a/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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/files/0.12.1-no-tracker-tests.patch b/dev-libs/folks/files/0.12.1-no-tracker-tests.patch
deleted file mode 100644
index 3dbfadf7452..00000000000
--- a/dev-libs/folks/files/0.12.1-no-tracker-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b2b0832cf69560bdf0692d275d49d4ed6e293426 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-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-r1.ebuild b/dev-libs/folks/folks-0.12.1-r1.ebuild
deleted file mode 100644
index 3ac62a655ba..00000000000
--- a/dev-libs/folks/folks-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 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="
- >=dev-libs/glib-2.44:2
- dev-libs/dbus-glib
- >=dev-libs/libgee-0.10:0.8[introspection]
- >=dev-libs/gobject-introspection-1.54:=
- telepathy? ( >=net-libs/telepathy-glib-0.19.9 )
- tracker? ( app-misc/tracker:0/2.0 )
- eds? ( >=gnome-extra/evolution-data-server-3.13.90:=
- <gnome-extra/evolution-data-server-3.33
- )
- dev-libs/libxml2:2
- utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
- bluetooth? ( >=net-wireless/bluez-5[obex] )
- telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
- >=dev-util/meson-0.49
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? ( sys-apps/dbus
- bluetooth? ( dev-python/dbusmock ) )
- $(vala_depend)
- telepathy? ( net-libs/telepathy-glib[vala] )
- eds? ( gnome-extra/evolution-data-server[vala] )
-"
-
-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 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() {
- vala_src_prepare
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use bluetooth bluez_backend)
- $(meson_use eds eds_backend)
- -Dlibsocialweb_backend=false # not packaged
- $(meson_use eds ofono_backend)
- $(meson_use telepathy telepathy_backend)
- $(meson_use tracker tracker_backend)
- -Dzeitgeist=false # last rited package
- -Dimport_tool=true
- $(meson_use utils inspect_tool)
- $(meson_use test)
- -Dinstalled_tests=false
- -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/dev-libs/folks/folks-0.12.1.ebuild b/dev-libs/folks/folks-0.12.1.ebuild
deleted file mode 100644
index 95be628d2bc..00000000000
--- a/dev-libs/folks/folks-0.12.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 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="
- $(vala_depend)
- >=dev-libs/glib-2.44:2
- dev-libs/dbus-glib
- >=dev-libs/libgee-0.10:0.8[introspection]
- >=dev-libs/gobject-introspection-1.54:=
- telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
- tracker? ( app-misc/tracker:0/2.0 )
- eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala]
- <gnome-extra/evolution-data-server-3.33
- )
- dev-libs/libxml2:2
- utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
- bluetooth? ( >=net-wireless/bluez-5[obex] )
- telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
- >=dev-util/meson-0.49
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-# FIXME:
-# test? ( bluetooth? ( dbusmock is missing in the tree ) )
-DEPEND="${COMMON_DEPEND}
- test? ( sys-apps/dbus
- bluetooth? ( dev-python/dbusmock ) )
-"
-
-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
-)
-
-src_prepare() {
- vala_src_prepare
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use bluetooth bluez_backend)
- $(meson_use eds eds_backend)
- -Dlibsocialweb_backend=false # not packaged
- $(meson_use eds ofono_backend)
- $(meson_use telepathy telepathy_backend)
- $(meson_use tracker tracker_backend)
- -Dzeitgeist=false # last rited package
- -Dimport_tool=true
- $(meson_use utils inspect_tool)
- $(meson_use test)
- -Dinstalled_tests=false
- -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/, dev-libs/folks/files/
@ 2020-08-23 10:58 Mart Raudsepp
0 siblings, 0 replies; 8+ messages in thread
From: Mart Raudsepp @ 2020-08-23 10:58 UTC (permalink / raw
To: gentoo-commits
commit: 33d8a674f9a97a211f42ac363dd14fd8060faa3d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 10:55:01 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 10:55:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d8a674
dev-libs/folks: bump to 0.14.0, re-enable tests
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-libs/folks/Manifest | 1 +
.../folks/files/0.14.0-conditional-tests.patch | 72 +++++++++++++++
dev-libs/folks/folks-0.14.0.ebuild | 100 +++++++++++++++++++++
3 files changed, 173 insertions(+)
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 08bba6a984a..cbb6cbc95cc 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1 +1,2 @@
DIST folks-0.13.1.tar.xz 515584 BLAKE2B fe4e368e60dd41a72f449f130993eb7b8792b2a38218ff7117a8e5ec192d53d2b8f5ab09a2318267cf2fd7a717048b8715289b2f411c59846c6c98235ec32149 SHA512 b134172077bed1655cd7f24b1402ed347d405b22114c33d6638040a5e475632ea33cde898a08fc143eaefc7057d4b6dccceac7e797e1976fdf88c58764818afe
+DIST folks-0.14.0.tar.xz 520924 BLAKE2B 3154e0a7e6fe8c60aa81f4772af2b9d09b88785187c87e93869f668af46549383866cfa2e50d3d29009d0acb77c26cd852c7c9a3c6188ff3e5ef53c06b11b781 SHA512 94dc025668ac34df203ea351430bf82dddb4e275d936e2b959a1b9a4cf0fff0218a4baa7d3a89c152a2cb21a94250d731c8e7470d50ac4b658fbe1448974a69e
diff --git a/dev-libs/folks/files/0.14.0-conditional-tests.patch b/dev-libs/folks/files/0.14.0-conditional-tests.patch
new file mode 100644
index 00000000000..2c64ecf6610
--- /dev/null
+++ b/dev-libs/folks/files/0.14.0-conditional-tests.patch
@@ -0,0 +1,72 @@
+From b9e27e284c481e876370e2eb73f95d0953fb9cda Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 23 Aug 2020 11:49:44 +0300
+Subject: [PATCH] meson: Allow disabling build of tests
+
+Fixes https://gitlab.gnome.org/GNOME/folks/-/issues/121
+---
+ meson.build | 21 +++++++++++++--------
+ meson_options.txt | 1 +
+ 2 files changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 53d7dcc6..123edb5c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -54,6 +54,7 @@ folks_backend_dir = get_option('libdir') / 'folks' / '@0@'.format(folks_module_v
+ bluez_backend_enabled = get_option('bluez_backend')
+ docs_enabled = get_option('docs')
+ eds_backend_enabled = get_option('eds_backend')
++tests_enabled = get_option('tests')
+ installed_tests_enabled = get_option('installed_tests')
+ ofono_backend_enabled = get_option('ofono_backend')
+ telepathy_backend_enabled = get_option('telepathy_backend')
+@@ -130,13 +131,15 @@ endif
+
+ 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',
+- modules: [
+- 'dbusmock',
+- ],
+- )
++ if tests_enabled
++ # Needed for the BlueZ tests
++ pymod = import('python')
++ py_installation = pymod.find_installation('python3',
++ modules: [
++ 'dbusmock',
++ ],
++ )
++ endif
+ endif
+
+ if import_tool_enabled
+@@ -233,7 +236,9 @@ subdir('tools')
+ subdir('po')
+
+ # Tests
+-subdir('tests')
++if tests_enabled
++ subdir('tests')
++endif
+
+ if docs_enabled
+ subdir('docs')
+diff --git a/meson_options.txt b/meson_options.txt
+index 43cd586a..62a9603c 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -11,6 +11,7 @@ option('inspect_tool', type: 'boolean', value: true, description: 'Enable buildi
+ # Profiling
+ option('profiling', type: 'boolean', value: false, description: 'Enable profiling code')
+ # Test options
++option('tests', type: 'boolean', value: true, description: 'Build tests 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/folks-0.14.0.ebuild b/dev-libs/folks/folks-0.14.0.ebuild
new file mode 100644
index 00000000000..3da8c1c10c3
--- /dev/null
+++ b/dev-libs/folks/folks-0.14.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MAX_API_VERSION="0.48"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 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="
+ >=dev-libs/glib-2.44:2
+ >=dev-libs/libgee-0.10:0.8[introspection]
+ >=dev-libs/gobject-introspection-1.54:=
+ telepathy? (
+ >=net-libs/telepathy-glib-0.19.9
+ dev-libs/dbus-glib
+ )
+ tracker? ( app-misc/tracker:0/2.0 )
+ eds? ( >=gnome-extra/evolution-data-server-3.33.2:= )
+ dev-libs/libxml2:2
+ utils? ( sys-libs/readline:0= )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${DEPEND}
+ bluetooth? ( >=net-wireless/bluez-5[obex] )
+ telepathy? ( net-im/telepathy-mission-control )
+"
+BDEPEND="
+ >=dev-util/meson-0.49
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ $(vala_depend)
+ telepathy? ( net-libs/telepathy-glib[vala] )
+ eds? ( gnome-extra/evolution-data-server[vala] )
+ test? ( sys-apps/dbus
+ ${PYTHON_DEPS}
+ bluetooth? ( $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-conditional-tests.patch
+)
+
+python_check_deps() {
+ if use test && use bluetooth; then
+ has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+ fi
+}
+
+pkg_setup() {
+ use test && use bluetooth && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ vala_src_prepare
+ xdg_src_prepare
+ # TODO: All tracker tests fail with SIGTRAP for some reason - investigate
+ sed -e '/subdir.*tracker/d' -i tests/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use bluetooth bluez_backend)
+ $(meson_use eds eds_backend)
+ $(meson_use eds ofono_backend)
+ $(meson_use telepathy telepathy_backend)
+ $(meson_use tracker tracker_backend)
+ -Dzeitgeist=false # last rited package
+ -Dimport_tool=true
+ $(meson_use utils inspect_tool)
+ $(meson_use test tests)
+ -Dinstalled_tests=false
+ -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/, dev-libs/folks/files/
@ 2024-01-30 5:10 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-01-30 5:10 UTC (permalink / raw
To: gentoo-commits
commit: 02c6e8f75e84190fe4d806aae1146c2534b51ba8
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Jan 15 19:46:03 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 05:09:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c6e8f7
dev-libs/folks: Apply MR to fix broken implicit-function-declaration
Modern C porting makes this an error.
https://gitlab.gnome.org/GNOME/folks/-/merge_requests/68
Closes: https://bugs.gentoo.org/920098
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../folks/files/folks-0.15.6-implicit-decl.patch | 61 ++++++++++++
dev-libs/folks/folks-0.15.6-r1.ebuild | 102 +++++++++++++++++++++
2 files changed, 163 insertions(+)
diff --git a/dev-libs/folks/files/folks-0.15.6-implicit-decl.patch b/dev-libs/folks/files/folks-0.15.6-implicit-decl.patch
new file mode 100644
index 000000000000..f61d655343e4
--- /dev/null
+++ b/dev-libs/folks/files/folks-0.15.6-implicit-decl.patch
@@ -0,0 +1,61 @@
+From 127bacf86b7ef639c37dd07afc0bf848c005c3c2 Mon Sep 17 00:00:00 2001
+From: Mohammed Anas <triallax@tutanota.com>
+Date: Sun, 14 Jan 2024 03:27:31 +0000
+Subject: [PATCH] build: add missing API declaration -include to dummy and EDS
+ backends
+
+In 7a9c8133468c1f8eb7fbb0e68a6a7e061b9452fb, the original
+`-include redeclare-internal-api.h` was added for autotools. It is
+necessary due to vala internals that require guaranteeing a private
+ABI's prototype is available when compiling folks, even though vala
+doesn't generate that prototype.
+
+During the port to meson, this `-include` was dropped.
+
+Without it, `-Werror=implicit-function-declaration` will cause folks to
+fail to compile. Implicit function declarations are a terrible feature
+-- they were part of c89, but c99 removed them without a deprecation
+because they were too dangerous to use, notable in a language that
+doesn't like to remove features even *with* a deprecation.
+
+For over two decades, compilers have, by default, allowed this invalid C
+anyways, on the grounds that it commonly existed, but modern compilers
+are finally starting to enforce this. It will become a fatal error by
+default in gcc 14, and clang 16.
+
+Folks got this right all the way back in 2013; it disappeared by
+accident. Let's restore it as originally intended.
+---
+Upstream: https://gitlab.gnome.org/GNOME/folks/-/merge_requests/68
+
+ backends/dummy/lib/meson.build | 1 +
+ backends/eds/lib/meson.build | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/backends/dummy/lib/meson.build b/backends/dummy/lib/meson.build
+index 32448f35..eacc0e7a 100644
+--- a/backends/dummy/lib/meson.build
++++ b/backends/dummy/lib/meson.build
+@@ -23,6 +23,7 @@ dummy_backendlib_vala_flags = [
+
+ dummy_backendlib_c_flags = [
+ '-include', 'config.h',
++ '-include', 'folks/redeclare-internal-api.h',
+ '-DBACKEND_NAME="@0@"'.format(dummy_backend_name),
+ '-DG_LOG_DOMAIN="@0@"'.format(dummy_backend_name),
+ ]
+diff --git a/backends/eds/lib/meson.build b/backends/eds/lib/meson.build
+index 3e3db84c..68d803b3 100644
+--- a/backends/eds/lib/meson.build
++++ b/backends/eds/lib/meson.build
+@@ -40,6 +40,7 @@ endif
+
+ eds_backendlib_c_flags = [
+ '-include', 'config.h',
++ '-include', 'folks/redeclare-internal-api.h',
+ '-DBACKEND_NAME="@0@"'.format(eds_backend_name),
+ '-DG_LOG_DOMAIN="@0@"'.format(eds_backend_name),
+ ]
+--
+GitLab
+
diff --git a/dev-libs/folks/folks-0.15.6-r1.ebuild b/dev-libs/folks/folks-0.15.6-r1.ebuild
new file mode 100644
index 000000000000..a01a4476a16d
--- /dev/null
+++ b/dev-libs/folks/folks-0.15.6-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/26" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+
+IUSE="bluetooth eds telepathy test utils"
+REQUIRED_USE="bluetooth? ( eds )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ >=dev-libs/glib-2.58:2
+ >=dev-libs/libgee-0.10:0.8[introspection]
+ >=dev-libs/gobject-introspection-1.54:=
+ telepathy? (
+ >=net-libs/telepathy-glib-0.19.9
+ dev-libs/dbus-glib
+ )
+ eds? ( >=gnome-extra/evolution-data-server-3.38:= )
+ dev-libs/libxml2:2
+ utils? ( sys-libs/readline:0= )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${DEPEND}
+ bluetooth? ( >=net-wireless/bluez-5[obex] )
+ telepathy? ( net-im/telepathy-mission-control )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ $(vala_depend)
+ telepathy? ( net-libs/telepathy-glib[vala] )
+ eds? ( gnome-extra/evolution-data-server[vala] )
+ test? (
+ sys-apps/dbus
+ bluetooth? (
+ $(python_gen_any_dep '
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
+ ')
+ )
+ )
+"
+
+PATCHES=(
+ # implicit function declaration (Modern C porting):
+ # - https://bugs.gentoo.org/920098
+ # - https://gitlab.gnome.org/GNOME/folks/-/merge_requests/68
+ "${FILESDIR}"/folks-0.15.6-implicit-decl.patch
+)
+
+python_check_deps() {
+ if use test && use bluetooth; then
+ python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+ fi
+}
+
+src_prepare() {
+ default
+ vala_setup
+ xdg_environment_reset
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use bluetooth bluez_backend)
+ $(meson_use eds eds_backend)
+ $(meson_use eds ofono_backend)
+ $(meson_use telepathy telepathy_backend)
+ -Dzeitgeist=false # last rited package
+ -Dimport_tool=true
+ $(meson_use utils inspect_tool)
+ $(meson_use test tests)
+ -Dinstalled_tests=false
+ -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
+ )
+ meson_src_configure
+}
+
+src_test() {
+ dbus-run-session meson test -C "${BUILD_DIR}" -t 5
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/, dev-libs/folks/files/
@ 2024-03-16 22:07 Mart Raudsepp
0 siblings, 0 replies; 8+ messages in thread
From: Mart Raudsepp @ 2024-03-16 22:07 UTC (permalink / raw
To: gentoo-commits
commit: 4682908b4ab386eadbcb7e923ac4d6f136dd9ce4
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 18:21:26 2024 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 22:06:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4682908b
dev-libs/folks: add 0.15.7, fix tests handling
Intentionally not yet 0.15.8 as upstream mirrored tarball was accidentally
made bad and equals 0.15.7 tag instead of the 0.15.8 tag.
Fix tests passing when they shouldn't (missing die), avoid bogus warnings
in tests when flatpak is installed and fix tests (that now would fail due
to the fix to make them fail when they don't pass) with
python-dbusmock-0.30.1 or newer.
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-libs/folks/Manifest | 1 +
.../files/0.15.7-bluez-tests-dbusmock-0.30.1.patch | 28 ++++++
dev-libs/folks/folks-0.15.7.ebuild | 106 +++++++++++++++++++++
3 files changed, 135 insertions(+)
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 74f84e9500ed..2959c442751f 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1 +1,2 @@
DIST folks-0.15.6.tar.xz 497968 BLAKE2B bb9237fae05a748a18a85d29034e879947c4ffcc1d3dbe7277c8e1f41e6e9c9ec27170e9e7d2ccb6dcc89789d331f7f320648620636e1ee54685906fc67ba4f9 SHA512 8d77c3b4c963d88877798b24da9edd977b3ac4b18568ed75885fa87bf81e0e8f29dc8232352e3fefc0bf2c9bb8ca6cea984d87d946a3892963a158bd4f45dc30
+DIST folks-0.15.7.tar.xz 502128 BLAKE2B b93146b216dd31dbc07cf770130593f830c01568aff3424bf4d0d8588ac651ea225ed6d3b38b9855d82dbef168605145a3a3de49706dd2ab31a4d368636dddf0 SHA512 52657b45678aa2418a44b0c8d332ac207eff18b02ca5c0d1491bdf8bae6552f30f2b6435804adc2a5fa66997f2cea09bdfe399dfaf52f3d8b7a5bde11b137c35
diff --git a/dev-libs/folks/files/0.15.7-bluez-tests-dbusmock-0.30.1.patch b/dev-libs/folks/files/0.15.7-bluez-tests-dbusmock-0.30.1.patch
new file mode 100644
index 000000000000..7ab37e0b1bc2
--- /dev/null
+++ b/dev-libs/folks/files/0.15.7-bluez-tests-dbusmock-0.30.1.patch
@@ -0,0 +1,28 @@
+From 9c3212cd6c3f4157e1b9afa5c90d054de1418acf Mon Sep 17 00:00:00 2001
+From: Niels De Graef <ndegraef@redhat.com>
+Date: Fri, 12 Jan 2024 22:57:42 +0100
+Subject: [PATCH] Revert "tests/bluez: Follow PairDevice() API change"
+
+This reverts commit b6b7d41aad9e36e0d0e6ec9822ed2e310923c8fd.
+
+See https://github.com/martinpitt/python-dbusmock/pull/192
+---
+ tests/lib/bluez/backend.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/lib/bluez/backend.vala b/tests/lib/bluez/backend.vala
+index 72c688d3..023117e6 100644
+--- a/tests/lib/bluez/backend.vala
++++ b/tests/lib/bluez/backend.vala
+@@ -39,7 +39,7 @@ namespace org
+
+ [DBus (name = "PairDevice")]
+ public abstract void pair_device (string adapter_device_name,
+- string device_address, int class_=5898764) throws GLib.Error;
++ string device_address) throws GLib.Error;
+
+ [DBus (name = "BlockDevice")]
+ public abstract void block_device (string adapter_device_name,
+--
+GitLab
+
diff --git a/dev-libs/folks/folks-0.15.7.ebuild b/dev-libs/folks/folks-0.15.7.ebuild
new file mode 100644
index 000000000000..321ca83f3284
--- /dev/null
+++ b/dev-libs/folks/folks-0.15.7.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/26" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+
+IUSE="bluetooth eds telepathy test utils"
+REQUIRED_USE="bluetooth? ( eds )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ >=dev-libs/glib-2.58:2
+ >=dev-libs/libgee-0.10:0.8[introspection]
+ >=dev-libs/gobject-introspection-1.54:=
+ telepathy? (
+ >=net-libs/telepathy-glib-0.19.9
+ dev-libs/dbus-glib
+ )
+ eds? ( >=gnome-extra/evolution-data-server-3.38:= )
+ dev-libs/libxml2:2
+ utils? ( sys-libs/readline:0= )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${DEPEND}
+ bluetooth? ( >=net-wireless/bluez-5[obex] )
+ telepathy? ( net-im/telepathy-mission-control )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ $(vala_depend)
+ telepathy? ( net-libs/telepathy-glib[vala] )
+ eds? ( gnome-extra/evolution-data-server[vala] )
+ test? (
+ sys-apps/dbus
+ bluetooth? (
+ $(python_gen_any_dep '
+ >=dev-python/python-dbusmock-0.30.1[${PYTHON_USEDEP}]
+ ')
+ )
+ )
+"
+
+PATCHES=(
+ # implicit function declaration (Modern C porting):
+ # - https://bugs.gentoo.org/920098
+ # - https://gitlab.gnome.org/GNOME/folks/-/merge_requests/68
+ "${FILESDIR}"/folks-0.15.6-implicit-decl.patch
+ # Fix BluezBackend tests with python-dbusmock-0.30.1 and newer
+ "${FILESDIR}"/${PV}-bluez-tests-dbusmock-0.30.1.patch
+)
+
+python_check_deps() {
+ if use test && use bluetooth; then
+ python_has_version ">=dev-python/python-dbusmock-0.30.1[${PYTHON_USEDEP}]"
+ fi
+}
+
+src_prepare() {
+ default
+ vala_setup
+ xdg_environment_reset
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use bluetooth bluez_backend)
+ $(meson_use eds eds_backend)
+ $(meson_use eds ofono_backend)
+ $(meson_use telepathy telepathy_backend)
+ -Dzeitgeist=false # last rited package
+ -Dimport_tool=true
+ $(meson_use utils inspect_tool)
+ $(meson_use test tests)
+ -Dinstalled_tests=false
+ -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
+ )
+ meson_src_configure
+}
+
+src_test() {
+ # Avoid warnings when /etc/profile.d/flatpak.sh from flatpak modified XDG_DATA_DIRS
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+ dbus-run-session meson test -C "${BUILD_DIR}" -t 5 || die "tests failed"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/, dev-libs/folks/files/
@ 2024-05-06 7:09 Mart Raudsepp
0 siblings, 0 replies; 8+ messages in thread
From: Mart Raudsepp @ 2024-05-06 7:09 UTC (permalink / raw
To: gentoo-commits
commit: 326c01187f6227aab3a57be52b23248f0a8b9c1e
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 06:57:11 2024 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon May 6 07:08:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326c0118
dev-libs/folks: drop 0.15.6, 0.15.6-r1, 0.15.7
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-libs/folks/Manifest | 2 -
.../files/0.15.7-bluez-tests-dbusmock-0.30.1.patch | 28 ------
.../folks/files/folks-0.15.6-implicit-decl.patch | 61 ------------
dev-libs/folks/folks-0.15.6-r1.ebuild | 102 --------------------
dev-libs/folks/folks-0.15.6.ebuild | 95 ------------------
dev-libs/folks/folks-0.15.7.ebuild | 106 ---------------------
6 files changed, 394 deletions(-)
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index f63189255e12..aac6d5f6b23b 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,3 +1 @@
-DIST folks-0.15.6.tar.xz 497968 BLAKE2B bb9237fae05a748a18a85d29034e879947c4ffcc1d3dbe7277c8e1f41e6e9c9ec27170e9e7d2ccb6dcc89789d331f7f320648620636e1ee54685906fc67ba4f9 SHA512 8d77c3b4c963d88877798b24da9edd977b3ac4b18568ed75885fa87bf81e0e8f29dc8232352e3fefc0bf2c9bb8ca6cea984d87d946a3892963a158bd4f45dc30
-DIST folks-0.15.7.tar.xz 502128 BLAKE2B b93146b216dd31dbc07cf770130593f830c01568aff3424bf4d0d8588ac651ea225ed6d3b38b9855d82dbef168605145a3a3de49706dd2ab31a4d368636dddf0 SHA512 52657b45678aa2418a44b0c8d332ac207eff18b02ca5c0d1491bdf8bae6552f30f2b6435804adc2a5fa66997f2cea09bdfe399dfaf52f3d8b7a5bde11b137c35
DIST folks-0.15.9.tar.xz 506044 BLAKE2B e239c0ca3b51a5452620f5abaf37b34413b0a5ee867cc682214abd00c21d6375abf1a31755acd69360e47604c61572a63ffbe91f38485be1a83685a98aa34cd0 SHA512 8b1f0afaaf0907a9609863ec913eab75c7f60e3d1fd54e553fdb8d425f33cfb6043171bc5b7cc1dc66b1de702e1a8f5dd229c707d99af47dd3926ec0588c87fd
diff --git a/dev-libs/folks/files/0.15.7-bluez-tests-dbusmock-0.30.1.patch b/dev-libs/folks/files/0.15.7-bluez-tests-dbusmock-0.30.1.patch
deleted file mode 100644
index 7ab37e0b1bc2..000000000000
--- a/dev-libs/folks/files/0.15.7-bluez-tests-dbusmock-0.30.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9c3212cd6c3f4157e1b9afa5c90d054de1418acf Mon Sep 17 00:00:00 2001
-From: Niels De Graef <ndegraef@redhat.com>
-Date: Fri, 12 Jan 2024 22:57:42 +0100
-Subject: [PATCH] Revert "tests/bluez: Follow PairDevice() API change"
-
-This reverts commit b6b7d41aad9e36e0d0e6ec9822ed2e310923c8fd.
-
-See https://github.com/martinpitt/python-dbusmock/pull/192
----
- tests/lib/bluez/backend.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/lib/bluez/backend.vala b/tests/lib/bluez/backend.vala
-index 72c688d3..023117e6 100644
---- a/tests/lib/bluez/backend.vala
-+++ b/tests/lib/bluez/backend.vala
-@@ -39,7 +39,7 @@ namespace org
-
- [DBus (name = "PairDevice")]
- public abstract void pair_device (string adapter_device_name,
-- string device_address, int class_=5898764) throws GLib.Error;
-+ string device_address) throws GLib.Error;
-
- [DBus (name = "BlockDevice")]
- public abstract void block_device (string adapter_device_name,
---
-GitLab
-
diff --git a/dev-libs/folks/files/folks-0.15.6-implicit-decl.patch b/dev-libs/folks/files/folks-0.15.6-implicit-decl.patch
deleted file mode 100644
index f61d655343e4..000000000000
--- a/dev-libs/folks/files/folks-0.15.6-implicit-decl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 127bacf86b7ef639c37dd07afc0bf848c005c3c2 Mon Sep 17 00:00:00 2001
-From: Mohammed Anas <triallax@tutanota.com>
-Date: Sun, 14 Jan 2024 03:27:31 +0000
-Subject: [PATCH] build: add missing API declaration -include to dummy and EDS
- backends
-
-In 7a9c8133468c1f8eb7fbb0e68a6a7e061b9452fb, the original
-`-include redeclare-internal-api.h` was added for autotools. It is
-necessary due to vala internals that require guaranteeing a private
-ABI's prototype is available when compiling folks, even though vala
-doesn't generate that prototype.
-
-During the port to meson, this `-include` was dropped.
-
-Without it, `-Werror=implicit-function-declaration` will cause folks to
-fail to compile. Implicit function declarations are a terrible feature
--- they were part of c89, but c99 removed them without a deprecation
-because they were too dangerous to use, notable in a language that
-doesn't like to remove features even *with* a deprecation.
-
-For over two decades, compilers have, by default, allowed this invalid C
-anyways, on the grounds that it commonly existed, but modern compilers
-are finally starting to enforce this. It will become a fatal error by
-default in gcc 14, and clang 16.
-
-Folks got this right all the way back in 2013; it disappeared by
-accident. Let's restore it as originally intended.
----
-Upstream: https://gitlab.gnome.org/GNOME/folks/-/merge_requests/68
-
- backends/dummy/lib/meson.build | 1 +
- backends/eds/lib/meson.build | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/backends/dummy/lib/meson.build b/backends/dummy/lib/meson.build
-index 32448f35..eacc0e7a 100644
---- a/backends/dummy/lib/meson.build
-+++ b/backends/dummy/lib/meson.build
-@@ -23,6 +23,7 @@ dummy_backendlib_vala_flags = [
-
- dummy_backendlib_c_flags = [
- '-include', 'config.h',
-+ '-include', 'folks/redeclare-internal-api.h',
- '-DBACKEND_NAME="@0@"'.format(dummy_backend_name),
- '-DG_LOG_DOMAIN="@0@"'.format(dummy_backend_name),
- ]
-diff --git a/backends/eds/lib/meson.build b/backends/eds/lib/meson.build
-index 3e3db84c..68d803b3 100644
---- a/backends/eds/lib/meson.build
-+++ b/backends/eds/lib/meson.build
-@@ -40,6 +40,7 @@ endif
-
- eds_backendlib_c_flags = [
- '-include', 'config.h',
-+ '-include', 'folks/redeclare-internal-api.h',
- '-DBACKEND_NAME="@0@"'.format(eds_backend_name),
- '-DG_LOG_DOMAIN="@0@"'.format(eds_backend_name),
- ]
---
-GitLab
-
diff --git a/dev-libs/folks/folks-0.15.6-r1.ebuild b/dev-libs/folks/folks-0.15.6-r1.ebuild
deleted file mode 100644
index a01a4476a16d..000000000000
--- a/dev-libs/folks/folks-0.15.6-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
-
-IUSE="bluetooth eds telepathy test utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- >=dev-libs/glib-2.58:2
- >=dev-libs/libgee-0.10:0.8[introspection]
- >=dev-libs/gobject-introspection-1.54:=
- telepathy? (
- >=net-libs/telepathy-glib-0.19.9
- dev-libs/dbus-glib
- )
- eds? ( >=gnome-extra/evolution-data-server-3.38:= )
- dev-libs/libxml2:2
- utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
- bluetooth? ( >=net-wireless/bluez-5[obex] )
- telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- $(vala_depend)
- telepathy? ( net-libs/telepathy-glib[vala] )
- eds? ( gnome-extra/evolution-data-server[vala] )
- test? (
- sys-apps/dbus
- bluetooth? (
- $(python_gen_any_dep '
- dev-python/python-dbusmock[${PYTHON_USEDEP}]
- ')
- )
- )
-"
-
-PATCHES=(
- # implicit function declaration (Modern C porting):
- # - https://bugs.gentoo.org/920098
- # - https://gitlab.gnome.org/GNOME/folks/-/merge_requests/68
- "${FILESDIR}"/folks-0.15.6-implicit-decl.patch
-)
-
-python_check_deps() {
- if use test && use bluetooth; then
- python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
- fi
-}
-
-src_prepare() {
- default
- vala_setup
- xdg_environment_reset
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use bluetooth bluez_backend)
- $(meson_use eds eds_backend)
- $(meson_use eds ofono_backend)
- $(meson_use telepathy telepathy_backend)
- -Dzeitgeist=false # last rited package
- -Dimport_tool=true
- $(meson_use utils inspect_tool)
- $(meson_use test tests)
- -Dinstalled_tests=false
- -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
- )
- meson_src_configure
-}
-
-src_test() {
- dbus-run-session meson test -C "${BUILD_DIR}" -t 5
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/dev-libs/folks/folks-0.15.6.ebuild b/dev-libs/folks/folks-0.15.6.ebuild
deleted file mode 100644
index 45afd5a484b8..000000000000
--- a/dev-libs/folks/folks-0.15.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
-
-IUSE="bluetooth eds telepathy test utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- >=dev-libs/glib-2.58:2
- >=dev-libs/libgee-0.10:0.8[introspection]
- >=dev-libs/gobject-introspection-1.54:=
- telepathy? (
- >=net-libs/telepathy-glib-0.19.9
- dev-libs/dbus-glib
- )
- eds? ( >=gnome-extra/evolution-data-server-3.38:= )
- dev-libs/libxml2:2
- utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
- bluetooth? ( >=net-wireless/bluez-5[obex] )
- telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- $(vala_depend)
- telepathy? ( net-libs/telepathy-glib[vala] )
- eds? ( gnome-extra/evolution-data-server[vala] )
- test? (
- sys-apps/dbus
- bluetooth? (
- $(python_gen_any_dep '
- dev-python/python-dbusmock[${PYTHON_USEDEP}]
- ')
- )
- )
-"
-
-python_check_deps() {
- if use test && use bluetooth; then
- python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
- fi
-}
-
-src_prepare() {
- default
- vala_setup
- xdg_environment_reset
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use bluetooth bluez_backend)
- $(meson_use eds eds_backend)
- $(meson_use eds ofono_backend)
- $(meson_use telepathy telepathy_backend)
- -Dzeitgeist=false # last rited package
- -Dimport_tool=true
- $(meson_use utils inspect_tool)
- $(meson_use test tests)
- -Dinstalled_tests=false
- -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
- )
- meson_src_configure
-}
-
-src_test() {
- dbus-run-session meson test -C "${BUILD_DIR}" -t 5
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/dev-libs/folks/folks-0.15.7.ebuild b/dev-libs/folks/folks-0.15.7.ebuild
deleted file mode 100644
index 321ca83f3284..000000000000
--- a/dev-libs/folks/folks-0.15.7.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
-
-IUSE="bluetooth eds telepathy test utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- >=dev-libs/glib-2.58:2
- >=dev-libs/libgee-0.10:0.8[introspection]
- >=dev-libs/gobject-introspection-1.54:=
- telepathy? (
- >=net-libs/telepathy-glib-0.19.9
- dev-libs/dbus-glib
- )
- eds? ( >=gnome-extra/evolution-data-server-3.38:= )
- dev-libs/libxml2:2
- utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
- bluetooth? ( >=net-wireless/bluez-5[obex] )
- telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- $(vala_depend)
- telepathy? ( net-libs/telepathy-glib[vala] )
- eds? ( gnome-extra/evolution-data-server[vala] )
- test? (
- sys-apps/dbus
- bluetooth? (
- $(python_gen_any_dep '
- >=dev-python/python-dbusmock-0.30.1[${PYTHON_USEDEP}]
- ')
- )
- )
-"
-
-PATCHES=(
- # implicit function declaration (Modern C porting):
- # - https://bugs.gentoo.org/920098
- # - https://gitlab.gnome.org/GNOME/folks/-/merge_requests/68
- "${FILESDIR}"/folks-0.15.6-implicit-decl.patch
- # Fix BluezBackend tests with python-dbusmock-0.30.1 and newer
- "${FILESDIR}"/${PV}-bluez-tests-dbusmock-0.30.1.patch
-)
-
-python_check_deps() {
- if use test && use bluetooth; then
- python_has_version ">=dev-python/python-dbusmock-0.30.1[${PYTHON_USEDEP}]"
- fi
-}
-
-src_prepare() {
- default
- vala_setup
- xdg_environment_reset
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use bluetooth bluez_backend)
- $(meson_use eds eds_backend)
- $(meson_use eds ofono_backend)
- $(meson_use telepathy telepathy_backend)
- -Dzeitgeist=false # last rited package
- -Dimport_tool=true
- $(meson_use utils inspect_tool)
- $(meson_use test tests)
- -Dinstalled_tests=false
- -Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
- )
- meson_src_configure
-}
-
-src_test() {
- # Avoid warnings when /etc/profile.d/flatpak.sh from flatpak modified XDG_DATA_DIRS
- export XDG_DATA_DIRS="${EPREFIX}"/usr/share
- dbus-run-session meson test -C "${BUILD_DIR}" -t 5 || die "tests failed"
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-05-06 7:09 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-22 20:47 [gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/, dev-libs/folks/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2024-05-06 7:09 Mart Raudsepp
2024-03-16 22:07 Mart Raudsepp
2024-01-30 5:10 Sam James
2020-08-23 10:58 Mart Raudsepp
2020-04-20 20:30 Mart Raudsepp
2020-03-01 16:18 Mart Raudsepp
2019-02-24 9:31 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox