mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 18:32:12 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
9639dc7d87
commit
acc133f839
@@ -1,49 +0,0 @@
|
||||
From 26f96a178f8a0afded00bdd7238728c0b6e42a6b Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Thu, 9 May 2024 18:44:41 +0000
|
||||
Subject: [PATCH] meson.build: fix build race when building GTK vapi files
|
||||
|
||||
There's a build race when building the GTK vapi files:
|
||||
|
||||
FAILED: libportal/libportal-gtk4.vapi
|
||||
error: Package `libportal' not found in specified Vala API directories or GObject-Introspection GIR directories
|
||||
|
||||
This can be verified by adding "sleep 10;" to the command for the
|
||||
libportal/libportal.vapi target in the generated build.ninja file.
|
||||
|
||||
The GTK vapi files need to have access to the generic libportal.vapi file,
|
||||
but there is no explicit dependency. Switch the dependency name 'libportal'
|
||||
to the dependency object libportal_vapi so that Meson generates the
|
||||
dependency correctly.
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
---
|
||||
libportal/meson.build | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libportal/meson.build b/libportal/meson.build
|
||||
index fff7603..4e67f40 100644
|
||||
--- a/libportal/meson.build
|
||||
+++ b/libportal/meson.build
|
||||
@@ -168,7 +168,7 @@ if gtk3_dep.found()
|
||||
if vapi
|
||||
libportal_gtk3_vapi = gnome.generate_vapi('libportal-gtk3',
|
||||
sources: libportal_gtk3_gir[0],
|
||||
- packages: ['gio-2.0', 'gtk+-3.0', 'libportal'],
|
||||
+ packages: ['gio-2.0', 'gtk+-3.0', libportal_vapi],
|
||||
gir_dirs: [meson.current_build_dir()],
|
||||
vapi_dirs: [meson.current_build_dir()],
|
||||
install: true,
|
||||
@@ -227,7 +227,7 @@ if gtk4_dep.found()
|
||||
if vapi
|
||||
libportal_gtk4_vapi = gnome.generate_vapi('libportal-gtk4',
|
||||
sources: libportal_gtk4_gir[0],
|
||||
- packages: ['gio-2.0', 'gtk4', 'libportal'],
|
||||
+ packages: ['gio-2.0', 'gtk4', libportal_vapi],
|
||||
gir_dirs: [meson.current_build_dir()],
|
||||
vapi_dirs: [meson.current_build_dir()],
|
||||
install: true,
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -6,9 +6,8 @@ BUGTRACKER = "https://github.com/flatpak/libportal/issues"
|
||||
LICENSE = "LGPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404"
|
||||
|
||||
SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main \
|
||||
file://0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch"
|
||||
SRCREV = "e9ed3a50cdde321eaf42361212480a66eb94a57a"
|
||||
SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main"
|
||||
SRCREV = "26c15008cbe579f57f89468384f8efc033f25f6f"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit meson gi-docgen gobject-introspection vala features_check pkgconfig
|
||||
Reference in New Issue
Block a user