summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-07-17 13:23:52 +0100
committerSam James <sam@gentoo.org>2023-07-17 13:37:43 +0100
commitfaa7e01170016c19b3c71cb243c207f9bd75b06e (patch)
tree765fa0d8b4b61e5a1dee7bf40b9293a3289b69c1 /net-libs/gupnp
parentapp-emacs/tuareg-mode: bump to 3.0.1 (diff)
downloadgentoo-faa7e01170016c19b3c71cb243c207f9bd75b06e.tar.gz
gentoo-faa7e01170016c19b3c71cb243c207f9bd75b06e.tar.bz2
gentoo-faa7e01170016c19b3c71cb243c207f9bd75b06e.zip
net-libs/gupnp: fix build w/ meson 1.2.0
Closes: https://bugs.gentoo.org/909377 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-libs/gupnp')
-rw-r--r--net-libs/gupnp/files/gupnp-1.6.4-meson-1.2.0-fix.patch38
-rw-r--r--net-libs/gupnp/gupnp-1.6.4.ebuild4
2 files changed, 42 insertions, 0 deletions
diff --git a/net-libs/gupnp/files/gupnp-1.6.4-meson-1.2.0-fix.patch b/net-libs/gupnp/files/gupnp-1.6.4-meson-1.2.0-fix.patch
new file mode 100644
index 000000000000..05314a417c6d
--- /dev/null
+++ b/net-libs/gupnp/files/gupnp-1.6.4-meson-1.2.0-fix.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gupnp/-/commit/884639bd29323cbb8fbd36bc69d08097a2ae2cd1
+https://gitlab.gnome.org/GNOME/gupnp/-/commit/a10c57bd32fbd0dc59eb6703454360ea564e2ffc
+
+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]"?
+--- 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
+
+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
+
+--- 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/net-libs/gupnp/gupnp-1.6.4.ebuild b/net-libs/gupnp/gupnp-1.6.4.ebuild
index 65a1aa08e3f7..0e5d39866c9f 100644
--- a/net-libs/gupnp/gupnp-1.6.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.6.4.ebuild
@@ -44,6 +44,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/${P}-meson-1.2.0-fix.patch
+)
+
src_prepare() {
default
use vala && vala_setup