1 |
commit: d9e6623e04fe7089bcbac42e39edee715792f541 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 29 06:59:35 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 29 07:02:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e6623e |
7 |
|
8 |
gnome-base/gnome-settings-daemon: bump to 3.24.2, backport memory reduction patches |
9 |
|
10 |
Also rebase the udevrulesdir patch, as it's gotten to fuzzy applying. |
11 |
Unneeded gtk-init removal from plugins that didn't need it patch reduces their |
12 |
private memory usage from ~5MB to 1-2MB (3 plugins, used by gdm and user). |
13 |
CSS theme change patch should give a big win for those that still need gtk_init, |
14 |
but I wasn't able to observe that personally. |
15 |
Grab a color test fixing patch from gnome-3-24 in case it helps, but tests still |
16 |
restricted due to power tests failing. |
17 |
|
18 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
19 |
|
20 |
gnome-base/gnome-settings-daemon/Manifest | 2 +- |
21 |
.../files/3.24.2-fix-color-tests.patch | 85 ++++++++++ |
22 |
...3.24.0-optional.patch => 3.24.2-optional.patch} | 0 |
23 |
.../files/3.24.2-reduce-memory-usage.patch | 177 +++++++++++++++++++++ |
24 |
.../files/3.24.2-remove-unneeded-gtk-init.patch | 77 +++++++++ |
25 |
.../files/3.24.2-udevrulesdir-configure.patch | 48 ++++++ |
26 |
....ebuild => gnome-settings-daemon-3.24.2.ebuild} | 13 +- |
27 |
7 files changed, 398 insertions(+), 4 deletions(-) |
28 |
|
29 |
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest |
30 |
index d8c2242ce76..a5f3d72f07b 100644 |
31 |
--- a/gnome-base/gnome-settings-daemon/Manifest |
32 |
+++ b/gnome-base/gnome-settings-daemon/Manifest |
33 |
@@ -1,2 +1,2 @@ |
34 |
DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 SHA256 0a1c1f9bce59a86617c45f77bd9cb99c6db38b96678a89d7ad2ab6b7bc6a1a01 SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3 WHIRLPOOL edae1afc97a314f3d90c7d77d9a456e74e9fe9059353e15a5a9b8318c32d2ebad792e7c9b7acaf54a8f3ea11a5de629f06d7bdb9cb3d5bff4f0621fe6a50683a |
35 |
-DIST gnome-settings-daemon-3.24.0.tar.xz 1620184 SHA256 4f31a68aebdd4e0c37336306a4eea4cf219d46ed8fc59e3f3081b7a3088900c4 SHA512 94bf904cb424baa4201fc49e7ea978f86c6e7ede74794fefec784ca125e86b949e8ea7585284377a586d73d438a9fcf0ef9d9e0dc26c4fcba60250b384ec797a WHIRLPOOL e86332a1872bff33511d84d213f4ecb11be0510a1d1e87513f35efcc51a56b3c5d0233bb000671ccb3c5f49f975621a35a315b2353ccd3c02aaec135c0f842bb |
36 |
+DIST gnome-settings-daemon-3.24.2.tar.xz 1621368 SHA256 4aa9d72644e3ee8a30096a38986b0e9543fca92f586c561f6c8a11fb8148dcca SHA512 fa75a499750c9e8f8fd2c1af44d033e55f90f97ef39c4159fa58a2957aeae036b4ae505dede6333b640b0dfcd0400eacd3715aeb184fc021c1d787230b1a1f12 WHIRLPOOL 305f16567488b54be4f7ec359f4a1249c18de74e967a410e18fd4bc8b84748bd5146a3bd2b86852d9e6a37bc829b281e79a38c7a3cfcece5f80ae516d062780f |
37 |
|
38 |
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch |
39 |
new file mode 100644 |
40 |
index 00000000000..70069589dae |
41 |
--- /dev/null |
42 |
+++ b/gnome-base/gnome-settings-daemon/files/3.24.2-fix-color-tests.patch |
43 |
@@ -0,0 +1,85 @@ |
44 |
+From 63b73af23efd97de34a9dde58938c5c772040974 Mon Sep 17 00:00:00 2001 |
45 |
+From: Iain Lane <iain@××××××××××××××××.uk> |
46 |
+Date: Fri, 19 May 2017 16:38:07 +0100 |
47 |
+Subject: [PATCH] color: Make the testcase able to run uninstalled |
48 |
+ |
49 |
+Distributions might want to be able to run their tests during package |
50 |
+builds, for example. |
51 |
+ |
52 |
+Compile the schema and set GSETTINGS_SCHEMA_DIR to the build dir. |
53 |
+ |
54 |
+https://bugzilla.gnome.org/show_bug.cgi?id=782170 |
55 |
+--- |
56 |
+ Makefile.am | 2 +- |
57 |
+ plugins/color/Makefile.am | 11 ++++++++++- |
58 |
+ plugins/color/gcm-self-test.c | 6 ++++++ |
59 |
+ 3 files changed, 17 insertions(+), 2 deletions(-) |
60 |
+ |
61 |
+diff --git a/Makefile.am b/Makefile.am |
62 |
+index 0a32954..096c245 100644 |
63 |
+--- a/Makefile.am |
64 |
++++ b/Makefile.am |
65 |
+@@ -2,8 +2,8 @@ NULL = |
66 |
+ |
67 |
+ SUBDIRS = \ |
68 |
+ gnome-settings-daemon \ |
69 |
+- plugins \ |
70 |
+ data \ |
71 |
++ plugins \ |
72 |
+ po \ |
73 |
+ tests \ |
74 |
+ $(NULL) |
75 |
+diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am |
76 |
+index a280ba8..35dcad4 100644 |
77 |
+--- a/plugins/color/Makefile.am |
78 |
++++ b/plugins/color/Makefile.am |
79 |
+@@ -30,6 +30,15 @@ gcm_self_test_LDADD = \ |
80 |
+ |
81 |
+ TESTS = gcm-self-test |
82 |
+ |
83 |
++BUILT_SOURCES = gschemas.compiled |
84 |
++ |
85 |
++CLEANFILES = gschemas.compiled |
86 |
++ |
87 |
++gschemas.compiled: $(top_builddir)/data/org.gnome.settings-daemon.plugins.color.gschema.xml |
88 |
++ $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --schema-file=$< --targetdir=$(builddir) |
89 |
++ |
90 |
++all-am: gschemas.compiled |
91 |
++ |
92 |
+ libexec_PROGRAMS = gsd-color |
93 |
+ gsd_color_SOURCES = \ |
94 |
+ main.c \ |
95 |
+@@ -80,7 +89,7 @@ EXTRA_DIST = \ |
96 |
+ test-data/Lenovo-T61-Internal.bin \ |
97 |
+ test-data/LG-L225W-External.bin |
98 |
+ |
99 |
+-CLEANFILES = \ |
100 |
++CLEANFILES += \ |
101 |
+ $(desktop_DATA) |
102 |
+ |
103 |
+ DISTCLEANFILES = \ |
104 |
+diff --git a/plugins/color/gcm-self-test.c b/plugins/color/gcm-self-test.c |
105 |
+index 83c06c5..3f00b60 100644 |
106 |
+--- a/plugins/color/gcm-self-test.c |
107 |
++++ b/plugins/color/gcm-self-test.c |
108 |
+@@ -281,11 +281,17 @@ gcm_test_frac_day (void) |
109 |
+ int |
110 |
+ main (int argc, char **argv) |
111 |
+ { |
112 |
++ char *schema_dir; |
113 |
++ |
114 |
+ g_setenv ("GSETTINGS_BACKEND", "memory", TRUE); |
115 |
+ |
116 |
+ gtk_init (&argc, &argv); |
117 |
+ g_test_init (&argc, &argv, NULL); |
118 |
+ |
119 |
++ schema_dir = g_test_build_filename (G_TEST_BUILT, "", NULL); |
120 |
++ g_setenv("GSETTINGS_SCHEMA_DIR", schema_dir, TRUE); |
121 |
++ g_free (schema_dir); |
122 |
++ |
123 |
+ g_test_add_func ("/color/edid", gcm_test_edid_func); |
124 |
+ g_test_add_func ("/color/sunset-sunrise", gcm_test_sunset_sunrise); |
125 |
+ g_test_add_func ("/color/sunset-sunrise/fractional-timezone", gcm_test_sunset_sunrise_fractional_timezone); |
126 |
+-- |
127 |
+2.10.2 |
128 |
+ |
129 |
|
130 |
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.24.0-optional.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch |
131 |
similarity index 100% |
132 |
rename from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.24.0-optional.patch |
133 |
rename to gnome-base/gnome-settings-daemon/files/3.24.2-optional.patch |
134 |
|
135 |
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch |
136 |
new file mode 100644 |
137 |
index 00000000000..9e683b06d3b |
138 |
--- /dev/null |
139 |
+++ b/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch |
140 |
@@ -0,0 +1,177 @@ |
141 |
+From 386f456eda7a027dfc706ebb675602d6f067f5c6 Mon Sep 17 00:00:00 2001 |
142 |
+From: Christian Hergert <chergert@××××××.com> |
143 |
+Date: Mon, 27 Mar 2017 00:17:59 -0700 |
144 |
+Subject: [PATCH 5/5] common: avoid loading Adwaita CSS theme into memory |
145 |
+ |
146 |
+The various Gtk programs are not dependent on any specific theme being |
147 |
+loaded. Therefore, the parsing the Adwaita CSS theme (which is quite a |
148 |
+detailed theme) is unnecessary and a few MB of overhead to each gsd |
149 |
+subprocess. |
150 |
+ |
151 |
+By setting the GTK_THEME environment variable in main() and providing an |
152 |
+alternate CSS file (which is empty), we can force Gtk to never load the |
153 |
+default theme, but instead our empty theme. This is important as otherwise |
154 |
+GtkSettings can force-load Adwaita upon first use, and that fragments the |
155 |
+heap. |
156 |
+ |
157 |
+https://bugzilla.gnome.org/show_bug.cgi?id=780555 |
158 |
+--- |
159 |
+ configure.ac | 1 + |
160 |
+ plugins/common/Makefile.am | 10 ++++++++++ |
161 |
+ plugins/common/Makefile.am.gresources | 34 ++++++++++++++++++++++++++++++++++ |
162 |
+ plugins/common/daemon-skeleton-gtk.h | 28 ++++++++++++++++++++++++++++ |
163 |
+ plugins/common/gsd.gresources.xml | 6 ++++++ |
164 |
+ plugins/common/gtk.css | 0 |
165 |
+ 6 files changed, 79 insertions(+) |
166 |
+ create mode 100644 plugins/common/Makefile.am.gresources |
167 |
+ create mode 100644 plugins/common/gsd.gresources.xml |
168 |
+ create mode 100644 plugins/common/gtk.css |
169 |
+ |
170 |
+diff --git a/configure.ac b/configure.ac |
171 |
+index 475821d..df86831 100644 |
172 |
+--- a/configure.ac |
173 |
++++ b/configure.ac |
174 |
+@@ -73,6 +73,7 @@ AC_SUBST([GSD_PLUGIN_LDFLAGS]) |
175 |
+ |
176 |
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) |
177 |
+ AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) |
178 |
++AC_PATH_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources]) |
179 |
+ |
180 |
+ LT_LIB_M |
181 |
+ AC_SUBST(LIBM) |
182 |
+diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am |
183 |
+index 239c601..706be12 100644 |
184 |
+--- a/plugins/common/Makefile.am |
185 |
++++ b/plugins/common/Makefile.am |
186 |
+@@ -33,6 +33,8 @@ libcommon_la_SOURCES = \ |
187 |
+ gsd-device-mapper.h \ |
188 |
+ gsd-input-helper.c \ |
189 |
+ gsd-input-helper.h \ |
190 |
++ gsd-resources.c \ |
191 |
++ gsd-resources.h \ |
192 |
+ gsd-settings-migrate.c \ |
193 |
+ gsd-settings-migrate.h \ |
194 |
+ gsd-shell-helper.c \ |
195 |
+@@ -68,3 +70,11 @@ EXTRA_DIST = $(scripts_DATA) daemon-skeleton.h daemon-skeleton-gtk.h |
196 |
+ |
197 |
+ CLEANFILES = \ |
198 |
+ $(GSD_COMMON_ENUM_FILES) |
199 |
++ |
200 |
++DISTCLEANFILES = |
201 |
++ |
202 |
++glib_resources_c = gsd-resources.c |
203 |
++glib_resources_h = gsd-resources.h |
204 |
++glib_resources_xml = gsd.gresources.xml |
205 |
++glib_resources_namespace = gsd |
206 |
++include Makefile.am.gresources |
207 |
+diff --git a/plugins/common/Makefile.am.gresources b/plugins/common/Makefile.am.gresources |
208 |
+new file mode 100644 |
209 |
+index 0000000..1441d0e |
210 |
+--- /dev/null |
211 |
++++ b/plugins/common/Makefile.am.gresources |
212 |
+@@ -0,0 +1,34 @@ |
213 |
++resources_xml=$(addprefix $(srcdir)/,$(glib_resources_xml)) |
214 |
++resources_srcdir=$(dir $(resources_xml)) |
215 |
++ |
216 |
++DISTCLEANFILES += $(glib_resources_h) $(glib_resources_c) |
217 |
++BUILT_SOURCES += $(glib_resources_h) $(glib_resources_c) |
218 |
++CLEANFILES += stamp-resources $(glib_resources_c) $(glib_resources_h) |
219 |
++EXTRA_DIST += \ |
220 |
++ $(glib_resources_xml) \ |
221 |
++ $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(resources_srcdir) --generate-dependencies $(resources_xml)) \ |
222 |
++ $(NULL) |
223 |
++ |
224 |
++stamp-resources: $(glib_resources_c) $(resources_xml) |
225 |
++ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \ |
226 |
++ --target=xgen-gr.h \ |
227 |
++ --sourcedir=$(resources_srcdir) \ |
228 |
++ --generate-header \ |
229 |
++ --c-name $(glib_resources_namespace) \ |
230 |
++ $(resources_xml) \ |
231 |
++ && (cmp -s xgen-gr.h $(glib_resources_h) || cp -f xgen-gr.h $(glib_resources_h)) \ |
232 |
++ && rm -f xgen-gr.h \ |
233 |
++ && echo timestamp > $(@F) |
234 |
++ |
235 |
++$(glib_resources_h): stamp-resources |
236 |
++ @true |
237 |
++ |
238 |
++$(glib_resources_c): $(resources_xml) $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(resources_srcdir) --generate-dependencies $(resources_xml)) |
239 |
++ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \ |
240 |
++ --target=xgen-gr.c \ |
241 |
++ --sourcedir=$(resources_srcdir) \ |
242 |
++ --generate-source \ |
243 |
++ --c-name $(glib_resources_namespace) \ |
244 |
++ $(resources_xml) \ |
245 |
++ && (cmp -s xgen-gr.c $(glib_resources_c) || cp -f xgen-gr.c $(glib_resources_c)) \ |
246 |
++ && rm -f xgen-gr.c |
247 |
+diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h |
248 |
+index 3bfd618..3ba0422 100644 |
249 |
+--- a/plugins/common/daemon-skeleton-gtk.h |
250 |
++++ b/plugins/common/daemon-skeleton-gtk.h |
251 |
+@@ -163,6 +163,30 @@ register_with_gnome_session (void) |
252 |
+ NULL); |
253 |
+ } |
254 |
+ |
255 |
++static void |
256 |
++set_empty_gtk_theme (gboolean set) |
257 |
++{ |
258 |
++ static char *old_gtk_theme = NULL; |
259 |
++ |
260 |
++ if (set) { |
261 |
++ /* Override GTK_THEME to reduce overhead of CSS engine. By using |
262 |
++ * GTK_THEME environment variable, GtkSettings is not allowed to |
263 |
++ * initially parse the Adwaita theme. |
264 |
++ * |
265 |
++ * https://bugzilla.gnome.org/show_bug.cgi?id=780555 */ |
266 |
++ old_gtk_theme = g_strdup (g_getenv ("GTK_THEME")); |
267 |
++ g_setenv ("GTK_THEME", "Disabled", TRUE); |
268 |
++ } else { |
269 |
++ /* GtkSettings has loaded, so we can drop GTK_THEME used to initialize |
270 |
++ * our internal theme. Only the main thread accesses the GTK_THEME |
271 |
++ * environment variable, so this is safe to release. */ |
272 |
++ if (old_gtk_theme != NULL) |
273 |
++ g_setenv ("GTK_THEME", old_gtk_theme, TRUE); |
274 |
++ else |
275 |
++ g_unsetenv ("GTK_THEME"); |
276 |
++ } |
277 |
++} |
278 |
++ |
279 |
+ int |
280 |
+ main (int argc, char **argv) |
281 |
+ { |
282 |
+@@ -172,6 +196,8 @@ main (int argc, char **argv) |
283 |
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |
284 |
+ textdomain (GETTEXT_PACKAGE); |
285 |
+ |
286 |
++ set_empty_gtk_theme (TRUE); |
287 |
++ |
288 |
+ /* Work around https://bugzilla.gnome.org/show_bug.cgi?id=674885 */ |
289 |
+ g_type_ensure (G_TYPE_DBUS_CONNECTION); |
290 |
+ g_type_ensure (G_TYPE_DBUS_PROXY); |
291 |
+@@ -187,6 +213,8 @@ main (int argc, char **argv) |
292 |
+ exit (1); |
293 |
+ } |
294 |
+ |
295 |
++ set_empty_gtk_theme (FALSE); |
296 |
++ |
297 |
+ if (verbose) |
298 |
+ g_setenv ("G_MESSAGES_DEBUG", "all", TRUE); |
299 |
+ |
300 |
+diff --git a/plugins/common/gsd.gresources.xml b/plugins/common/gsd.gresources.xml |
301 |
+new file mode 100644 |
302 |
+index 0000000..e4ac1cd |
303 |
+--- /dev/null |
304 |
++++ b/plugins/common/gsd.gresources.xml |
305 |
+@@ -0,0 +1,6 @@ |
306 |
++<?xml version="1.0" encoding="UTF-8"?> |
307 |
++<gresources> |
308 |
++ <gresource prefix="/org/gtk/libgtk/theme/Disabled"> |
309 |
++ <file>gtk.css</file> |
310 |
++ </gresource> |
311 |
++</gresources> |
312 |
+diff --git a/plugins/common/gtk.css b/plugins/common/gtk.css |
313 |
+new file mode 100644 |
314 |
+index 0000000..e69de29 |
315 |
+-- |
316 |
+2.10.2 |
317 |
+ |
318 |
|
319 |
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch |
320 |
new file mode 100644 |
321 |
index 00000000000..e47ba34c60d |
322 |
--- /dev/null |
323 |
+++ b/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch |
324 |
@@ -0,0 +1,77 @@ |
325 |
+From b567ec92d5b3004ad52fa02fb02990fcafb63373 Mon Sep 17 00:00:00 2001 |
326 |
+From: Bastien Nocera <hadess@××××××.net> |
327 |
+Date: Mon, 27 Mar 2017 18:47:54 +0200 |
328 |
+Subject: [PATCH 1/3] housekeeping: Don't init GTK+ |
329 |
+ |
330 |
+We don't use it. |
331 |
+ |
332 |
+https://bugzilla.gnome.org/show_bug.cgi?id=780555 |
333 |
+--- |
334 |
+ plugins/housekeeping/main.c | 2 +- |
335 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
336 |
+ |
337 |
+diff --git a/plugins/housekeeping/main.c b/plugins/housekeeping/main.c |
338 |
+index 5ccd83d..89c12f7 100644 |
339 |
+--- a/plugins/housekeeping/main.c |
340 |
++++ b/plugins/housekeeping/main.c |
341 |
+@@ -4,4 +4,4 @@ |
342 |
+ #define MANAGER GsdHousekeepingManager |
343 |
+ #include "gsd-housekeeping-manager.h" |
344 |
+ |
345 |
+-#include "daemon-skeleton-gtk.h" |
346 |
++#include "daemon-skeleton.h" |
347 |
+-- |
348 |
+2.10.2 |
349 |
+ |
350 |
+ |
351 |
+From 92d45cd2ce2c4f252db21993f30777433ed84623 Mon Sep 17 00:00:00 2001 |
352 |
+From: Bastien Nocera <hadess@××××××.net> |
353 |
+Date: Mon, 27 Mar 2017 18:49:35 +0200 |
354 |
+Subject: [PATCH 2/3] print-notifications: Don't init GTK+ |
355 |
+ |
356 |
+We don't use it. |
357 |
+ |
358 |
+https://bugzilla.gnome.org/show_bug.cgi?id=780555 |
359 |
+--- |
360 |
+ plugins/print-notifications/main.c | 2 +- |
361 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
362 |
+ |
363 |
+diff --git a/plugins/print-notifications/main.c b/plugins/print-notifications/main.c |
364 |
+index 57155d0..a0dd406 100644 |
365 |
+--- a/plugins/print-notifications/main.c |
366 |
++++ b/plugins/print-notifications/main.c |
367 |
+@@ -4,4 +4,4 @@ |
368 |
+ #define MANAGER GsdPrintNotificationsManager |
369 |
+ #include "gsd-print-notifications-manager.h" |
370 |
+ |
371 |
+-#include "daemon-skeleton-gtk.h" |
372 |
++#include "daemon-skeleton.h" |
373 |
+-- |
374 |
+2.10.2 |
375 |
+ |
376 |
+ |
377 |
+From e7e4b2145efebf132f1398da77790849becd7f6b Mon Sep 17 00:00:00 2001 |
378 |
+From: Bastien Nocera <hadess@××××××.net> |
379 |
+Date: Mon, 27 Mar 2017 18:50:01 +0200 |
380 |
+Subject: [PATCH 3/3] wacom: Don't init GTK+ |
381 |
+ |
382 |
+We don't use it. |
383 |
+ |
384 |
+https://bugzilla.gnome.org/show_bug.cgi?id=780555 |
385 |
+--- |
386 |
+ plugins/wacom/main.c | 2 +- |
387 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
388 |
+ |
389 |
+diff --git a/plugins/wacom/main.c b/plugins/wacom/main.c |
390 |
+index a19a71b..ad1367c 100644 |
391 |
+--- a/plugins/wacom/main.c |
392 |
++++ b/plugins/wacom/main.c |
393 |
+@@ -4,4 +4,4 @@ |
394 |
+ #define MANAGER GsdWacomManager |
395 |
+ #include "gsd-wacom-manager.h" |
396 |
+ |
397 |
+-#include "daemon-skeleton-gtk.h" |
398 |
++#include "daemon-skeleton.h" |
399 |
+-- |
400 |
+2.10.2 |
401 |
+ |
402 |
|
403 |
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch |
404 |
new file mode 100644 |
405 |
index 00000000000..16988f945d2 |
406 |
--- /dev/null |
407 |
+++ b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch |
408 |
@@ -0,0 +1,48 @@ |
409 |
+From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001 |
410 |
+From: Mart Raudsepp <leio@g.o> |
411 |
+Date: Mon, 29 May 2017 00:38:57 +0300 |
412 |
+Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config |
413 |
+ |
414 |
+Use the standard way to find the udev rules directory via pkg-config by default, |
415 |
+and support specifying it, should it be necessary. |
416 |
+This is the same logic as in colord. |
417 |
+--- |
418 |
+ configure.ac | 9 +++++++++ |
419 |
+ plugins/rfkill/Makefile.am | 1 - |
420 |
+ 2 files changed, 9 insertions(+), 1 deletion(-) |
421 |
+ |
422 |
+diff --git a/configure.ac b/configure.ac |
423 |
+index 1107578..475821d 100644 |
424 |
+--- a/configure.ac |
425 |
++++ b/configure.ac |
426 |
+@@ -104,6 +104,15 @@ fi |
427 |
+ AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes) |
428 |
+ |
429 |
+ dnl --------------------------------------------------------------------------- |
430 |
++dnl - Where to install udev rules |
431 |
++dnl --------------------------------------------------------------------------- |
432 |
++AC_ARG_WITH([udevrulesdir], |
433 |
++ AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]), |
434 |
++ [], |
435 |
++ [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d]) |
436 |
++AC_SUBST([udevrulesdir], [$with_udevrulesdir]) |
437 |
++ |
438 |
++dnl --------------------------------------------------------------------------- |
439 |
+ dnl - ALSA integration (default enabled) |
440 |
+ dnl --------------------------------------------------------------------------- |
441 |
+ ALSA_PKG="" |
442 |
+diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am |
443 |
+index 3c5ec47..bfc34c6 100644 |
444 |
+--- a/plugins/rfkill/Makefile.am |
445 |
++++ b/plugins/rfkill/Makefile.am |
446 |
+@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) |
447 |
+ org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile |
448 |
+ $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ |
449 |
+ |
450 |
+-udevrulesdir = $(prefix)/lib/udev/rules.d |
451 |
+ udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules |
452 |
+ |
453 |
+ EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files) |
454 |
+-- |
455 |
+2.10.2 |
456 |
+ |
457 |
|
458 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.2.ebuild |
459 |
similarity index 87% |
460 |
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild |
461 |
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.2.ebuild |
462 |
index 640a918763b..a64ae5b90a5 100644 |
463 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild |
464 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.2.ebuild |
465 |
@@ -4,7 +4,8 @@ |
466 |
EAPI=6 |
467 |
GNOME2_EAUTORECONF="yes" |
468 |
GNOME2_LA_PUNT="yes" |
469 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
470 |
+#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 |
471 |
+PYTHON_COMPAT=( python2_7 ) |
472 |
|
473 |
inherit gnome2 python-any-r1 systemd udev virtualx |
474 |
|
475 |
@@ -99,9 +100,15 @@ RESTRICT="test" |
476 |
|
477 |
PATCHES=( |
478 |
# Make colord and wacom optional; requires eautoreconf |
479 |
- "${FILESDIR}"/${P}-optional.patch |
480 |
+ "${FILESDIR}"/${PV}-optional.patch |
481 |
# Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf |
482 |
- "${FILESDIR}"/3.22.2-udevrulesdir-configure.patch |
483 |
+ "${FILESDIR}"/${PV}-udevrulesdir-configure.patch |
484 |
+ # Fix uninstalled (during build) color plugin test run |
485 |
+ "${FILESDIR}"/${PV}-fix-color-tests.patch |
486 |
+ # Reduce memory usage by not initing GTK+ where not needed |
487 |
+ "${FILESDIR}"/${PV}-remove-unneeded-gtk-init.patch |
488 |
+ # Reduce memory usage by using a fake CSS theme instead of full Adwaita for GTK+ needing plugins; requires eautoreconf |
489 |
+ "${FILESDIR}"/${PV}-reduce-memory-usage.patch |
490 |
) |
491 |
|
492 |
python_check_deps() { |