gentoo auto-resync : 17:03:2024 - 00:48:58

3 files changed, 137 insertions, 0 deletions

diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index a11a7bc48dd6..5fef20670c62 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,8 @@
+AUX 0.15.7-bluez-tests-dbusmock-0.30.1.patch 1031 BLAKE2B 21fc0e205746a00046d0ee669152e411164cc8154c004aa5a929bae07e86214ed94e47426183e5ed03912e21f3f4305154fd00a1316eacd3106605fc6a18935a SHA512 f7fb96872f3e180ae32467183d29dda3f984d55cf6b170056a146d6a0644fabf8d919abed50ddf653f841274a2c833d243fc68bd85b1bcb3ea0710bf69f87af8
 AUX folks-0.15.6-implicit-decl.patch 2355 BLAKE2B a366f9c58f161f3e776e4a91165b9e2847ce1419eb17559c188306a7e5739fd2d9179b4e6b9cbd6efa35eb428c96f17a0b84f95dcb4bbe184e83a555415cb73b SHA512 5770414af17016951bffe1de6099ba0b1b29881a044cc7d41e279c848fa4ffae57d5bdeca254858c2158bd470a09a478080c3645c529fcea81bc09c85119c027
 DIST folks-0.15.6.tar.xz 497968 BLAKE2B bb9237fae05a748a18a85d29034e879947c4ffcc1d3dbe7277c8e1f41e6e9c9ec27170e9e7d2ccb6dcc89789d331f7f320648620636e1ee54685906fc67ba4f9 SHA512 8d77c3b4c963d88877798b24da9edd977b3ac4b18568ed75885fa87bf81e0e8f29dc8232352e3fefc0bf2c9bb8ca6cea984d87d946a3892963a158bd4f45dc30
+DIST folks-0.15.7.tar.xz 502128 BLAKE2B b93146b216dd31dbc07cf770130593f830c01568aff3424bf4d0d8588ac651ea225ed6d3b38b9855d82dbef168605145a3a3de49706dd2ab31a4d368636dddf0 SHA512 52657b45678aa2418a44b0c8d332ac207eff18b02ca5c0d1491bdf8bae6552f30f2b6435804adc2a5fa66997f2cea09bdfe399dfaf52f3d8b7a5bde11b137c35
 EBUILD folks-0.15.6-r1.ebuild 2531 BLAKE2B a94e34e46ee987d7f10d59abf552d4e932280ffa2818625dc95ec0cf4f235e0d8751229320de0e72b6173be2c841fa78d843b6b292fcba955561ced229e91a16 SHA512 89483d61ac8bfb0e6c9e062e32b0b4c6a7979cc8fba52979eeba962df3a8a7958ddd1cd753fdc55bc9cb195b4c40f9499d3e530ba31c182a7c751d30ad6e44e3
 EBUILD folks-0.15.6.ebuild 2316 BLAKE2B 755a2cc016bc6a4152b49f7fc98bd68203bc0b2278eb6750ab6a9d5022a21607cb2ae4448a8a2540f3a3f5c9928c563156a1e4e46d39abba5bb47022d184b1c6 SHA512 befd3a9ef73778806b1b2d5d072c2a8838a8f88197d9164c28f0305e9dc2456db231304fa465d15446180c62178bdc7c2404ae875d566b0d2813d522db95b957
+EBUILD folks-0.15.7.ebuild 2821 BLAKE2B 1697d7450c7bff82f30c893e61bcc75994c2112dc69ca8218bc02620bd3b491e2f7d9d3c14f303aa4ec66e06bf9790ad33e8321de39640aae29cfe9cb45e5eb5 SHA512 a6a165a4902bed9f881d9709ed69cdaafaaff609f005eaea4d23ba36b60c044b0df81d3e728483fd691f0e193b2183fbf398e8b74aea27e5518331b27a0bbb30
 MISC metadata.xml 502 BLAKE2B 7f53a803053323804b7c28f44e2490e4ffa63a26a2c0fc153850043b2b91e75bcbb817fbaf8b9e3af0e8a0735b60c827c34f13b5a567300c4a97918be4e955c8 SHA512 934fd324cb9d464af7cbfc0c6746071d00f0404d716319ce7e2460a0ddb0e60f60fec211cac8d87cf9d7e70c849744a8d62e7268c7774d677f2e8481a30a3a09
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
+}