| 1 |
commit: 4382ae869f3836f5bca74d9ce975881dff9fa0cf |
| 2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
| 3 |
AuthorDate: Mon Jan 24 21:31:08 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 25 00:49:03 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4382ae86 |
| 7 |
|
| 8 |
media-video/totem: fix build with meson-0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831931 |
| 11 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/3.38.2-fix-build-with-meson-0.61.1.patch | 41 ++++++++++++++++++++++ |
| 15 |
media-video/totem/totem-3.38.2.ebuild | 1 + |
| 16 |
2 files changed, 42 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch b/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..da494e2b61b4 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch |
| 23 |
@@ -0,0 +1,41 @@ |
| 24 |
+https://gitlab.gnome.org/GNOME/totem/-/commit/61e3a957cb7339c6614e764fcf1120d967d687e9 |
| 25 |
+https://bugs.gentoo.org/831931 |
| 26 |
+ |
| 27 |
+From: Bastien Nocera <hadess@××××××.net> |
| 28 |
+Date: Thu, 6 Jan 2022 17:21:28 +0100 |
| 29 |
+Subject: [PATCH] build: Remove unused i18n.merge_file() "name" |
| 30 |
+ |
| 31 |
+data/meson.build:78:0: ERROR: Function does not take positional arguments. |
| 32 |
+data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments. |
| 33 |
+--- |
| 34 |
+ data/appdata/meson.build | 1 - |
| 35 |
+ data/meson.build | 1 - |
| 36 |
+ 2 files changed, 2 deletions(-) |
| 37 |
+ |
| 38 |
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build |
| 39 |
+index c4d17e927..c2e646327 100644 |
| 40 |
+--- a/data/appdata/meson.build |
| 41 |
++++ b/data/appdata/meson.build |
| 42 |
+@@ -1,7 +1,6 @@ |
| 43 |
+ appdata = 'org.gnome.Totem.appdata.xml' |
| 44 |
+ |
| 45 |
+ appdata_file = i18n.merge_file ( |
| 46 |
+- 'appdata', |
| 47 |
+ input: appdata + '.in', |
| 48 |
+ output: appdata, |
| 49 |
+ install: true, |
| 50 |
+diff --git a/data/meson.build b/data/meson.build |
| 51 |
+index b31ce755c..8eebe3db1 100644 |
| 52 |
+--- a/data/meson.build |
| 53 |
++++ b/data/meson.build |
| 54 |
+@@ -76,7 +76,6 @@ desktop_in = configure_file( |
| 55 |
+ ) |
| 56 |
+ |
| 57 |
+ desktop_file = i18n.merge_file ( |
| 58 |
+- desktop, |
| 59 |
+ type: 'desktop', |
| 60 |
+ input: desktop_in, |
| 61 |
+ output: desktop, |
| 62 |
+-- |
| 63 |
+GitLab |
| 64 |
+ |
| 65 |
|
| 66 |
diff --git a/media-video/totem/totem-3.38.2.ebuild b/media-video/totem/totem-3.38.2.ebuild |
| 67 |
index 1f81efbd3f0a..086dd67eb632 100644 |
| 68 |
--- a/media-video/totem/totem-3.38.2.ebuild |
| 69 |
+++ b/media-video/totem/totem-3.38.2.ebuild |
| 70 |
@@ -74,6 +74,7 @@ BDEPEND=" |
| 71 |
|
| 72 |
PATCHES=( |
| 73 |
"${FILESDIR}"/3.38.0-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue) |
| 74 |
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch |
| 75 |
) |
| 76 |
|
| 77 |
pkg_setup() { |
Archives