diff options
| author | Luca Weiss <luca@z3ntu.xyz> | 2023-06-06 16:48:16 +0000 |
|---|---|---|
| committer | psykose <alice@ayaya.dev> | 2023-06-06 18:48:16 +0200 |
| commit | 45eff090f6e616008222fe0699e9f297f508689a (patch) | |
| tree | bae4151ba6594bb19dd2be65fdfd16af3fbd00ce | |
| parent | abb75cc23c53d625648a943f2de40bf7b1ce4702 (diff) | |
community/openrc-settingsd: upgrade to 1.4.0
| -rw-r--r-- | community/openrc-settingsd/APKBUILD | 12 | ||||
| -rw-r--r-- | community/openrc-settingsd/use-profiled-instead-of-envd.patch | 19 |
2 files changed, 5 insertions, 26 deletions
diff --git a/community/openrc-settingsd/APKBUILD b/community/openrc-settingsd/APKBUILD index eb1b4891d9f..f4f0417dfb2 100644 --- a/community/openrc-settingsd/APKBUILD +++ b/community/openrc-settingsd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=openrc-settingsd -pkgver=1.2.0 -pkgrel=1 +pkgver=1.4.0 +pkgrel=0 pkgdesc="System settings D-Bus service for OpenRC" url="https://gitlab.com/postmarketOS/openrc-settingsd" arch="all" @@ -18,13 +18,12 @@ makedepends=" " install="$pkgname.post-install $pkgname.post-upgrade" subpackages="$pkgname-doc $pkgname-openrc" -source="https://gitlab.com/postmarketOS/openrc-settingsd/-/archive/v$pkgver/openrc-settingsd-v$pkgver.tar.gz - use-profiled-instead-of-envd.patch - " +source="https://gitlab.com/postmarketOS/openrc-settingsd/-/archive/v$pkgver/openrc-settingsd-v$pkgver.tar.gz" builddir="$srcdir/$pkgname-v$pkgver" build() { abuild-meson \ + -Denv-update= \ . output meson compile -C output } @@ -41,6 +40,5 @@ package() { } sha512sums=" -e7bd0561febfd61be3b139c74e9f0fd89aa21d9975d7e89199d4a0cbb4de51e90cd977550494aaabcb3e6d24ff7f30fe32e4df19e252d437deaae996551eea8d openrc-settingsd-v1.2.0.tar.gz -d06d691c1ef52c0e4c5d68ad7d25eba73ad8fffa3d3675f5c79ff93808131c11f4dbbd13db64c463bb87ec8ebed143878703ba281e1241947d66fcad48063e56 use-profiled-instead-of-envd.patch +6a46288cc9a255a09f8de894f49e6b8db535e03760ceee25d9f47a463a87e63167b2a2d67ba5e6bf1019d02fae073139f4637195800e21a848287aad47e9d5da openrc-settingsd-v1.4.0.tar.gz " diff --git a/community/openrc-settingsd/use-profiled-instead-of-envd.patch b/community/openrc-settingsd/use-profiled-instead-of-envd.patch deleted file mode 100644 index c1cc6301867..00000000000 --- a/community/openrc-settingsd/use-profiled-instead-of-envd.patch +++ /dev/null @@ -1,19 +0,0 @@ -We use different paths for some files than Gentoo does. - -diff --git a/src/localed.c b/src/localed.c -index 008ed16..1e53dae 100644 ---- a/src/localed.c -+++ b/src/localed.c -@@ -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"); -- locale_file = g_file_new_for_path (SYSCONFDIR "/env.d/02locale"); -- 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.sh"); -+ 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"); |