libportal: update to 0.9.1.

This commit is contained in:
John 2025-03-15 15:37:35 +01:00 committed by John Zimmermann
parent f3f4517692
commit 634adb363a
2 changed files with 2 additions and 49 deletions

View file

@ -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,

View file

@ -1,6 +1,6 @@
# Template file for 'libportal'
pkgname=libportal
version=0.7.1
version=0.9.1
revision=1
build_style=meson
build_helper="gir"
@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/flatpak/libportal"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
checksum=297b90b263fad22190a26b8c7e8ea938fe6b18fb936265e588927179920d3805
checksum=de801ee349ed3c255a9af3c01b1a401fab5b3fc1c35eb2fd7dfb35d4b8194d7f
make_check_pre="xvfb-run"
build_options="gir gtk_doc"