Include dconf module to share dconf with host
Copied from 37b58e77cb/build-aux/ca.desrt.dconf-editor.json
This commit is contained in:
parent
e2ba7444ba
commit
d732a1eb07
|
|
@ -1 +0,0 @@
|
|||
3.11.9
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
diff --git a/engine/dconf-engine-source-user.c b/engine/dconf-engine-source-user.c
|
||||
index 1657875..e4f8786 100644
|
||||
--- a/engine/dconf-engine-source-user.c
|
||||
+++ b/engine/dconf-engine-source-user.c
|
||||
@@ -39,11 +39,17 @@ dconf_engine_source_user_open_gvdb (const gchar *name)
|
||||
{
|
||||
GvdbTable *table;
|
||||
gchar *filename;
|
||||
+ const gchar *override;
|
||||
+
|
||||
+ override = g_getenv ("DCONF_USER_CONFIG_DIR");
|
||||
+ if (override == NULL)
|
||||
+ filename = g_build_filename (g_get_user_config_dir (), "dconf", name, NULL);
|
||||
+ else
|
||||
+ filename = g_build_filename (g_get_home_dir (), override, name, NULL);
|
||||
|
||||
/* This can fail in the normal case of the user not having any
|
||||
* settings. That's OK and it shouldn't be considered as an error.
|
||||
*/
|
||||
- filename = g_build_filename (g_get_user_config_dir (), "dconf", name, NULL);
|
||||
table = gvdb_table_new (filename, FALSE, NULL);
|
||||
g_free (filename);
|
||||
|
||||
|
|
@ -11,11 +11,10 @@
|
|||
"--device=dri",
|
||||
"--socket=wayland",
|
||||
"--device=shm",
|
||||
"--talk-name=com.xronlinux.BreezyDesktop",
|
||||
"--filesystem=xdg-run/dconf",
|
||||
"--filesystem=~/.config/dconf:create",
|
||||
"--talk-name=ca.desrt.dconf",
|
||||
"--env=DCONF_USER_CONFIG_DIR=.config/dconf"
|
||||
"--filesystem=xdg-run/dconf",
|
||||
"--env=DCONF_USER_CONFIG_DIR=.config/dconf",
|
||||
"--env=GIO_EXTRA_MODULES=/app/lib/gio/modules/"
|
||||
],
|
||||
"cleanup" : [
|
||||
"/include",
|
||||
|
|
@ -29,14 +28,40 @@
|
|||
"*.a"
|
||||
],
|
||||
"modules" : [
|
||||
{
|
||||
"name": "dconf",
|
||||
"buildsystem": "meson",
|
||||
"config-opts": [
|
||||
"-Dbash_completion=false",
|
||||
"-Dman=false",
|
||||
"-Dsystemduserunitdir=' '"
|
||||
],
|
||||
"cleanup": [
|
||||
"/include",
|
||||
"/lib/pkgconfig",
|
||||
"/libexec",
|
||||
"/share/dbus-1"
|
||||
],
|
||||
"sources": [
|
||||
{
|
||||
"type": "archive",
|
||||
"url": "https://download.gnome.org/sources/dconf/0.40/dconf-0.40.0.tar.xz",
|
||||
"sha256": "cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533"
|
||||
},
|
||||
{
|
||||
"type": "patch",
|
||||
"path": "build-aux/dconf-override.patch"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name" : "breezydesktop",
|
||||
"builddir" : true,
|
||||
"buildsystem" : "meson",
|
||||
"sources" : [
|
||||
{
|
||||
"type" : "git",
|
||||
"url" : "file:///home/wayne/Projects"
|
||||
"type" : "dir",
|
||||
"url" : "../"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue