- Update patch with the version finally merged upstream in

gh#flatpak/xdg-desktop-portal#1624 .
- Removed patch:
  * fix-pipewire-pw_registry-cast.patch
- Added patch:
  * 0001-Fix-build-with-pipewire-1.3.82.patch

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/xdg-desktop-portal?expand=0&rev=95
This commit is contained in:
Bjørn Lie 2025-02-12 17:08:13 +00:00 committed by Git OBS Bridge
parent 3e50260c60
commit 3968a3815c
4 changed files with 41 additions and 20 deletions

View File

@ -0,0 +1,29 @@
From da7b73b0b0174e9a6dcf706ae64218e822e2c685 Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <antonio.larrosa@gmail.com>
Date: Wed, 12 Feb 2025 10:26:08 +0100
Subject: [PATCH] Fix build with pipewire 1.3.82
While submitting pipewire 1.3.82 to openSUSE Tumbleweed I noticed this
is needed to build xdg-desktop-portal. This was already submitted
as an issue in #1611 in Debian, in which the reporter doesn't mention the
used pipewire version but says "I am also building my own pipewire"
so I guess it's one of the latest RCs (1.3.81 or 1.3.82).
Fixes: #1611
---
src/pipewire.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pipewire.c b/src/pipewire.c
index bc4ec5047..39b05c71c 100644
--- a/src/pipewire.c
+++ b/src/pipewire.c
@@ -331,7 +331,7 @@ pipewire_remote_new_sync (struct pw_properties *pipewire_properties,
remote->registry = (struct pw_proxy*) pw_core_get_registry (remote->core,
PW_VERSION_REGISTRY,
0);
- pw_registry_add_listener (remote->registry,
+ pw_registry_add_listener ((struct pw_registry*)remote->registry,
&remote->registry_listener,
&registry_events,
remote);

View File

@ -1,18 +0,0 @@
From: Antonio Larrosa <alarrosa@suse.com>
Subject: Fix building with pipewire 1.3.82
Submitted to upstream in https://github.com/flatpak/xdg-desktop-portal/pull/1624
Index: xdg-desktop-portal-1.19.2/src/pipewire.c
===================================================================
--- xdg-desktop-portal-1.19.2.orig/src/pipewire.c
+++ xdg-desktop-portal-1.19.2/src/pipewire.c
@@ -331,7 +331,7 @@ pipewire_remote_new_sync (struct pw_prop
remote->registry = (struct pw_proxy*) pw_core_get_registry (remote->core,
PW_VERSION_REGISTRY,
0);
- pw_registry_add_listener (remote->registry,
+ pw_registry_add_listener ((struct pw_registry*)remote->registry,
&remote->registry_listener,
&registry_events,
remote);

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Feb 12 14:18:49 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
- Update patch with the version finally merged upstream in
gh#flatpak/xdg-desktop-portal#1624 .
- Removed patch:
* fix-pipewire-pw_registry-cast.patch
- Added patch:
* 0001-Fix-build-with-pipewire-1.3.82.patch
-------------------------------------------------------------------
Tue Feb 11 11:29:37 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>

View File

@ -41,8 +41,8 @@ Supplements: (%{oname}-devel and patterns-base-documentation)
License: LGPL-2.1-or-later
URL: https://github.com/flatpak/xdg-desktop-portal
Source0: %{url}/releases/download/%{version}/%{oname}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM fix-pipewire-pw_registry-cast.patch gh#flatpak/xdg-desktop-portal#1624 alarrosa@suse.com -- Fix build with pipewire 1.3.82
Patch0: fix-pipewire-pw_registry-cast.patch
# PATCH-FIX-UPSTREAM 0001-Fix-build-with-pipewire-1.3.82.patch gh#flatpak/xdg-desktop-portal#1624 alarrosa@suse.com -- Fix build with pipewire 1.3.82
Patch0: 0001-Fix-build-with-pipewire-1.3.82.patch
BuildRequires: docutils
BuildRequires: meson >= 0.58