diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2019-11-21 22:40:18 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-11-29 14:51:56 +0000 |
| commit | 455ac177a191af6c8c3a9586c2dad1d17c4cf58b (patch) | |
| tree | df4355dc7a4abc06f23ab6424b8c2b10e2084671 /community | |
| parent | 55464083de768e34737154e10544bb0be12bcf04 (diff) | |
| download | aports-455ac177a191af6c8c3a9586c2dad1d17c4cf58b.tar.bz2 aports-455ac177a191af6c8c3a9586c2dad1d17c4cf58b.tar.xz | |
community/openrc-settingsd: fix keymap and locale path
Diffstat (limited to 'community')
| -rw-r--r-- | community/openrc-settingsd/APKBUILD | 4 | ||||
| -rw-r--r-- | community/openrc-settingsd/use-profiled-instead-of-envd.patch | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/community/openrc-settingsd/APKBUILD b/community/openrc-settingsd/APKBUILD index d45bbe47ae..16e9098734 100644 --- a/community/openrc-settingsd/APKBUILD +++ b/community/openrc-settingsd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=openrc-settingsd pkgver=1.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="System settings D-Bus service for OpenRC" url="https://gitweb.gentoo.org/proj/openrc-settingsd.git" arch="all" @@ -42,4 +42,4 @@ package() { } sha512sums="bca589de7d2c96d8d15d93882b7296523a0d6301fe1d33f7fc03386544b5c050f2d819b9e1f005ee10a794883175ea1b1172411aad3598f967a6a5677a5c4aad openrc-settingsd-1.0.1.tar.gz -bb0415eee6ec86cdf4c19abe6a83ae0890a1393fbf7ee2f4d96384556ad1fc6e3d3db93a1fcfad94bfef0b447bcdf7e32019ceac54a3e30d30ee22c4b4c2f36e use-profiled-instead-of-envd.patch" +71e2c01120b4b30af7988129aeea5c61fbc273f169b50e09809519a93910e22aedea71682328b32d6da1e3106a75595b0bf5c3ab38ed3c9f8ffb179f29adf83a use-profiled-instead-of-envd.patch" 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"); |