From d6c169e8952bf9e062764a499e876d5e12aec10969432069b6f3949f654e093b Mon Sep 17 00:00:00 2001 From: Luciano Santos Date: Wed, 19 Jul 2023 01:11:44 +0000 Subject: [PATCH] Accepting request 1099199 from GNOME:Next - 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. OBS-URL: https://build.opensuse.org/request/show/1099199 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gupnp?expand=0&rev=142 --- 884639bd.patch | 25 +++++++++++++++++++++++++ a10c57bd.patch | 23 +++++++++++++++++++++++ gupnp.changes | 7 +++++++ gupnp.spec | 4 ++++ 4 files changed, 59 insertions(+) create mode 100644 884639bd.patch create mode 100644 a10c57bd.patch diff --git a/884639bd.patch b/884639bd.patch new file mode 100644 index 0000000..ca2cadc --- /dev/null +++ b/884639bd.patch @@ -0,0 +1,25 @@ +From 884639bd29323cbb8fbd36bc69d08097a2ae2cd1 Mon Sep 17 00:00:00 2001 +From: Jan Beich +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 + diff --git a/a10c57bd.patch b/a10c57bd.patch new file mode 100644 index 0000000..5943230 --- /dev/null +++ b/a10c57bd.patch @@ -0,0 +1,23 @@ +From a10c57bd32fbd0dc59eb6703454360ea564e2ffc Mon Sep 17 00:00:00 2001 +From: Jens Georg +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 + diff --git a/gupnp.changes b/gupnp.changes index f7dab48..774fece 100644 --- a/gupnp.changes +++ b/gupnp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 18 08:06:15 UTC 2023 - Dominique Leuenberger + +- 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 diff --git a/gupnp.spec b/gupnp.spec index 6d1897a..8881c51 100644 --- a/gupnp.spec +++ b/gupnp.spec @@ -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