From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/
Date: Sun, 8 Sep 2019 16:51:36 +0000 (UTC) [thread overview]
Message-ID: <1567961472.06e2701ad6a511383d000b62f9faa2328800762b.leio@gentoo> (raw)
commit: 06e2701ad6a511383d000b62f9faa2328800762b
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 8 16:49:41 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Sep 8 16:51:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e2701a
gnome-base/dconf: add back env.d to not break conf if gconf present
Needed for the CONFIG_PROTECT_MASK at least, but also still
for GSETTINGS_BACKEND setting, because gnome-base/gconf sets it
to gconf in /etc/env.d/50gconf, thus until gconf still sets it,
we have to set it in dconf too to override it in the higher
numbered env.d entry.
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../dconf/{dconf-0.32.0.ebuild => dconf-0.32.0-r1.ebuild} | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnome-base/dconf/dconf-0.32.0.ebuild b/gnome-base/dconf/dconf-0.32.0-r1.ebuild
similarity index 77%
rename from gnome-base/dconf/dconf-0.32.0.ebuild
rename to gnome-base/dconf/dconf-0.32.0-r1.ebuild
index 2175d3f9748..8e9d9a0257d 100644
--- a/gnome-base/dconf/dconf-0.32.0.ebuild
+++ b/gnome-base/dconf/dconf-0.32.0-r1.ebuild
@@ -42,6 +42,20 @@ src_configure() {
meson_src_configure
}
+src_install() {
+ meson_src_install
+
+ # GSettings backend may be one of: memory, gconf, dconf
+ # Only dconf is really considered functional by upstream
+ # must have it enabled over gconf if both are installed
+ # This snippet can't be removed until gconf package is
+ # ensured to not install a /etc/env.d/50gconf and then
+ # still consider the CONFIG_PROTECT_MASK bit.
+ echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
+ echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
+ doenvd 51dconf
+}
+
src_test() {
virtx meson_src_test
}
next reply other threads:[~2019-09-08 16:51 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-08 16:51 Mart Raudsepp [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-30 15:42 [gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/ Matt Turner
2022-05-19 5:08 WANG Xuerui
2021-05-28 19:18 Sam James
2021-04-12 21:59 Matt Turner
2020-12-04 14:24 Mikle Kolyada
2020-11-14 9:19 Mikle Kolyada
2020-11-06 15:19 Sam James
2020-11-06 6:57 Sam James
2020-11-05 16:16 Sam James
2020-08-31 2:52 Sam James
2020-08-30 18:28 Sam James
2020-07-29 11:23 Mart Raudsepp
2020-07-29 4:49 Sam James
2020-07-18 10:57 Mart Raudsepp
2020-06-07 21:02 Mart Raudsepp
2020-06-03 15:32 Agostino Sarubbo
2020-04-22 14:25 Agostino Sarubbo
2020-04-22 8:44 Agostino Sarubbo
2020-04-22 8:41 Agostino Sarubbo
2020-03-14 22:33 Mart Raudsepp
2020-02-09 15:56 Mart Raudsepp
2020-01-17 13:05 Agostino Sarubbo
2020-01-01 16:06 Mart Raudsepp
2020-01-01 15:25 Agostino Sarubbo
2019-12-09 9:14 Agostino Sarubbo
2019-12-09 9:11 Agostino Sarubbo
2019-12-09 0:10 Aaron Bauman
2019-12-08 11:59 Mikle Kolyada
2019-12-08 11:58 Mikle Kolyada
2019-12-08 11:55 Mikle Kolyada
2019-10-22 6:31 Mart Raudsepp
2019-10-09 8:27 Agostino Sarubbo
2019-06-27 12:35 Agostino Sarubbo
2019-06-17 10:07 Mikle Kolyada
2019-05-10 17:33 Mikle Kolyada
2019-05-09 20:04 Aaron Bauman
2019-02-22 19:13 Mart Raudsepp
2018-06-28 15:05 Mikle Kolyada
2018-04-18 6:18 Mart Raudsepp
2018-02-24 9:21 Michał Górny
2017-12-27 13:02 Mart Raudsepp
2017-12-27 8:35 Markus Meier
2017-12-02 10:41 Sergei Trofimovich
2017-11-23 20:47 Sergei Trofimovich
2017-11-18 13:20 Sergei Trofimovich
2017-11-06 20:49 Tobias Klausmann
2017-11-04 13:04 Sergei Trofimovich
2017-10-25 22:21 Mart Raudsepp
2017-04-02 13:03 Mart Raudsepp
2017-03-16 13:24 Jeroen Roovers
2017-02-24 21:29 Michael Weber
2017-02-24 14:07 Agostino Sarubbo
2017-02-21 9:16 Tobias Klausmann
2017-02-18 14:44 Agostino Sarubbo
2016-12-06 20:28 Markus Meier
2016-09-30 18:23 Gilles Dartiguelongue
2016-06-25 12:22 Pacho Ramos
2016-06-25 12:22 Pacho Ramos
2016-03-20 23:10 Stephen Klimaszewski
2016-02-15 20:10 Dennis Lamm
2015-11-26 22:26 Gilles Dartiguelongue
2015-11-26 22:26 Gilles Dartiguelongue
2015-11-16 14:08 Agostino Sarubbo
2015-10-03 8:34 Markus Meier
2015-09-20 6:11 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1567961472.06e2701ad6a511383d000b62f9faa2328800762b.leio@gentoo \
--to=leio@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox