* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libportal/, dev-libs/libportal/files/
@ 2025-02-16 23:10 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2025-02-16 23:10 UTC (permalink / raw
To: gentoo-commits
commit: 7c4ebc353bd481b2e7ed6ad1d539e63869a48c92
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 23:00:05 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 23:09:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c4ebc35
dev-libs/libportal: add 0.9.1 w/ IUSE qt6, python3_13, drop virtualx
Thanks-to: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Thanks-to: Mathieu Gollain <mathieu.gollain <AT> zero-sum.fr>
Closes: https://github.com/gentoo/gentoo/pull/38065
Closes: https://github.com/gentoo/gentoo/pull/39717
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libportal/Manifest | 1 +
.../files/libportal-0.9.1-bogus-qt6widgets.patch | 11 +++
dev-libs/libportal/libportal-0.9.1.ebuild | 101 +++++++++++++++++++++
3 files changed, 113 insertions(+)
diff --git a/dev-libs/libportal/Manifest b/dev-libs/libportal/Manifest
index 26fb14475215..31078daf2420 100644
--- a/dev-libs/libportal/Manifest
+++ b/dev-libs/libportal/Manifest
@@ -1 +1,2 @@
DIST libportal-0.7.1.tar.xz 74268 BLAKE2B b519fa88735d640a74e18cc791ec69862f136b793a7c855b1f3873cf6b15626d69088747f1a7ff54f8cd96f79e82e3df31e5349e3da57906e769b8f809f4ba34 SHA512 cbc50bfd86787fffc975fc53835acc6c3c0fd54b7ee02fce1983f1bd0fc40b15a0537780cd5e943ecedcf951840080a0f55a23a96e706223e52a6144ee70332c
+DIST libportal-0.9.1.tar.xz 108572 BLAKE2B 3574d141a42802a38b6e276848bff86a557b77e3ab1f269cf9ccf59f0706ee68271c90c2e81ff8593fd271c5edb6d51dab86ff18a9ff5147f00b74e18f3b8e7d SHA512 445f0c9295220668123b9b3503bb5e75edef3ea939d6f28b159c0ded2f017b35b35e8a6013f550ac6a1f8a5fb9f04c93ce5ced39694bd14731da19172649c895
diff --git a/dev-libs/libportal/files/libportal-0.9.1-bogus-qt6widgets.patch b/dev-libs/libportal/files/libportal-0.9.1-bogus-qt6widgets.patch
new file mode 100644
index 000000000000..fdeff6728104
--- /dev/null
+++ b/dev-libs/libportal/files/libportal-0.9.1-bogus-qt6widgets.patch
@@ -0,0 +1,11 @@
+--- a/libportal/meson.build
++++ b/libportal/meson.build
+@@ -280,7 +280,7 @@
+
+ if meson.version().version_compare('>= 0.63.0')
+ have_cpp = add_languages('cpp', required: get_option('backend-qt6'), native: false)
+- qt6_dep = dependency('qt6', modules: ['Core', 'Gui', 'Widgets'], private_headers: true, required: get_option('backend-qt6'))
++ qt6_dep = dependency('qt6', modules: ['Core', 'Gui'], private_headers: true, required: get_option('backend-qt6'))
+
+ if have_cpp and qt6_dep.found()
+ qt6_headers = ['portal-qt6.h']
diff --git a/dev-libs/libportal/libportal-0.9.1.ebuild b/dev-libs/libportal/libportal-0.9.1.ebuild
new file mode 100644
index 000000000000..edbbfc9d2f5c
--- /dev/null
+++ b/dev-libs/libportal/libportal-0.9.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit flag-o-matic meson python-any-r1 vala
+
+DESCRIPTION="Flatpak portal library"
+HOMEPAGE="https://github.com/flatpak/libportal"
+SRC_URI="https://github.com/flatpak/libportal/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-3"
+SLOT="0/1-1-1-1" # soname of libportal{,-gtk3,-gtk4,-qt6}.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk gtk-doc +introspection qt6 test +vala wayland X"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ gtk-doc? ( introspection )
+ vala? ( introspection )
+"
+
+RDEPEND="
+ >=dev-libs/glib-2.58:2
+ introspection? ( dev-libs/gobject-introspection:= )
+ gtk? (
+ >=x11-libs/gtk+-3.24.41-r1:3[wayland?,X?]
+ >=gui-libs/gtk-4.12.5-r2:4[wayland?,X?]
+ )
+ qt6? ( dev-qt/qtbase:6=[gui] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gi-docgen )
+ test? (
+ qt6? ( dev-qt/qttools:6[linguist] )
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
+ ')
+ )
+ vala? ( $(vala_depend) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-bogus-qt6widgets.patch" )
+
+python_check_deps() {
+ python_has_version \
+ "dev-python/pytest[${PYTHON_USEDEP}]" \
+ "dev-python/dbus-python[${PYTHON_USEDEP}]" \
+ "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ if use test; then
+ python-any-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ default
+ vala_setup
+}
+
+src_configure() {
+ # defang automagic dependencies
+ use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+ use X || append-cflags -DGENTOO_GTK_HIDE_X11
+
+ local emesonargs=(
+ $(meson_feature gtk backend-gtk3)
+ $(meson_feature gtk backend-gtk4)
+ -Dbackend-qt5=disabled
+ $(meson_feature qt6 backend-qt6)
+ -Dportal-tests=false
+ $(meson_use introspection)
+ $(meson_use vala vapi)
+ $(meson_use gtk-doc docs)
+ $(meson_use test tests)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ local -x QT_QPA_PLATFORM=offscreen
+ meson_src_test
+}
+
+src_install() {
+ meson_src_install
+
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+ mv "${ED}"/usr/share/doc/${PN}-1 "${ED}"/usr/share/gtk-doc/html/ || die
+ fi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libportal/, dev-libs/libportal/files/
@ 2025-03-21 13:50 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2025-03-21 13:50 UTC (permalink / raw
To: gentoo-commits
commit: 63d4b943dafcb7760268ee67bdf8ef0543c49f59
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 20 21:24:50 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 21 13:49:32 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d4b943
dev-libs/libportal: drop 0.7.1-r1
Closes: https://bugs.gentoo.org/950251
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libportal/Manifest | 1 -
.../6cd7c2ab82575b76f876ee2bd2d31f6cb77f022f.patch | 47 --------
dev-libs/libportal/libportal-0.7.1-r1.ebuild | 118 ---------------------
3 files changed, 166 deletions(-)
diff --git a/dev-libs/libportal/Manifest b/dev-libs/libportal/Manifest
index 31078daf2420..11ce6d71c70a 100644
--- a/dev-libs/libportal/Manifest
+++ b/dev-libs/libportal/Manifest
@@ -1,2 +1 @@
-DIST libportal-0.7.1.tar.xz 74268 BLAKE2B b519fa88735d640a74e18cc791ec69862f136b793a7c855b1f3873cf6b15626d69088747f1a7ff54f8cd96f79e82e3df31e5349e3da57906e769b8f809f4ba34 SHA512 cbc50bfd86787fffc975fc53835acc6c3c0fd54b7ee02fce1983f1bd0fc40b15a0537780cd5e943ecedcf951840080a0f55a23a96e706223e52a6144ee70332c
DIST libportal-0.9.1.tar.xz 108572 BLAKE2B 3574d141a42802a38b6e276848bff86a557b77e3ab1f269cf9ccf59f0706ee68271c90c2e81ff8593fd271c5edb6d51dab86ff18a9ff5147f00b74e18f3b8e7d SHA512 445f0c9295220668123b9b3503bb5e75edef3ea939d6f28b159c0ded2f017b35b35e8a6013f550ac6a1f8a5fb9f04c93ce5ced39694bd14731da19172649c895
diff --git a/dev-libs/libportal/files/6cd7c2ab82575b76f876ee2bd2d31f6cb77f022f.patch b/dev-libs/libportal/files/6cd7c2ab82575b76f876ee2bd2d31f6cb77f022f.patch
deleted file mode 100644
index ea055c832dc8..000000000000
--- a/dev-libs/libportal/files/6cd7c2ab82575b76f876ee2bd2d31f6cb77f022f.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6cd7c2ab82575b76f876ee2bd2d31f6cb77f022f Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@debian.org>
-Date: Tue, 26 Dec 2023 14:35:46 +0000
-Subject: [PATCH] pyportaltest: Only create one session bus per DBusTestCase
- subclass
-
-DBusTestCase.start_session_bus() is a class method, and can only be
-called once per class, because DBusTestCase.tearDownClass() will only
-clean up one session bus. In older versions of dbusmock, calling it more
-than once will result in dbus-daemon processes being leaked; since
-0.30.0, calling it more than once will result in an assertion failure.
-
-Resolves: https://github.com/flatpak/libportal/issues/136
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1058245
-Signed-off-by: Simon McVittie <smcv@debian.org>
----
- tests/pyportaltest/__init__.py | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/tests/pyportaltest/__init__.py b/tests/pyportaltest/__init__.py
-index af053c2a..80f04a91 100644
---- a/tests/pyportaltest/__init__.py
-+++ b/tests/pyportaltest/__init__.py
-@@ -83,6 +83,14 @@ def setUpClass(cls):
- except AttributeError:
- pytest.skip("Updated version of dbusmock required")
-
-+ cls.__have_session_bus = False
-+
-+ @classmethod
-+ def ensure_session_bus(cls):
-+ if not cls.__have_session_bus:
-+ cls.__have_session_bus = True
-+ cls.start_session_bus()
-+
- def setUp(self):
- self.p_mock = None
- self._mainloop = None
-@@ -96,7 +104,7 @@ def setup_daemon(self, params=None, extra_templates: List[Tuple[str, Dict]] = []
- portal name as first value and the param dict to be passed to that
- template as second value, e.g. ("ScreenCast", {...}).
- """
-- self.start_session_bus()
-+ self.ensure_session_bus()
- self.p_mock, self.obj_portal = self.spawn_server_template(
- template=f"pyportaltest/templates/{self.PORTAL_NAME.lower()}.py",
- parameters=params,
diff --git a/dev-libs/libportal/libportal-0.7.1-r1.ebuild b/dev-libs/libportal/libportal-0.7.1-r1.ebuild
deleted file mode 100644
index 9d0665819cb5..000000000000
--- a/dev-libs/libportal/libportal-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic meson python-any-r1 vala virtualx
-
-DESCRIPTION="Flatpak portal library"
-HOMEPAGE="https://github.com/flatpak/libportal"
-SRC_URI="https://github.com/flatpak/libportal/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-3"
-SLOT="0/1-1-1-1" # soname of libportal{,-gtk3,-gtk4,-qt5}.so
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="gtk gtk-doc +introspection qt5 test +vala wayland X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- gtk-doc? ( introspection )
- vala? ( introspection )
-"
-
-RDEPEND="
- >=dev-libs/glib-2.58:2
- introspection? ( dev-libs/gobject-introspection:= )
- gtk? (
- >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?]
- >=gui-libs/gtk-4.12.5-r2:4[X?,wayland?]
- )
- qt5? (
- dev-qt/qtcore:=
- dev-qt/qtgui:=
- dev-qt/qtx11extras:=
- dev-qt/qtwidgets:=
- )
-"
-DEPEND="${RDEPEND}
- qt5? (
- test? ( dev-qt/qttest:= )
- )
-"
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
- gtk-doc? ( dev-util/gi-docgen )
- qt5? (
- test? ( dev-qt/linguist-tools )
- )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/python-dbusmock[${PYTHON_USEDEP}]
- ')
- )
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- # backport fix for tests incompatibility with dbusmock 0.30.0
- "${FILESDIR}"/6cd7c2ab82575b76f876ee2bd2d31f6cb77f022f.patch
-)
-
-python_check_deps() {
- python_has_version \
- "dev-python/pytest[${PYTHON_USEDEP}]" \
- "dev-python/dbus-python[${PYTHON_USEDEP}]" \
- "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- if use test; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- default
- vala_setup
-}
-
-src_configure() {
- # defang automagic dependencies
- use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
- use X || append-cflags -DGENTOO_GTK_HIDE_X11
-
- local emesonargs=(
- $(meson_feature gtk backend-gtk3)
- $(meson_feature gtk backend-gtk4)
- $(meson_feature qt5 backend-qt5)
- -Dportal-tests=false
- $(meson_use introspection)
- $(meson_use vala vapi)
- $(meson_use gtk-doc docs)
- $(meson_use test tests)
- )
- meson_src_configure
-}
-
-src_test() {
- # Tests only exist for Qt5
- if use qt5; then
- virtx meson_src_test
- else
- # run meson_src_test to notice if tests are added
- meson_src_test
- fi
-}
-
-src_install() {
- meson_src_install
-
- if use gtk-doc; then
- mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
- mv "${ED}"/usr/share/doc/${PN}-1 "${ED}"/usr/share/gtk-doc/html/ || die
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-21 13:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-21 13:50 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libportal/, dev-libs/libportal/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-02-16 23:10 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox