From 75ca7dddb369cc87a07e65de757a1381c80cbc45 Mon Sep 17 00:00:00 2001 From: "Sicelo A. Mhlongo" Date: Fri, 20 Jun 2025 23:24:06 +0200 Subject: [PATCH] device-nokia-n900: i3wm: package i3blocks config separately i3blocks could be useful on sway. Split it off and package it separately so it can be depended on by a future sway configuration. Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6714 --- device/community/device-nokia-n900/APKBUILD | 43 +++++++++++-------- .../{i3wm => i3blocks}/i3blocks.conf | 0 .../scripts/battery-bq27200 | 0 .../{i3wm => i3blocks}/scripts/calendar | 0 .../{i3wm => i3blocks}/scripts/ofono | 0 .../{i3wm => i3blocks}/scripts/wifi | 0 6 files changed, 24 insertions(+), 19 deletions(-) rename device/community/device-nokia-n900/{i3wm => i3blocks}/i3blocks.conf (100%) rename device/community/device-nokia-n900/{i3wm => i3blocks}/scripts/battery-bq27200 (100%) rename device/community/device-nokia-n900/{i3wm => i3blocks}/scripts/calendar (100%) rename device/community/device-nokia-n900/{i3wm => i3blocks}/scripts/ofono (100%) rename device/community/device-nokia-n900/{i3wm => i3blocks}/scripts/wifi (100%) diff --git a/device/community/device-nokia-n900/APKBUILD b/device/community/device-nokia-n900/APKBUILD index bc97bf8fa..1b88ba63c 100644 --- a/device/community/device-nokia-n900/APKBUILD +++ b/device/community/device-nokia-n900/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sicelo # Co-Maintainer: Danct12 pkgname=device-nokia-n900 -pkgver=43 +pkgver=44 pkgrel=0 pkgdesc="Nokia N900" url="https://postmarketos.org" @@ -32,6 +32,7 @@ install="$pkgname.post-install $pkgname.pre-upgrade" subpackages=" $pkgname-x11 $pkgname-xkeyboard-config:xkeyboard_config + $pkgname-i3blocks $pkgname-i3wm $pkgname-upower $pkgname-openrc @@ -49,14 +50,14 @@ source=" device-nokia-n900.start deviceinfo modules-initfs + i3blocks/i3blocks.conf + i3blocks/scripts/battery-bq27200 + i3blocks/scripts/calendar + i3blocks/scripts/ofono + i3blocks/scripts/wifi i3wm/config-checker - i3wm/i3blocks.conf i3wm/i3wm.conf i3wm/pwr-key-handler.sh - i3wm/scripts/battery-bq27200 - i3wm/scripts/calendar - i3wm/scripts/ofono - i3wm/scripts/wifi keymaps/40-xkb.conf keymaps/rx51_ch.map keymaps/rx51_fise.map @@ -182,16 +183,6 @@ i3wm() { depends="brightnessctl i3blocks rxvt-unicode sxmo-dmenu upower" install -D -m644 "$srcdir"/i3wm.conf \ "$subpkgdir"/etc/xdg/i3/config - install -D -m644 "$srcdir"/i3blocks.conf \ - "$subpkgdir"/etc/xdg/i3blocks/config - install -D -m755 "$srcdir"/battery-bq27200 \ - "$subpkgdir"/usr/share/i3blocks/battery-bq27200 - install -D -m755 "$srcdir"/ofono \ - "$subpkgdir"/usr/share/i3blocks/ofono - install -D -m755 "$srcdir"/calendar \ - "$subpkgdir"/usr/share/i3blocks/calendar - install -D -m755 "$srcdir"/wifi \ - "$subpkgdir"/usr/share/i3blocks/wifi install -D -m755 "$srcdir"/config-checker \ "$subpkgdir"/usr/bin/i3-config-checker install -D -m755 "$srcdir"/pwr-key-handler.sh \ @@ -213,6 +204,20 @@ openrc() { mkdir -p "$subpkgdir" } +i3blocks() { + install_if="$pkgname=$pkgver-r$pkgrel i3blocks" + install -D -m644 "$srcdir"/i3blocks.conf \ + "$subpkgdir"/etc/xdg/i3blocks/config + install -D -m755 "$srcdir"/battery-bq27200 \ + "$subpkgdir"/usr/share/i3blocks/battery-bq27200 + install -D -m755 "$srcdir"/ofono \ + "$subpkgdir"/usr/share/i3blocks/ofono + install -D -m755 "$srcdir"/calendar \ + "$subpkgdir"/usr/share/i3blocks/calendar + install -D -m755 "$srcdir"/wifi \ + "$subpkgdir"/usr/share/i3blocks/wifi +} + sha512sums=" 6b475c12eca8563be48c562a1cb4ad8ca6a05d70fc54b21288b2dd7435a80a6f53351aa870db96d5bbecf1b1c5cb00dfe35f5066e6d3fd0ad0369e66aeef5a21 10-initfs-keymap.files 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910 10-initfs-keymap.sh @@ -226,14 +231,14 @@ c5b8e03ca9f720a794f2593a3e938640cbd91ac44dd761079bbf4614a0d288a9d7b72de8ed2493c0 e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef device-nokia-n900.start bf62c043e2e095ff0adf02f438cc083977a5f475421327916d52aa621fb197e0f375bb338cf21911e547d79297e7bb145da5d23a0975711eee07c44862ff2f61 deviceinfo f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c modules-initfs -d7d1599a9952fd02d3cfbeaa6b3307251e765f98a9eb723237c94f585831cc8f11d9d30dbc0352e3b008224dec12b820cf86fa28a5e5ac303cfd03d80b8872f5 config-checker a8152e94262629e11abdd8809d187c3b7ed1866a6128fb1f435e17e72120536ac8114262e66df6decb2627743027f2b923ddbe8a94e3e844099b6fad02ec252b i3blocks.conf -c95afd02124e53f0de1ef33e7bbee12a15ae2d4d629a201157ed9d428288365241dfc3358fc7055154845f9df986fd975a2ebd4de384b8e175cb45f26b2fa38d i3wm.conf -63ec5a88f4385fd944477d0b7ca7061745b061337cba8d3c779826aa96a94dda79bfca4fb3456234f6adbdb483e660d3cf6ccefd8576d23a70f52e3f44f0edb4 pwr-key-handler.sh 6c6a70667f37807089adbb343c09d1f62d47b8e6c9c0a54f44790b822f8bff3dccae73341ef736b799fd6740bbd6e1f48e6e122c2e08520f71f6ad7434a47d2c battery-bq27200 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d calendar 82038d38f94cb975a8d38914afca49b64957446bef7490ab684efa1df47ede2ea1c769045789bb9fded673345eea01911fbbf85fdb54c28685cad8022bfaafac ofono d7f79fa0887110b85dfb676bd426fa76764fbbb8093df89184552838ddb703b62500f61d7cfa8decdb75a542e3ef577cc71ee4c12ed14d6a76827a3f5aa13073 wifi +d7d1599a9952fd02d3cfbeaa6b3307251e765f98a9eb723237c94f585831cc8f11d9d30dbc0352e3b008224dec12b820cf86fa28a5e5ac303cfd03d80b8872f5 config-checker +c95afd02124e53f0de1ef33e7bbee12a15ae2d4d629a201157ed9d428288365241dfc3358fc7055154845f9df986fd975a2ebd4de384b8e175cb45f26b2fa38d i3wm.conf +63ec5a88f4385fd944477d0b7ca7061745b061337cba8d3c779826aa96a94dda79bfca4fb3456234f6adbdb483e660d3cf6ccefd8576d23a70f52e3f44f0edb4 pwr-key-handler.sh 181187db6d88b872233f594759373f32fd08065ee340b60f0c3ff06396d99f4b1250192d70a054fcc9e51e067f6cc063c62b7d8dfff3427b292f1d0c766db206 40-xkb.conf dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058edc6f87cc2877da2ecafd2f627d9b465d4fd24475fc21fdc71 rx51_ch.map 0a3e58a3a81c463937caf508a76461b4cc43f593f0817a52b6581fdd132cc894c0960fe7b950b6e6bfac1fad15cd9dd230c103fcf08a30b44ef7d8fbe31cea28 rx51_fise.map diff --git a/device/community/device-nokia-n900/i3wm/i3blocks.conf b/device/community/device-nokia-n900/i3blocks/i3blocks.conf similarity index 100% rename from device/community/device-nokia-n900/i3wm/i3blocks.conf rename to device/community/device-nokia-n900/i3blocks/i3blocks.conf diff --git a/device/community/device-nokia-n900/i3wm/scripts/battery-bq27200 b/device/community/device-nokia-n900/i3blocks/scripts/battery-bq27200 similarity index 100% rename from device/community/device-nokia-n900/i3wm/scripts/battery-bq27200 rename to device/community/device-nokia-n900/i3blocks/scripts/battery-bq27200 diff --git a/device/community/device-nokia-n900/i3wm/scripts/calendar b/device/community/device-nokia-n900/i3blocks/scripts/calendar similarity index 100% rename from device/community/device-nokia-n900/i3wm/scripts/calendar rename to device/community/device-nokia-n900/i3blocks/scripts/calendar diff --git a/device/community/device-nokia-n900/i3wm/scripts/ofono b/device/community/device-nokia-n900/i3blocks/scripts/ofono similarity index 100% rename from device/community/device-nokia-n900/i3wm/scripts/ofono rename to device/community/device-nokia-n900/i3blocks/scripts/ofono diff --git a/device/community/device-nokia-n900/i3wm/scripts/wifi b/device/community/device-nokia-n900/i3blocks/scripts/wifi similarity index 100% rename from device/community/device-nokia-n900/i3wm/scripts/wifi rename to device/community/device-nokia-n900/i3blocks/scripts/wifi