1 |
commit: 23c7a2ca71ab64f3307120ec497ab99e509676ce |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 18 20:33:39 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 18 20:40:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23c7a2ca |
7 |
|
8 |
gnome-base/gnome-desktop: bump to 3.32.2 |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
gnome-base/gnome-desktop/Manifest | 2 + |
14 |
.../files/3.32.2-fix-tests-without-locale.patch | 82 ++++++++++++++++++++++ |
15 |
.../files/3.32.2-optional-introspection.patch | 48 +++++++++++++ |
16 |
.../gnome-desktop/gnome-desktop-3.32.2.ebuild | 79 +++++++++++++++++++++ |
17 |
4 files changed, 211 insertions(+) |
18 |
|
19 |
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest |
20 |
index d348865c779..967e76c847f 100644 |
21 |
--- a/gnome-base/gnome-desktop/Manifest |
22 |
+++ b/gnome-base/gnome-desktop/Manifest |
23 |
@@ -1,3 +1,5 @@ |
24 |
DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 |
25 |
DIST gnome-desktop-3.30.2.3-patchset.tar.xz 3568 BLAKE2B 20d13d7e396d7cddcfb6f761815df7ce6a2d910be5e9588eac519ade536848cfc09d1aca0e4478f97177b8ee26f8049da21542d502b427973991b47c7097bbe3 SHA512 8b9eab01e79e3d67dec51ed07a086f04df1890e638a0c1696742cf5e3b6a42dccbd514fc3cfd3610791c4905346847af83e813845ad14e0b57b790fedd0ae8e0 |
26 |
DIST gnome-desktop-3.30.2.3.tar.xz 1164500 BLAKE2B e78256bc3319ea9794b4666c82eb466a0c884fd43c3c776fd08aaf789905893ff93acec35a1fb6903c0049b3a169afe5b43a71ac1e93e8c63c013682c3316fa8 SHA512 36303de8fa70e65c40aeb7862156fa404b965d1724171ec5bb0a00cb1049efbfba79cdcff76278f53e4e27199f1ef9dcb574b0f465b0f4e04bb46c50d516ad0f |
27 |
+DIST gnome-desktop-3.32.2-patchset.tar.xz 7404 BLAKE2B ecc821d3338957d0a123d625607d727019d9500915a76ff6d10d3000e1fc1e51fc7c0382374752582aef641d005cd73d39148466b08c53dc1ce9872e73a21215 SHA512 0471f0a6d9213ea60e867bd4f381575f6a94fa0fde57cc1a360e2d4ef98c11f2f973d3d95347db8f24aacb2249ba84ffc4e35e05bb595d9d3b6debe561ed88da |
28 |
+DIST gnome-desktop-3.32.2.tar.xz 709128 BLAKE2B f0335d1ad583f0b000c47826cd4b6eb24624862b22b00e9d42759ed1cfcf3dba6f091dd85504c9c8da8b9789bf78cf53d284942ba6e2d3c630db028b4a0a69c6 SHA512 7dfa5c3e4b77637cc40e6244eb8ce8cb314cf92d865b64e36c5dffa8a699e91c81bd359f0a89a725c064eafec965d2b9d119aa05f1de103cd836a4bff9119a99 |
29 |
|
30 |
diff --git a/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch b/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..bd4df1ca1a9 |
33 |
--- /dev/null |
34 |
+++ b/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch |
35 |
@@ -0,0 +1,82 @@ |
36 |
+From 9ae847ec875efe443d51d584fa6c61966c7c3c7c Mon Sep 17 00:00:00 2001 |
37 |
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@×××××.org> |
38 |
+Date: Wed, 4 Sep 2019 22:09:26 +0100 |
39 |
+Subject: [PATCH] tests/wall*: Do not fail if some of the locales is missing |
40 |
+ |
41 |
+--- |
42 |
+ tests/wall-clock.c | 14 ++++++++++++++ |
43 |
+ tests/wallclock-reftest.c | 5 +++++ |
44 |
+ 2 files changed, 19 insertions(+) |
45 |
+ |
46 |
+diff --git a/tests/wall-clock.c b/tests/wall-clock.c |
47 |
+index 4937ee66..23929ebd 100644 |
48 |
+--- a/tests/wall-clock.c |
49 |
++++ b/tests/wall-clock.c |
50 |
+@@ -48,6 +48,7 @@ test_utf8_character (const char *utf8_char, |
51 |
+ /* In the C locale, make sure the time string is formatted with regular |
52 |
+ * colons */ |
53 |
+ locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0); |
54 |
++ g_assert_true (locale != (locale_t)0); |
55 |
+ save_locale = uselocale (locale); |
56 |
+ clock = gnome_wall_clock_new (); |
57 |
+ str = gnome_wall_clock_string_for_datetime (clock, |
58 |
+@@ -60,6 +61,10 @@ test_utf8_character (const char *utf8_char, |
59 |
+ |
60 |
+ /* In a UTF8 locale, we want ratio characters and no colons. */ |
61 |
+ locale = newlocale (LC_ALL_MASK, "en_US.utf8", locale); |
62 |
++ if (locale == (locale_t)0) { |
63 |
++ g_test_skip("en_US.utf8 locale not found, skipping"); |
64 |
++ return; |
65 |
++ } |
66 |
+ uselocale (locale); |
67 |
+ clock = gnome_wall_clock_new (); |
68 |
+ str = gnome_wall_clock_string_for_datetime (clock, |
69 |
+@@ -73,6 +78,10 @@ test_utf8_character (const char *utf8_char, |
70 |
+ /* ... and same thing with an RTL locale: should be formatted with |
71 |
+ * ratio characters */ |
72 |
+ locale = newlocale (LC_ALL_MASK, "he_IL.utf8", locale); |
73 |
++ if (locale == (locale_t)0) { |
74 |
++ g_test_skip("he_IL.utf8 locale not found, skipping"); |
75 |
++ return; |
76 |
++ } |
77 |
+ uselocale (locale); |
78 |
+ clock = gnome_wall_clock_new (); |
79 |
+ str = gnome_wall_clock_string_for_datetime (clock, |
80 |
+@@ -112,6 +121,10 @@ test_clock_format_setting (void) |
81 |
+ const char *str; |
82 |
+ |
83 |
+ locale = newlocale (LC_ALL_MASK, "en_US.utf8", (locale_t) 0); |
84 |
++ if (locale == (locale_t)0) { |
85 |
++ g_test_skip("en_US.utf8 locale not found, skipping"); |
86 |
++ return; |
87 |
++ } |
88 |
+ save_locale = uselocale (locale); |
89 |
+ |
90 |
+ settings = g_settings_new ("org.gnome.desktop.interface"); |
91 |
+@@ -192,6 +205,7 @@ test_weekday_setting (void) |
92 |
+ |
93 |
+ /* Save current locale */ |
94 |
+ locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0); |
95 |
++ g_assert_true (locale != (locale_t)0); |
96 |
+ save_locale = uselocale (locale); |
97 |
+ settings = g_settings_new ("org.gnome.desktop.interface"); |
98 |
+ |
99 |
+diff --git a/tests/wallclock-reftest.c b/tests/wallclock-reftest.c |
100 |
+index 8ac630f2..0a7e812d 100644 |
101 |
+--- a/tests/wallclock-reftest.c |
102 |
++++ b/tests/wallclock-reftest.c |
103 |
+@@ -446,6 +446,11 @@ test_ui_file (GFile *file, |
104 |
+ locale = get_locale_for_file (ui_file); |
105 |
+ g_assert (locale); |
106 |
+ loc = newlocale (LC_ALL_MASK, locale, (locale_t) 0); |
107 |
++ if (loc == (locale_t)0) |
108 |
++ { |
109 |
++ g_test_skip("locale not found, skipping"); |
110 |
++ return; |
111 |
++ } |
112 |
+ previous_locale = uselocale (loc); |
113 |
+ g_assert_true (previous_locale != (locale_t) 0); |
114 |
+ |
115 |
+-- |
116 |
+2.20.1 |
117 |
+ |
118 |
|
119 |
diff --git a/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch b/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch |
120 |
new file mode 100644 |
121 |
index 00000000000..7471a3e6a2d |
122 |
--- /dev/null |
123 |
+++ b/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch |
124 |
@@ -0,0 +1,48 @@ |
125 |
+From 1b8fb6b0fd155975f64b5e2ef03bece96a5e3340 Mon Sep 17 00:00:00 2001 |
126 |
+From: Mart Raudsepp <leio@g.o> |
127 |
+Date: Wed, 18 Sep 2019 22:28:21 +0300 |
128 |
+Subject: [PATCH] build: Add optionality for introspection |
129 |
+ |
130 |
+--- |
131 |
+ libgnome-desktop/meson.build | 2 ++ |
132 |
+ meson_options.txt | 4 ++++ |
133 |
+ 2 files changed, 6 insertions(+) |
134 |
+ |
135 |
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build |
136 |
+index c365b448..a7355f31 100644 |
137 |
+--- a/libgnome-desktop/meson.build |
138 |
++++ b/libgnome-desktop/meson.build |
139 |
+@@ -96,6 +96,7 @@ libgnome_desktop_dep = declare_dependency( |
140 |
+ link_with: libgnome_desktop |
141 |
+ ) |
142 |
+ |
143 |
++if get_option('introspection') |
144 |
+ gnome.generate_gir(libgnome_desktop, |
145 |
+ sources: introspection_sources + libgnome_desktop_headers, |
146 |
+ export_packages: 'gnome-desktop-3.0', |
147 |
+@@ -107,6 +108,7 @@ gnome.generate_gir(libgnome_desktop, |
148 |
+ symbol_prefix: 'gnome', |
149 |
+ install: true |
150 |
+ ) |
151 |
++endif |
152 |
+ |
153 |
+ desktop_pc = pkg.generate( |
154 |
+ libraries: libgnome_desktop, |
155 |
+diff --git a/meson_options.txt b/meson_options.txt |
156 |
+index e3402a11..7efe43ce 100644 |
157 |
+--- a/meson_options.txt |
158 |
++++ b/meson_options.txt |
159 |
+@@ -17,6 +17,10 @@ option('debug_tools', |
160 |
+ type: 'boolean', value: true, description: 'Build debug tools' |
161 |
+ ) |
162 |
+ |
163 |
++option('introspection', |
164 |
++ type: 'boolean', value: true, description: 'Whether to build introspection files' |
165 |
++) |
166 |
++ |
167 |
+ option('udev', |
168 |
+ type: 'feature', description: 'Udev support' |
169 |
+ ) |
170 |
+-- |
171 |
+2.20.1 |
172 |
+ |
173 |
|
174 |
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild |
175 |
new file mode 100644 |
176 |
index 00000000000..1bcfa93a380 |
177 |
--- /dev/null |
178 |
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild |
179 |
@@ -0,0 +1,79 @@ |
180 |
+# Copyright 1999-2019 Gentoo Authors |
181 |
+# Distributed under the terms of the GNU General Public License v2 |
182 |
+ |
183 |
+EAPI=7 |
184 |
+inherit gnome.org gnome2-utils meson virtualx xdg |
185 |
+ |
186 |
+DESCRIPTION="Library with common API for various GNOME modules" |
187 |
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/" |
188 |
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
189 |
+ |
190 |
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1+" |
191 |
+SLOT="3/17" # subslot = libgnome-desktop-3 soname version |
192 |
+IUSE="debug gtk-doc +introspection seccomp udev" |
193 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
194 |
+ |
195 |
+# cairo[X] needed for gnome-bg |
196 |
+COMMON_DEPEND=" |
197 |
+ >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] |
198 |
+ >=x11-libs/gtk+-3.3.6:3[X,introspection?] |
199 |
+ >=dev-libs/glib-2.53.0:2 |
200 |
+ >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] |
201 |
+ x11-misc/xkeyboard-config |
202 |
+ app-text/iso-codes |
203 |
+ x11-libs/libX11 |
204 |
+ udev? ( |
205 |
+ sys-apps/hwids |
206 |
+ virtual/libudev:= ) |
207 |
+ seccomp? ( sys-libs/libseccomp ) |
208 |
+ |
209 |
+ x11-libs/cairo:=[X] |
210 |
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
211 |
+" |
212 |
+BDEPEND="${COMMON_DEPEND} |
213 |
+ media-libs/fontconfig |
214 |
+" |
215 |
+RDEPEND="${COMMON_DEPEND} |
216 |
+ seccomp? ( sys-apps/bubblewrap ) |
217 |
+" |
218 |
+DEPEND=" |
219 |
+ app-text/docbook-xml-dtd:4.1.2 |
220 |
+ dev-util/gdbus-codegen |
221 |
+ gtk-doc? ( >=dev-util/gtk-doc-1.14 ) |
222 |
+ dev-util/itstool |
223 |
+ >=sys-devel/gettext-0.19.8 |
224 |
+ x11-base/xorg-proto |
225 |
+ virtual/pkgconfig |
226 |
+" |
227 |
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto |
228 |
+ |
229 |
+PATCHES=( |
230 |
+ # Translation updates and nvidia builtin display detection fix from origin/gnome-3-32 |
231 |
+ "${WORKDIR}"/patches/ |
232 |
+ "${FILESDIR}"/${PV}-optional-introspection.patch # add introspection meson option |
233 |
+ "${FILESDIR}"/${PV}-fix-tests-without-locale.patch # fix tests when he_IL.utf8 or other tested locales not present |
234 |
+) |
235 |
+ |
236 |
+src_prepare() { |
237 |
+ # Don't build manual test programs that will never get run |
238 |
+ sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die |
239 |
+ xdg_src_prepare |
240 |
+} |
241 |
+ |
242 |
+src_configure() { |
243 |
+ local emesonargs=( |
244 |
+ -Dgnome_distributor=Gentoo |
245 |
+ -Ddate_in_gnome_version=true |
246 |
+ -Ddesktop_docs=true |
247 |
+ $(meson_use debug debug_tools) |
248 |
+ $(meson_use introspection) |
249 |
+ $(meson_feature udev) |
250 |
+ $(meson_use gtk-doc gtk_doc) |
251 |
+ -Dinstalled_tests=false |
252 |
+ ) |
253 |
+ meson_src_configure |
254 |
+} |
255 |
+ |
256 |
+src_test() { |
257 |
+ virtx meson_src_test |
258 |
+} |