Accepting request 1099349 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1099349
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gupnp?expand=0&rev=79
This commit is contained in:
Ana Guerrero 2023-07-26 11:21:28 +00:00 committed by Git OBS Bridge
commit 0b3c3ccb56
4 changed files with 59 additions and 0 deletions

25
884639bd.patch Normal file
View File

@ -0,0 +1,25 @@
From 884639bd29323cbb8fbd36bc69d08097a2ae2cd1 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sun, 9 Jul 2023 03:30:47 +0000
Subject: [PATCH] build: properly spell [provide] in *.wrap files
meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"?
---
subprojects/gssdp-1.6.wrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/gssdp-1.6.wrap b/subprojects/gssdp-1.6.wrap
index b0b6504..8adc1a2 100644
--- a/subprojects/gssdp-1.6.wrap
+++ b/subprojects/gssdp-1.6.wrap
@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git
revision = master
depth = 1
-[provides]
+[provide]
dependency_name = gssdp-1.6
--
GitLab

23
a10c57bd.patch Normal file
View File

@ -0,0 +1,23 @@
From a10c57bd32fbd0dc59eb6703454360ea564e2ffc Mon Sep 17 00:00:00 2001
From: Jens Georg <mail@jensge.org>
Date: Sun, 9 Jul 2023 21:49:47 +0200
Subject: [PATCH] build: Add missing "s" to wrap file syntax
---
subprojects/gssdp-1.6.wrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/gssdp-1.6.wrap b/subprojects/gssdp-1.6.wrap
index 8adc1a2..ac1de18 100644
--- a/subprojects/gssdp-1.6.wrap
+++ b/subprojects/gssdp-1.6.wrap
@@ -4,5 +4,5 @@ revision = master
depth = 1
[provide]
-dependency_name = gssdp-1.6
+dependency_names = gssdp-1.6
--
GitLab

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 18 08:06:15 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Add upstream patches to fix build with meson 1.2.0:
+ a10c57bd.patch: Add missing "s" to wrap file syntax.
+ 884639bd.patch: properly spell [provide] in *.wrap files.
-------------------------------------------------------------------
Sat Jul 1 16:33:43 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -29,6 +29,10 @@ Group: Development/Libraries/C and C++
URL: http://www.gupnp.org/
Source0: https://download.gnome.org/sources/gupnp/1.6/%{name}-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM 884639bd.patch dimstar@opensuse.org -- properly spell [provide] in *.wrap files.
Patch0: 884639bd.patch
# PATCH-FIX-UPSTREAM a10c57bd.patch dimstar@opensuse.org -- Add missing "s" to wrap file syntax.
Patch1: a10c57bd.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: meson >= 0.54.0