Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libportal: update to 0.7.1, enable qt5 backend, add check
@ 2024-02-11 22:33 chrysos349
  2024-02-12  0:42 ` [PR REVIEW] " oreo639
                   ` (17 more replies)
  0 siblings, 18 replies; 19+ messages in thread
From: chrysos349 @ 2024-02-11 22:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 755 bytes --]

There is a new pull request by chrysos349 against master on the void-packages repository

https://github.com/chrysos349/void-packages libportal
https://github.com/void-linux/void-packages/pull/48662

libportal: update to 0.7.1, enable qt5 backend, add check
New apps requires the current `libportal`.
Also I enabled qt5 backend, and added check via pytest.

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl x
  - armv7l x
  - armv6l-musl x

A patch file from https://github.com/void-linux/void-packages/pull/48662.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libportal-48662.patch --]
[-- Type: text/x-diff, Size: 5036 bytes --]

From 4463084d76ac2a0ff019aa652c11fd98795e8221 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 12 Feb 2024 01:27:45 +0300
Subject: [PATCH] libportal: update to 0.7.1

---
 common/shlibs                              |  1 +
 srcpkgs/libportal-qt5                      |  1 +
 srcpkgs/libportal-qt5-devel                |  1 +
 srcpkgs/libportal/patches/fix-pytest.patch | 28 +++++++++++++++++
 srcpkgs/libportal/template                 | 35 ++++++++++++++++++----
 5 files changed, 61 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/libportal-qt5
 create mode 120000 srcpkgs/libportal-qt5-devel
 create mode 100644 srcpkgs/libportal/patches/fix-pytest.patch

diff --git a/common/shlibs b/common/shlibs
index 93fb4b2608729..419abc417867b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4273,3 +4273,4 @@ libunicode.so.0.4 libunicode-0.4.0_1
 libunicode_ucd.so.0.4 libunicode-0.4.0_1
 libunicode_loader.so.0.4 libunicode-0.4.0_1
 force-stage.so.0.1 void-force-stage-0.1_1
+libportal-qt5.so.1 libportal-qt5-0.7.1_1
diff --git a/srcpkgs/libportal-qt5 b/srcpkgs/libportal-qt5
new file mode 120000
index 0000000000000..2e15139a5d95b
--- /dev/null
+++ b/srcpkgs/libportal-qt5
@@ -0,0 +1 @@
+libportal
\ No newline at end of file
diff --git a/srcpkgs/libportal-qt5-devel b/srcpkgs/libportal-qt5-devel
new file mode 120000
index 0000000000000..2e15139a5d95b
--- /dev/null
+++ b/srcpkgs/libportal-qt5-devel
@@ -0,0 +1 @@
+libportal
\ No newline at end of file
diff --git a/srcpkgs/libportal/patches/fix-pytest.patch b/srcpkgs/libportal/patches/fix-pytest.patch
new file mode 100644
index 0000000000000..8cde864d08e1e
--- /dev/null
+++ b/srcpkgs/libportal/patches/fix-pytest.patch
@@ -0,0 +1,28 @@
+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/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 41e306f113170..4abed60e96eda 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,24 +1,28 @@
 # Template file for 'libportal'
 pkgname=libportal
-version=0.6
+version=0.7.1
 revision=1
 build_style=meson
-configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi) -Dbackends=gtk3,gtk4"
+configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi)
+ -Dbackend-gtk3=enabled -Dbackend-gtk4=enabled -Dbackend-qt5=enabled"
 hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if gir vala)
  $(vopt_if gtk_doc gi-docgen)"
-makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel"
+makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel
+ qt5-tools-devel qt5-x11extras-devel"
+checkdepends="python3-dbusmock python3-pytest xvfb-run"
 short_desc="Flatpak portal library"
 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=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
+checksum=297b90b263fad22190a26b8c7e8ea938fe6b18fb936265e588927179920d3805
+make_check_pre="xvfb-run"
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"
 
 if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qemu-user-static prelink-cross"
+	hostmakedepends+=" qemu-user-static prelink-cross qt5-host-tools"
 fi
 
 libportal-devel_package() {
@@ -87,3 +91,24 @@ libportal-gtk4-devel_package() {
 		fi
 	}
 }
+
+libportal-qt5_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - Qt5"
+	pkg_install() {
+		vmove "usr/lib/libportal-qt5.so.*"
+	}
+}
+
+
+libportal-qt5-devel_package() {
+	depends="libportal-devel>=${version}_${revision}
+	 libportal-qt5>=${version}_${revision} qt5-devel
+	 qt5-x11extras-devel"
+	short_desc+=" - Qt5 - development files"
+	pkg_install() {
+		vmove usr/include/libportal-qt5
+		vmove "usr/lib/libportal-qt5.so"
+		vmove usr/lib/pkgconfig/libportal-qt5.pc
+	}
+}

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2024-03-04 13:21 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-11 22:33 [PR PATCH] libportal: update to 0.7.1, enable qt5 backend, add check chrysos349
2024-02-12  0:42 ` [PR REVIEW] " oreo639
2024-02-12  4:49 ` [PR PATCH] [Updated] " chrysos349
2024-02-12  4:56 ` [PR REVIEW] " chrysos349
2024-02-12 14:34 ` [PR PATCH] [Updated] " chrysos349
2024-02-15 11:57 ` [PR REVIEW] " sgn
2024-02-15 11:57 ` sgn
2024-02-15 19:49 ` chrysos349
2024-02-15 20:46 ` oreo639
2024-02-15 20:47 ` oreo639
2024-02-15 20:53 ` oreo639
2024-02-15 21:35 ` [PR PATCH] [Updated] " chrysos349
2024-02-15 21:46 ` [PR REVIEW] " chrysos349
2024-03-04 11:24 ` oreo639
2024-03-04 11:24 ` oreo639
2024-03-04 13:01 ` [PR PATCH] [Updated] " chrysos349
2024-03-04 13:10 ` chrysos349
2024-03-04 13:11 ` [PR PATCH] [Updated] " chrysos349
2024-03-04 13:21 ` [PR PATCH] [Merged]: " oreo639

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).