1 |
commit: 8979c7936e91d0a9b2f90cd4007026870e9dfaac |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 25 02:22:40 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 25 02:31:31 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8979c793 |
7 |
|
8 |
app-dicts/gnome-dictionary: fix build with meson 0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831555 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../files/gnome-dictionary-40.0-meson-0.61.patch | 100 +++++++++++++++++++++ |
14 |
.../gnome-dictionary-40.0-r1.ebuild | 4 + |
15 |
2 files changed, 104 insertions(+) |
16 |
|
17 |
diff --git a/app-dicts/gnome-dictionary/files/gnome-dictionary-40.0-meson-0.61.patch b/app-dicts/gnome-dictionary/files/gnome-dictionary-40.0-meson-0.61.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..f14b4cbe2949 |
20 |
--- /dev/null |
21 |
+++ b/app-dicts/gnome-dictionary/files/gnome-dictionary-40.0-meson-0.61.patch |
22 |
@@ -0,0 +1,100 @@ |
23 |
+https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch |
24 |
+https://gitlab.gnome.org/GNOME/gnome-dictionary/-/merge_requests/18.patch |
25 |
+https://bugs.gentoo.org/831555 |
26 |
+ |
27 |
+From 87c026cfe4acbcfc62d15950f88a71d8d9678c7e Mon Sep 17 00:00:00 2001 |
28 |
+From: Emmanuele Bassi <ebassi@×××××.org> |
29 |
+Date: Thu, 22 Apr 2021 15:11:59 +0100 |
30 |
+Subject: [PATCH] build: Fix test dependencies with Meson 0.57 |
31 |
+ |
32 |
+We need to explicitly depend on the generated files. |
33 |
+--- |
34 |
+ data/appdata/meson.build | 3 ++- |
35 |
+ data/meson.build | 3 ++- |
36 |
+ 2 files changed, 4 insertions(+), 2 deletions(-) |
37 |
+ |
38 |
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build |
39 |
+index 1dc4ed7..ef95c85 100644 |
40 |
+--- a/data/appdata/meson.build |
41 |
++++ b/data/appdata/meson.build |
42 |
+@@ -1,6 +1,6 @@ |
43 |
+ appdata_conf = configuration_data() |
44 |
+ appdata_conf.set('application_id', application_id) |
45 |
+-i18n.merge_file('appdata', |
46 |
++appdata_file = i18n.merge_file('appdata', |
47 |
+ input: configure_file( |
48 |
+ input: 'org.gnome.Dictionary.appdata.xml.in.in', |
49 |
+ output: 'org.gnome.Dictionary.appdata.xml.in', |
50 |
+@@ -18,6 +18,7 @@ if appstream_util.found() |
51 |
+ appstream_util, |
52 |
+ args: [ 'validate', '--nonet', application_id + '.appdata.xml' ], |
53 |
+ workdir: meson.current_build_dir(), |
54 |
++ depends: appdata_file, |
55 |
+ ) |
56 |
+ endif |
57 |
+ |
58 |
+diff --git a/data/meson.build b/data/meson.build |
59 |
+index 660e6b8..1723c8f 100644 |
60 |
+--- a/data/meson.build |
61 |
++++ b/data/meson.build |
62 |
+@@ -3,7 +3,7 @@ subdir('appdata') |
63 |
+ desktop_conf = configuration_data() |
64 |
+ desktop_conf.set('icon', application_id) |
65 |
+ desktop_conf.set('application_id', application_id) |
66 |
+-i18n.merge_file('desktop', |
67 |
++desktop_file = i18n.merge_file('desktop', |
68 |
+ input: configure_file( |
69 |
+ input: 'org.gnome.Dictionary.desktop.in.in', |
70 |
+ output: 'org.gnome.Dictionary.desktop.in', |
71 |
+@@ -22,6 +22,7 @@ if desktop_file_validate.found() |
72 |
+ desktop_file_validate, |
73 |
+ args: application_id + '.desktop', |
74 |
+ workdir: meson.current_build_dir(), |
75 |
++ depends: desktop_file, |
76 |
+ ) |
77 |
+ endif |
78 |
+ |
79 |
+-- |
80 |
+GitLab |
81 |
+ |
82 |
+From cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68 Mon Sep 17 00:00:00 2001 |
83 |
+From: Jan Beich <jbeich@×××××××.org> |
84 |
+Date: Mon, 24 Jan 2022 11:13:54 +0000 |
85 |
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file() |
86 |
+ |
87 |
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. |
88 |
+ |
89 |
+data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. |
90 |
+data/meson.build:6:5: ERROR: Function does not take positional arguments. |
91 |
+data/meson.build:49:5: ERROR: Function does not take positional arguments. |
92 |
+--- a/data/appdata/meson.build |
93 |
++++ b/data/appdata/meson.build |
94 |
+@@ -1,6 +1,6 @@ |
95 |
+ appdata_conf = configuration_data() |
96 |
+ appdata_conf.set('application_id', application_id) |
97 |
+-appdata_file = i18n.merge_file('appdata', |
98 |
++appdata_file = i18n.merge_file( |
99 |
+ input: configure_file( |
100 |
+ input: 'org.gnome.Dictionary.appdata.xml.in.in', |
101 |
+ output: 'org.gnome.Dictionary.appdata.xml.in', |
102 |
+--- a/data/meson.build |
103 |
++++ b/data/meson.build |
104 |
+@@ -3,7 +3,7 @@ subdir('appdata') |
105 |
+ desktop_conf = configuration_data() |
106 |
+ desktop_conf.set('icon', application_id) |
107 |
+ desktop_conf.set('application_id', application_id) |
108 |
+-desktop_file = i18n.merge_file('desktop', |
109 |
++desktop_file = i18n.merge_file( |
110 |
+ input: configure_file( |
111 |
+ input: 'org.gnome.Dictionary.desktop.in.in', |
112 |
+ output: 'org.gnome.Dictionary.desktop.in', |
113 |
+@@ -46,7 +46,7 @@ sources = [ |
114 |
+ ] |
115 |
+ |
116 |
+ foreach s: sources |
117 |
+- i18n.merge_file('sources', |
118 |
++ i18n.merge_file( |
119 |
+ input: '@0@.in'.format(s), |
120 |
+ output: s, |
121 |
+ install: true, |
122 |
+GitLab |
123 |
|
124 |
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild |
125 |
index 0a2c8fabe1fc..9ff55d568d54 100644 |
126 |
--- a/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild |
127 |
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-40.0-r1.ebuild |
128 |
@@ -29,6 +29,10 @@ BDEPEND=" |
129 |
virtual/pkgconfig |
130 |
" |
131 |
|
132 |
+PATCHES=( |
133 |
+ "${FILESDIR}"/${P}-meson-0.61.patch |
134 |
+) |
135 |
+ |
136 |
src_configure() { |
137 |
# Replicate what a release buildtype would set, as we use -Dbuildtype=plain |
138 |
append-cflags -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS |