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 <[email protected]> -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 <[email protected]> -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 -}
