1 |
commit: bdbf5f63824b45d21ae303620b5ae035ba199349 |
2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
3 |
AuthorDate: Mon Jan 24 20:57:54 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 25 00:49:01 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbf5f63 |
7 |
|
8 |
media-sound/gnome-music: fix build with meson-0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831936 |
11 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../files/40.1.1-fix-build-with-meson-0.61.1.patch | 24 ++++++++++++++++++++++ |
15 |
media-sound/gnome-music/gnome-music-40.1.1.ebuild | 4 ++++ |
16 |
2 files changed, 28 insertions(+) |
17 |
|
18 |
diff --git a/media-sound/gnome-music/files/40.1.1-fix-build-with-meson-0.61.1.patch b/media-sound/gnome-music/files/40.1.1-fix-build-with-meson-0.61.1.patch |
19 |
new file mode 100644 |
20 |
index 000000000000..4ae460ac99d7 |
21 |
--- /dev/null |
22 |
+++ b/media-sound/gnome-music/files/40.1.1-fix-build-with-meson-0.61.1.patch |
23 |
@@ -0,0 +1,24 @@ |
24 |
+https://gitlab.gnome.org/GNOME/gnome-music/-/commit/d9f35b542adbf6b0e1114c7c077df04212a98fc7 |
25 |
+https://bugs.gentoo.org/831936 |
26 |
+ |
27 |
+From: Jean Felder <jfelder@×××××××××.org> |
28 |
+Date: Thu, 18 Nov 2021 12:09:26 +0100 |
29 |
+Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument |
30 |
+ |
31 |
+The positional argument was being silently ignored until meson 0.60.0 |
32 |
+where it returns a deprecation message: |
33 |
+"DEPRECATION: i18n.merge_file does not take any positional |
34 |
+arguments. This will become a hard error in the next Meson release." |
35 |
+ |
36 |
+See: https://github.com/mesonbuild/meson/issues/9441 |
37 |
+--- a/data/meson.build |
38 |
++++ b/data/meson.build |
39 |
+@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID) |
40 |
+ appdata_conf.set('package_url', PACKAGE_URL) |
41 |
+ appdata_conf.set('package_url_bug', PACKAGE_URL_BUG) |
42 |
+ i18n.merge_file( |
43 |
+- 'appdata', |
44 |
+ input: configure_file( |
45 |
+ output: PROJECT_RDNN_NAME + '.appdata.xml.in', |
46 |
+ input: PROJECT_RDNN_NAME + '.appdata.xml.in.in', |
47 |
+GitLab |
48 |
|
49 |
diff --git a/media-sound/gnome-music/gnome-music-40.1.1.ebuild b/media-sound/gnome-music/gnome-music-40.1.1.ebuild |
50 |
index 261d35742d1c..ff9dc73cd09e 100644 |
51 |
--- a/media-sound/gnome-music/gnome-music-40.1.1.ebuild |
52 |
+++ b/media-sound/gnome-music/gnome-music-40.1.1.ebuild |
53 |
@@ -53,6 +53,10 @@ BDEPEND=" |
54 |
virtual/pkgconfig |
55 |
" |
56 |
|
57 |
+PATCHES=( |
58 |
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch |
59 |
+) |
60 |
+ |
61 |
RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https |
62 |
|
63 |
pkg_setup() { |