summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2024-09-20 11:58:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-09-20 15:59:03 +0100
commitacc133f8397877afdb4e51359d7b56da46628d11 (patch)
tree3668c13d62cd2eabd592ed5d68f123b2ece49341
parent9639dc7d87780429ce64234febff37cb0babf256 (diff)
downloadpoky-acc133f8397877afdb4e51359d7b56da46628d11.tar.gz
libportal: update 0.7.1 -> 0.8.1
Changes in 0.8.1, 04-09-2024 ========================== - Fix a regression in the Remote Desktop where it wouldn't work with the ScreenCast portal correctly. - Use non-deprecated functions in the GTK4 code - Run tests in CI so we catch regressions earlier - Make Qt tests use QTEST_GUILESS_MAIN - Fix an Input Capture test Changes in 0.8.0, 02-09-2024 ========================== - Add API to allow for persistence on RemoteDesktop sessions - Implement support for the Input Capture portal - Add support for Qt 6 - Support xdg-foreign with Qt 6 - Fix screencasting on wlroots-based compositors (From OE-Core rev: 093d3a1155b796a63fb6d295c535ffc27457d677) Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch49
-rw-r--r--meta/recipes-gnome/libportal/libportal_0.8.1.bb (renamed from meta/recipes-gnome/libportal/libportal_0.7.1.bb)5
2 files changed, 2 insertions, 52 deletions
diff --git a/meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch b/meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch
deleted file mode 100644
index fb015d3632..0000000000
--- a/meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 26f96a178f8a0afded00bdd7238728c0b6e42a6b Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Thu, 9 May 2024 18:44:41 +0000
4Subject: [PATCH] meson.build: fix build race when building GTK vapi files
5
6There's a build race when building the GTK vapi files:
7
8FAILED: libportal/libportal-gtk4.vapi
9error: Package `libportal' not found in specified Vala API directories or GObject-Introspection GIR directories
10
11This can be verified by adding "sleep 10;" to the command for the
12libportal/libportal.vapi target in the generated build.ninja file.
13
14The GTK vapi files need to have access to the generic libportal.vapi file,
15but there is no explicit dependency. Switch the dependency name 'libportal'
16to the dependency object libportal_vapi so that Meson generates the
17dependency correctly.
18
19Upstream-Status: Backport
20Signed-off-by: Ross Burton <ross.burton@arm.com>
21---
22 libportal/meson.build | 4 ++--
23 1 file changed, 2 insertions(+), 2 deletions(-)
24
25diff --git a/libportal/meson.build b/libportal/meson.build
26index fff7603..4e67f40 100644
27--- a/libportal/meson.build
28+++ b/libportal/meson.build
29@@ -168,7 +168,7 @@ if gtk3_dep.found()
30 if vapi
31 libportal_gtk3_vapi = gnome.generate_vapi('libportal-gtk3',
32 sources: libportal_gtk3_gir[0],
33- packages: ['gio-2.0', 'gtk+-3.0', 'libportal'],
34+ packages: ['gio-2.0', 'gtk+-3.0', libportal_vapi],
35 gir_dirs: [meson.current_build_dir()],
36 vapi_dirs: [meson.current_build_dir()],
37 install: true,
38@@ -227,7 +227,7 @@ if gtk4_dep.found()
39 if vapi
40 libportal_gtk4_vapi = gnome.generate_vapi('libportal-gtk4',
41 sources: libportal_gtk4_gir[0],
42- packages: ['gio-2.0', 'gtk4', 'libportal'],
43+ packages: ['gio-2.0', 'gtk4', libportal_vapi],
44 gir_dirs: [meson.current_build_dir()],
45 vapi_dirs: [meson.current_build_dir()],
46 install: true,
47--
482.34.1
49
diff --git a/meta/recipes-gnome/libportal/libportal_0.7.1.bb b/meta/recipes-gnome/libportal/libportal_0.8.1.bb
index 6ddfef76d3..0b88de4224 100644
--- a/meta/recipes-gnome/libportal/libportal_0.7.1.bb
+++ b/meta/recipes-gnome/libportal/libportal_0.8.1.bb
@@ -6,9 +6,8 @@ BUGTRACKER = "https://github.com/flatpak/libportal/issues"
6LICENSE = "LGPL-3.0-only" 6LICENSE = "LGPL-3.0-only"
7LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" 7LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404"
8 8
9SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main \ 9SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main"
10 file://0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch" 10SRCREV = "26c15008cbe579f57f89468384f8efc033f25f6f"
11SRCREV = "e9ed3a50cdde321eaf42361212480a66eb94a57a"
12S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
13 12
14inherit meson gi-docgen gobject-introspection vala features_check pkgconfig 13inherit meson gi-docgen gobject-introspection vala features_check pkgconfig