summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2021-12-31 18:29:56 +0100
committerKhem Raj <raj.khem@gmail.com>2022-01-05 08:17:18 -0800
commit9f4b8346a9bc2a1f201e9517fe8575ab86831c1d (patch)
tree020d96231686fb4d356186b8a9beabbdca419075
parentc8936b7da8172c95e97e8defc6e4306ce2184bcb (diff)
downloadmeta-openembedded-9f4b8346a9bc2a1f201e9517fe8575ab86831c1d.tar.gz
gsound: upgrade 1.0.2 -> 1.0.3 / build with meson
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/gsound/gsound/0001-Set-vapidir.patch28
-rw-r--r--meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb (renamed from meta-gnome/recipes-gnome/gsound/gsound_1.0.2.bb)7
2 files changed, 3 insertions, 32 deletions
diff --git a/meta-gnome/recipes-gnome/gsound/gsound/0001-Set-vapidir.patch b/meta-gnome/recipes-gnome/gsound/gsound/0001-Set-vapidir.patch
deleted file mode 100644
index ffccfd56f2..0000000000
--- a/meta-gnome/recipes-gnome/gsound/gsound/0001-Set-vapidir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 0a790273aca3ba07dfa6d2f61e3aaa7157c1a3bb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 20 Mar 2021 09:22:18 -0700
4Subject: [PATCH] Set vapidir
5
6Use parentheses instead of braces, it makes automake and perl happy
7newer perl does not like ${} for VALAFLAGS
8
9Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.30), passed through in regex; marked by <-- HERE in m/^${ <-- HERE abs_top_builddir}/gsound$/ at TOPDIR/build/tmp/work/mips32r2-yoe-linux/gsound/1.0.2-r0/recipe-sysroot-native/usr/bin/automake line 5759.
10autoreconf: error: automake failed with exit status: 255
11
12Upstream-Status: Pending
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 tools/Makefile.am | 3 ++-
16 1 file changed, 2 insertions(+), 1 deletion(-)
17
18--- a/tools/Makefile.am
19+++ b/tools/Makefile.am
20@@ -8,7 +8,7 @@ bin_PROGRAMS = gsound-play
21 gsound_play_SOURCES = gsound-play.vala
22
23 gsound_play_VALAFLAGS = \
24- --vapidir ${abs_top_builddir}/gsound \
25+ --vapidir $(abs_top_builddir)/gsound \
26 --pkg gsound \
27 ${NULL}
28
diff --git a/meta-gnome/recipes-gnome/gsound/gsound_1.0.2.bb b/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb
index 65ee1e1c12..7c7925420c 100644
--- a/meta-gnome/recipes-gnome/gsound/gsound_1.0.2.bb
+++ b/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb
@@ -7,9 +7,8 @@ DEPENDS = " \
7 libcanberra \ 7 libcanberra \
8" 8"
9 9
10inherit gnomebase gettext gobject-introspection vala 10GNOMEBASEBUILDCLASS = "meson"
11 11
12SRC_URI += "file://0001-Set-vapidir.patch" 12inherit gnomebase gettext gobject-introspection vala
13 13
14SRC_URI[archive.md5sum] = "c26fd21c21b9ef6533a202a73fab21db" 14SRC_URI[archive.sha256sum] = "ca2d039e1ebd148647017a7f548862350bc9af01986d39f10cfdc8e95f07881a"
15SRC_URI[archive.sha256sum] = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"