From a858971740284f455324b66190584dd842f1b59e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 27 Sep 2023 18:45:58 +0200 Subject: gupnp-tools: fix build with meson-1.2.0 Signed-off-by: Martin Jansa Signed-off-by: Khem Raj (cherry picked from commit 8a7c980d92145c02d7dbb1252a930293c301eee7) Signed-off-by: Armin Kuster --- .../0001-build-Fix-wrap-file-syntax.patch | 56 ++++++++++++++++++++++ .../gupnp/gupnp-tools_0.10.2.bb | 4 +- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch new file mode 100644 index 0000000000..5c13ce0bd5 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch @@ -0,0 +1,56 @@ +From 4c86f814fbe17eb5774055d69102408bbfc1cd63 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sun, 9 Jul 2023 21:47:48 +0200 +Subject: [PATCH] build: Fix wrap file syntax + +No idea why it worked in the first place + +Fixes #26 + +Signed-off-by: Martin Jansa +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/1372f9ebe45180d58cefb6c0475fafe77de37ef2] +--- + subprojects/gssdp-1.2.wrap | 4 ++-- + subprojects/gupnp-1.2.wrap | 4 ++-- + subprojects/gupnp-av-1.0.wrap | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap +index 34d9b0b..f78d2fa 100644 +--- a/subprojects/gssdp-1.2.wrap ++++ b/subprojects/gssdp-1.2.wrap +@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git + revision = master + depth = 1 + +-[provides] +-dependency_name = gssdp-1.2 ++[provide] ++dependency_names = gssdp-1.2 + +diff --git a/subprojects/gupnp-1.2.wrap b/subprojects/gupnp-1.2.wrap +index c345910..f92c055 100644 +--- a/subprojects/gupnp-1.2.wrap ++++ b/subprojects/gupnp-1.2.wrap +@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp.git + revision = master + depth = 1 + +-[provides] +-dependency_name = gupnp-1.2 ++[provide] ++dependency_names = gupnp-1.2 + +diff --git a/subprojects/gupnp-av-1.0.wrap b/subprojects/gupnp-av-1.0.wrap +index 967e6d3..8c3b490 100644 +--- a/subprojects/gupnp-av-1.0.wrap ++++ b/subprojects/gupnp-av-1.0.wrap +@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp-av.git + revision = master + depth = 1 + +-[provides] +-dependency_name = gupnp-av-1.0 ++[provide] ++dependency_names = gupnp-av-1.0 + diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb index 20aced8329..9731ede274 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb @@ -9,7 +9,9 @@ inherit features_check meson pkgconfig gettext gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz" +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz \ + file://0001-build-Fix-wrap-file-syntax.patch \ +" SRC_URI[sha256sum] = "6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c" RRECOMMENDS:${PN} = "adwaita-icon-theme" -- cgit v1.2.3-54-g00ecf