1 |
commit: 0cbd505fd408e3f45dddde818ad69105ccce662e |
2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
3 |
AuthorDate: Mon Jan 24 21:06:18 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 25 00:49:02 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cbd505f |
7 |
|
8 |
gnome-extra/gnome-boxes: fix build with meson-0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831934 |
11 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../files/41.3-fix-build-with-meson-0.61.1.patch | 38 ++++++++++++++++++++++ |
15 |
gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild | 4 +++ |
16 |
2 files changed, 42 insertions(+) |
17 |
|
18 |
diff --git a/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch b/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch |
19 |
new file mode 100644 |
20 |
index 000000000000..d777e414f9f7 |
21 |
--- /dev/null |
22 |
+++ b/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch |
23 |
@@ -0,0 +1,38 @@ |
24 |
+https://gitlab.gnome.org/GNOME/gnome-boxes/-/commit/fd0acfbe79444687c73dea182c2d1a5fa1c77324 |
25 |
+https://bugs.gentoo.org/831934 |
26 |
+ |
27 |
+From: Michal Vasilek <michal@×××××××.cz> |
28 |
+Date: Sat, 15 Jan 2022 00:07:31 +0100 |
29 |
+Subject: [PATCH] build: remove positional i18n.merge_file arguments |
30 |
+ |
31 |
+otherwise building with meson 0.61+ fails: |
32 |
+ |
33 |
+ ERROR: Function does not take positional arguments. |
34 |
+--- |
35 |
+ data/meson.build | 3 +-- |
36 |
+ 1 file changed, 1 insertion(+), 2 deletions(-) |
37 |
+ |
38 |
+diff --git a/data/meson.build b/data/meson.build |
39 |
+index d32638a8..2dc1798b 100644 |
40 |
+--- a/data/meson.build |
41 |
++++ b/data/meson.build |
42 |
+@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes', |
43 |
+ desktop_conf = configuration_data () |
44 |
+ desktop_conf.set ('icon', application_id) |
45 |
+ desktop = i18n.merge_file ( |
46 |
+- 'desktop', |
47 |
+ input: configure_file ( |
48 |
+ input: files ('org.gnome.Boxes.desktop.in'), |
49 |
+ output: 'org.gnome.Boxes.desktop.in', |
50 |
+@@ -65,7 +64,7 @@ configure_file ( |
51 |
+ |
52 |
+ appdata_conf = configuration_data() |
53 |
+ appdata_conf.set('appid', application_id) |
54 |
+-appdata_file = i18n.merge_file ('appdata-file', |
55 |
++appdata_file = i18n.merge_file ( |
56 |
+ input: configure_file ( |
57 |
+ input: files ('org.gnome.Boxes.appdata.xml.in'), |
58 |
+ output: 'org.gnome.Boxes.appdata.xml.in', |
59 |
+-- |
60 |
+GitLab |
61 |
+ |
62 |
|
63 |
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild |
64 |
index a2108ec7a02c..1c25fa6b9c26 100644 |
65 |
--- a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild |
66 |
+++ b/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild |
67 |
@@ -76,6 +76,10 @@ BDEPEND=" |
68 |
virtual/pkgconfig |
69 |
" |
70 |
|
71 |
+PATCHES=( |
72 |
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch |
73 |
+) |
74 |
+ |
75 |
DISABLE_AUTOFORMATTING="yes" |
76 |
DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules. |
77 |
If you have an Intel Processor, run: |