aboutsummaryrefslogtreecommitdiffstats
path: root/community/openrc-settingsd/use-profiled-instead-of-envd.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/openrc-settingsd/use-profiled-instead-of-envd.patch')
-rw-r--r--community/openrc-settingsd/use-profiled-instead-of-envd.patch16
1 files changed, 10 insertions, 6 deletions
diff --git a/community/openrc-settingsd/use-profiled-instead-of-envd.patch b/community/openrc-settingsd/use-profiled-instead-of-envd.patch
index 67e328b106..6fc7218704 100644
--- a/community/openrc-settingsd/use-profiled-instead-of-envd.patch
+++ b/community/openrc-settingsd/use-profiled-instead-of-envd.patch
@@ -1,15 +1,19 @@
-We don't use env.d in Alpine.
+We use different paths for some files than Gentoo does.
diff --git a/src/localed.c b/src/localed.c
-index 008ed16..4a210b6 100644
+index 008ed16..1e53dae 100644
--- a/src/localed.c
+++ b/src/localed.c
-@@ -1281,7 +1281,7 @@ localed_init (gboolean _read_only)
+@@ -1280,9 +1280,9 @@ localed_init (gboolean _read_only)
+ struct xorg_confd_parser *x11_parser = NULL;
read_only = _read_only;
- kbd_model_map_file = g_file_new_for_path (PKGDATADIR "/kbd-model-map");
+- kbd_model_map_file = g_file_new_for_path (PKGDATADIR "/kbd-model-map");
- locale_file = g_file_new_for_path (SYSCONFDIR "/env.d/02locale");
-+ locale_file = g_file_new_for_path (SYSCONFDIR "/profile.d/02locale.sh");
- keymaps_file = g_file_new_for_path (SYSCONFDIR "/conf.d/keymaps");
+- keymaps_file = g_file_new_for_path (SYSCONFDIR "/conf.d/keymaps");
++ kbd_model_map_file = g_file_new_for_path (PKGDATADIR "/openrc-settingsd/kbd-model-map");
++ locale_file = g_file_new_for_path (SYSCONFDIR "/profile.d/locale");
++ keymaps_file = g_file_new_for_path (SYSCONFDIR "/conf.d/loadkeys");
/* See http://www.gentoo.org/doc/en/xorg-config.xml */
+ x11_gentoo_file = g_file_new_for_path (SYSCONFDIR "/X11/xorg.conf.d/30-keyboard.conf");