1 |
commit: 06e2701ad6a511383d000b62f9faa2328800762b |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 8 16:49:41 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 8 16:51:12 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e2701a |
7 |
|
8 |
gnome-base/dconf: add back env.d to not break conf if gconf present |
9 |
|
10 |
Needed for the CONFIG_PROTECT_MASK at least, but also still |
11 |
for GSETTINGS_BACKEND setting, because gnome-base/gconf sets it |
12 |
to gconf in /etc/env.d/50gconf, thus until gconf still sets it, |
13 |
we have to set it in dconf too to override it in the higher |
14 |
numbered env.d entry. |
15 |
|
16 |
Package-Manager: Portage-2.3.69, Repoman-2.3.12 |
17 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
18 |
|
19 |
.../dconf/{dconf-0.32.0.ebuild => dconf-0.32.0-r1.ebuild} | 14 ++++++++++++++ |
20 |
1 file changed, 14 insertions(+) |
21 |
|
22 |
diff --git a/gnome-base/dconf/dconf-0.32.0.ebuild b/gnome-base/dconf/dconf-0.32.0-r1.ebuild |
23 |
similarity index 77% |
24 |
rename from gnome-base/dconf/dconf-0.32.0.ebuild |
25 |
rename to gnome-base/dconf/dconf-0.32.0-r1.ebuild |
26 |
index 2175d3f9748..8e9d9a0257d 100644 |
27 |
--- a/gnome-base/dconf/dconf-0.32.0.ebuild |
28 |
+++ b/gnome-base/dconf/dconf-0.32.0-r1.ebuild |
29 |
@@ -42,6 +42,20 @@ src_configure() { |
30 |
meson_src_configure |
31 |
} |
32 |
|
33 |
+src_install() { |
34 |
+ meson_src_install |
35 |
+ |
36 |
+ # GSettings backend may be one of: memory, gconf, dconf |
37 |
+ # Only dconf is really considered functional by upstream |
38 |
+ # must have it enabled over gconf if both are installed |
39 |
+ # This snippet can't be removed until gconf package is |
40 |
+ # ensured to not install a /etc/env.d/50gconf and then |
41 |
+ # still consider the CONFIG_PROTECT_MASK bit. |
42 |
+ echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf |
43 |
+ echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf |
44 |
+ doenvd 51dconf |
45 |
+} |
46 |
+ |
47 |
src_test() { |
48 |
virtx meson_src_test |
49 |
} |