extra-repos/systemd/gnome-shell-mobile/APKBUILD

 # Forked from Alpine to add phone adaptivity patches and systemd!
 
 pkgname=gnome-shell-mobile
-pkgver=99946.0
-_pkgver=46.0
+pkgver=99946.1
+_pkgver=46.1
 pkgrel=0
 pkgdesc="GNOME shell mobile"
 url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -74,7 +74,7 @@ subpackages="
 	$pkgname-schemas::noarch
 	gnome-mobile-extensions-app:extensions_app:noarch
 	"
-_commit="46-mobile-0"
+_commit="46-mobile.1"
 _gvc_commit="8e7a5a4c3e51007ce6579292642517e3d3eb9c50"
 source="gnome-shell-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-shell-mobile/-/archive/$_commit/gnome-shell-mobile-$_commit.tar.gz
 	libgnome-volume-control-$_gvc_commit.tar.gz::https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/gnome-shell-$_gvc_commit.tar.gz
@@ -95,6 +95,7 @@ prepare() {
 	mv "$srcdir/libgnome-volume-control-$_gvc_commit" $builddir/subprojects/gvc
 
 	sed -i "s/mutter_api_version = '.*'/mutter_api_version = '99'/g" meson.build
+	sed -i "s/version: '$_commit'/version: '$_pkgver'/g" meson.build
 }
 
 build() {
@@ -143,7 +144,7 @@ package() {
 }
 
 sha512sums="
-56ab61732f7d477af37347f2c1e5070ed4eab6b1e020f94014fdaf2e3c1d002d43830d28ff8227a9332b5f3be82eed9901fee4afce10c0c40e5e3fbff3d2e6b8  gnome-shell-mobile-46-mobile-0.tar.gz
+aeca65c373979eacf73aff169b69f3cefa8f457a04e641481f79a3a6e398a51d3ccfc6c7a94ae4a81486dd08fb7b600b2a949efc9272ab17ae9719fc7fe35740  gnome-shell-mobile-46-mobile.1.tar.gz
 ebc6985afbda5ddebcda44d8b6732a9abc2d7249aff3adf7a76a90aa681590f830dcf2e5f3534a624adc32d1f0445e261ee149d65c221f733e0c33e0690a004d  libgnome-volume-control-8e7a5a4c3e51007ce6579292642517e3d3eb9c50.tar.gz
 40cafbd0da2f2a40ff9e9db1026179d52a3b296a81fa43a98e433c0919800f0ec5231fcad32d523b8f01b8f7c0205dce1332e48493b0101ad02dae9469ac3de0  gsh.patch
 "

extra-repos/systemd/kactivitymanagerd/APKBUILD

-# Forked from Alpine to add systemd!
-
-pkgname=kactivitymanagerd
-pkgver=99996.1.5
-_pkgver=6.1.5
-pkgrel=0
-pkgdesc="System service to manage user's activities and track the usage patterns"
-# armhf blocked by qt6-qtdeclarative
-arch="all !armhf !armv7"
-url="https://kde.org/plasma-desktop/"
-license="GPL-2.0-only OR GPL-3.0-only"
-depends="qt6-qtbase-sqlite"
-makedepends="
-	boost-dev
-	extra-cmake-modules
-	kconfig-dev
-	kcoreaddons-dev
-	kdbusaddons-dev
-	kglobalaccel-dev
-	ki18n-dev
-	kio-dev
-	kwindowsystem-dev
-	kxmlgui-dev
-	qt6-qtbase-dev
-	samurai
-	"
-
-case "$pkgver" in
-	*.90*) _rel=unstable;;
-	*) _rel=stable;;
-esac
-subpackages="$pkgname-lang $pkgname-systemd"
-_repo_url="https://invent.kde.org/plasma/kactivitymanagerd.git"
-source="https://download.kde.org/stable/plasma/$_pkgver/kactivitymanagerd-$_pkgver.tar.xz"
-builddir="$srcdir/$pkgname-$_pkgver"
-
-build() {
-	cmake -B build -G Ninja \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib
-	cmake --build build
-}
-
-check() {
-	ctest --test-dir build --output-on-failure
-}
-
-package() {
-	DESTDIR="$pkgdir" cmake --install build
-}
-sha512sums="
-e3720e53cd37375828d67ddfc873cc465eb4a0ccbf75b066bf98927752df2465f382cfa5cca3f340200f6c86a91087b0157de82b581a5f06bbe77b488909f417  kactivitymanagerd-6.1.5.tar.xz
-"

extra-repos/systemd/kglobalacceld/APKBUILD

-# Forked from Alpine to add systemd!
-
-pkgname=kglobalacceld
-pkgver=99996.1.5
-_pkgver=6.1.5
-pkgrel=0
-pkgdesc="Daemon providing Global Keyboard Shortcut (Accelerator) functionality"
-# armhf blocked by extra-cmake-modules
-arch="all !armhf"
-url="https://invent.kde.org/plasma/kglobalacceld"
-license="LGPL-2.0-or-later AND LGPL-2.0-only AND LGPL-2.1-or-later"
-depends_dev="$pkgname
-	kconfig-dev
-	kcoreaddons-dev
-	kcrash-dev
-	kdbusaddons-dev
-	kglobalaccel-dev
-	kio-dev
-	knotifications-dev
-	kservice-dev
-	kwindowsystem-dev
-	qt6-qtbase-dev
-	xcb-util-keysyms-dev
-	"
-makedepends="$depends_dev
-	doxygen
-	extra-cmake-modules
-	graphviz
-	qt6-qttools-dev
-	samurai
-	"
-checkdepends="
-	dbus
-	xvfb-run
-	"
-subpackages="$pkgname-dev $pkgname-systemd"
-_repo_url="https://invent.kde.org/plasma/kglobalacceld.git"
-source="https://download.kde.org/stable/plasma/$_pkgver/kglobalacceld-$_pkgver.tar.xz"
-
-builddir="$srcdir/$pkgname-$_pkgver"
-
-build() {
-	cmake -B build -G Ninja \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib
-	cmake --build build
-}
-
-check() {
-	dbus-run-session -- xvfb-run -a ctest --test-dir build --output-on-failure -E "shortcutstest"
-}
-
-package() {
-	DESTDIR="$pkgdir" cmake --install build
-}
-sha512sums="
-7557c6d6563d332c7b02754ee0c0f72f7595b2622ed20a7b562fc489c5a2b5895d54b8146dfd9bd94679e0d1fb6d04510eb779f2d7c74cb6a83b1e3b5f76a429  kglobalacceld-6.1.5.tar.xz
-"

extra-repos/systemd/mutter-mobile/APKBUILD

 # Forked from Alpine to apply mobile adaptivity patches
 
 pkgname=mutter-mobile
-pkgver=99946.0
-_pkgver=46.0
+pkgver=99946.1
+_pkgver=46.1
 pkgrel=1
 pkgdesc="clutter-based window manager and compositor"
 url="https://wiki.gnome.org/Projects/Mutter/"
@@ -67,7 +67,7 @@ makedepends="
 options="!check" # Can't be run with release builds
 provides="mutter=$pkgver-r$pkgrel"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-schemas::noarch"
-_commit="46-mobile-0"
+_commit="46-mobile.1"
 source="mutter-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/mutter-mobile/-/archive/$_commit/mutter-mobile-$_commit.tar.gz
 	pcversion.patch
 	"
@@ -77,6 +77,7 @@ prepare() {
 	default_prepare
 
 	sed -i "s/libmutter_api_version = '.*'/libmutter_api_version = '99'/g" meson.build
+	sed -i "s/version: '$_commit'/version: '$_pkgver'/g" meson.build
 }
 
 build() {
@@ -120,6 +121,6 @@ package() {
 }
 
 sha512sums="
-97de32571ca2aeeee4d213e085fc22d0c9f669ec8d24219a5a4205f21a2e0b261f8e6d042248262926df27e0530b7a0501922d1efde5278f8c23507909d1fa84  mutter-mobile-46-mobile-0.tar.gz
+210266238a9cf56b77e195559a2f99574de4a52b973bad7143a88f112730dd61ebf807e6644519998f39fe5ddbcb1bfd589d0d5167c92718953d5ad22eba2ae7  mutter-mobile-46-mobile.1.tar.gz
 2f2379d1f6676c69ba182d008d44c3d216ba5044af56352c785f4c34d17aeb0ac98a539827371d06ade7c2b42b06f916753c736167d2d89c0053b0a0e738c5d5  pcversion.patch
 "

extra-repos/systemd/postmarketos-base-systemd/APKBUILD

 # Maintainer: Oliver Smith <ollipearanoid@postmarketos.org>
 # pmbootstrap installs this, if systemd is selected in "pmbootstrap init".
 pkgname=postmarketos-base-systemd
-pkgver=5
+pkgver=6
 pkgrel=0
 pkgdesc="Meta package for running postmarketOS with systemd"
 url="https://postmarketos.org"
@@ -61,7 +61,7 @@ fbaa33425e507062a454f11bda48508f261c2144e5c23a20f567dc1cef14ce1dec57f8d934f418f5
 2faac294bb632762e247b850f09ff4b544ccff6c462efd8d4faca71ba30bdfa9c460377a0dc88e92c5dbbe251017d164064a56ac0e0410f224b45d4f5f81866c  rootfs-etc-systemd-logind.conf
 208f53c1d142151277cfcf0a95df839919ce8cb15ec888d50890dc6b3631a994335bfa12194cec856b649f97cfd7c80019c595cc0ea2c5ee96498a3e76a9950b  rootfs-etc-ssh-sshd_config.d-usepam.conf
 15423bfda57c90ab62fe69865ca4072a0aeb83bf77d9c278257e346f4da81843d010b41003c91ae9f3fcb1c67447645e7c19078eea2bf11312051e6ad7523ad1  rootfs-usr-share-mkinitfs-files-01-initramfs-base-systemd.files
-e050b14e044993b3c7a6370a92149b5cd2249119570425d91160178dea28df795c24deb230396977b842c6f0ccdc2a0c43e27011162b56cb8de9a64f7ff7157b  rootfs-usr-lib-systemd-system-preset-90-base.preset
+a0d48ea738e0368286f54785f263a4df8acda1b90fca57bd3e1b6db99e5ab8300744c949c300a339a2007642df5c6f4884a0fe1b6aef649b4410ff8cbd040508  rootfs-usr-lib-systemd-system-preset-90-base.preset
 9b3b9abdb3d3541038d37d6870baed81f20be7f5b80874bd142eeb686b08958180b4d4a293912c9760e4353a58d6a5dea43e155002f224d14a157f7a082cde60  rootfs-usr-lib-systemd-user-preset-90-base.preset
 605df1f004783d2e0ec5dd99a688bca27502c8c24bc05fb4dc26589b2070b0fbd1cf9bd56e6861d7cda2f8ac8147e7eb040acfd886185c01c8cf9de8b1ce2dcd  rootfs-usr-bin-setup-timezone
 "

extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset

@@ -41,6 +41,11 @@ enable phosh.service
 ## gnome
 enable gdm.service
 
+# Waydroid
+enable sensorfwd.service
+enable waydroid-container.service
+enable waydroid-sensors.service
+
 # Device specifics:
 # TODO: i like the idea of device/soc specific presets, we should move this out of here
 enable adsp-audio.service

extra-repos/systemd/systemd-services/APKBUILD

@@ -6,7 +6,7 @@
 # How to add a new service file (5 steps):
 pkgname=systemd-services
 # 1. bump pkgver
-pkgver=21
+pkgver=23
 pkgrel=0
 pkgdesc="Systemd service files"
 url="https://postmarketos.org"
@@ -14,7 +14,7 @@ arch="noarch"
 options="!check"
 license="BSD-3-Clause"
 
-# 2. Add a new entry to subpackes in the format
+# 2. Add a new entry to subpackages in the format
 #    <pkgname>-systemd:_service where pkgname is the name
 #    of the package this service file should be part of
 #    ALPHABETICAL ORDER!!!
@@ -39,14 +39,19 @@ subpackages="
 	openssh-server-pam-systemd:_service
 	pd-mapper-systemd:_service
 	phosh-systemd:_service
+	plasma-kactivitymanagerd:_service
+	plasma-kglobalacceld:_service
 	plasma-mobile-systemd:_service
 	q6voiced-systemd:_service
 	qbootctl-systemd:_service
 	rmtfs-systemd:_service
 	rtkit-systemd:_service
+	sensorfw-systemd:_service
 	sleep-inhibitor-systemd:_service
 	tqftpserv-systemd:_service
 	udisks2-systemd:_service
+	waydroid-container-systemd:_service
+	waydroid-sensors-systemd:_service
 	wireplumber-systemd:_service
 	wpa_supplicant-systemd:_service
 	xdg-desktop-portal-systemd:_service
@@ -87,14 +92,19 @@ _nftables_sources="system/nftables.service"
 _openssh_server_pam_sources="system/sshd.service system/sshdgenkeys.service"
 _pd_mapper_sources="system/pd-mapper.service"
 _phosh_sources="system/phosh.service"
+_plasma_kactivitymanagerd_sources="user/plasma-kactivitymanagerd.service"
+_plasma_kglobalacceld_sources="user/plasma-kglobalaccel.service"
 _plasma_mobile_sources="system/plasma-mobile.service"
 _q6voiced_sources="system/q6voiced.service"
 _qbootctl_sources="system/qbootctl.service"
 _rmtfs_sources="system/rmtfs.service"
 _rtkit_sources="system/rtkit-daemon.service"
+_sensorfw_sources="system/sensorfwd.service"
 _sleep_inhibitor_sources="system/sleep-inhibitor.service"
 _tqftpserv_sources="system/tqftpserv.service"
 _udisks2_sources="system/udisks2.service" # From https://github.com/storaged-project/udisks/blob/master/data/udisks2.service.in
+_waydroid_container_sources="system/waydroid-container.service"
+_waydroid_sensors_sources="system/waydroid-sensors.service"
 _wireplumber_sources="user/wireplumber.service"  # https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/master/src/systemd/user
 _wpa_supplicant_sources="system/wpa_supplicant.service"
 _xdg_desktop_portal_sources="
@@ -128,22 +138,27 @@ source="$(flatpath \
 	$_hexagonrpcd_sources \
 	$_iio_sensor_proxy_sources \
 	$_iwd_sources \
-	$_lxc_sources \
 	$_kded_sources \
+	$_lxc_sources \
 	$_mmsd_tng_sources \
 	$_modemmanager_sources \
 	$_nftables_sources \
 	$_openssh_server_pam_sources \
 	$_pd_mapper_sources \
 	$_phosh_sources \
+	$_plasma_kactivitymanagerd_sources \
+	$_plasma_kglobalacceld_sources \
 	$_plasma_mobile_sources \
 	$_q6voiced_sources \
 	$_qbootctl_sources \
 	$_rmtfs_sources \
 	$_rtkit_sources \
+	$_sensorfw_sources \
 	$_sleep_inhibitor_sources \
 	$_tqftpserv_sources \
 	$_udisks2_sources \
+	$_waydroid_container_sources \
+	$_waydroid_sensors_sources \
 	$_wireplumber_sources \
 	$_wpa_supplicant_sources \
 	$_xdg_desktop_portal_sources \
@@ -172,9 +187,12 @@ _q6voiced_system_presets="q6voiced.service"
 _qbootctl_system_presets="qbootctl.service"
 _rmtfs_system_presets="rmtfs.service"
 _rtkit_system_presets="rtkit-deamon.service"
+_sensorfw_system_presets="sensorfwd.service"
 _sleep_inhibitor_system_presets="sleep-inhibitor.service"
 _tqftpserv_system_presets="tqftpserv.service"
 _udisks2_system_presets="udisks2.service"
+_waydroid_system_presets="waydroid-container.service"
+_waydroid_sensors_system_presets="waydroid-sensors.service"
 _wireplumber_user_presets="wireplumber.service"
 _wpa_supplicant_system_presets="wpa_supplicant.service"
 _xdg_desktop_portal_user_presets="xdg-desktop-portal-rewrite-launchers.service"
@@ -245,14 +263,19 @@ fa445c4a53214524baed4e9c52a5463592a074f88a5a286eacb60d0907c0545f725afde23abd68cf
 c0badea3905c1d53d213fbfe11d25b556a2e484fe77eb50e9f4d42e25b67b56a0804e7d8e1b7731cd280cbb3525b4c60311817609381e2308d9f2dfb7c0d7072  system-sshdgenkeys.service
 0bed9a8a719661609ad84d1c6fcdf2fe9213e741682b7ddebad82d9744f137c593788ed522868f10b95b599d81743d07ec3212630a7e99d333261dfa1bf1cc11  system-pd-mapper.service
 5f53e07a48c64ab27deead4c1dc64dbea048de5632026d131e27e0fc3115723a1138d043199e2fdba9a281c420b3286a0aa96b063ed7f02c1153487ef732dd98  system-phosh.service
+9cf877929b16f3437e65d1a0a2049799cc97cc84a7caab6a581e90139495b4febb5fb4c59ee463110866a0b60c9462d6d0fdb331d92d29b30ce6aeada365ac48  user-plasma-kactivitymanagerd.service
+acf21c4391ca62775491ba4d3b7c460b4163ef07abb195e152c98299a2d12779f3eb95f8cad0aeb3239f2d0fa8222a2483000c45aa6a47e05269876147d89839  user-plasma-kglobalaccel.service
 e12d8e98e28a795f879aebcceb32a991ee4abcb3bc5ec458aa5378bb52ff86cf39be04bc4a196925f532d623304b3005f561fa5e55d1c87944d718058ec4c0e6  system-plasma-mobile.service
 4c4c3f1e5e829ff67dd35df59120ab59730ff1f1ca0aab93f16d670132979a99099fad59e6c736908cc19df9172c9bdfe476ec721a1cc28de8c2210da46ce1f1  system-q6voiced.service
 621189aa251655796795f4fa0cd79360bb67573e7327e545064eaadafc83cc7b382a405d6ba80662e0a4ece3876e4270e3563d859a6ba63b5e3854b39c35873e  system-qbootctl.service
 11bb0ff9ab32f0f230c665db2738e37e5226fa200621b9207baf92e0632a38f840395a55ef6e827763911cf78f3bad95cd3456e77cc01b30b8abce96dc13df9d  system-rmtfs.service
 1a0958e4fe232967946e9f2b17a13434b137236ba5d18442175d648b084d82df3a9fc5723c1621be899ee290b99777ac3c0ee6ad733e72d8e70f63b37ad00036  system-rtkit-daemon.service
+d5bf5f01c0feafab4edfc39b75eded608dc3efcd3b918739e3ed2ab11340c9cc9b6fb97c0706ddd3d49b726c5f62e8cdb0048aefafd916f3ad9defc6ff9783bc  system-sensorfwd.service
 be9df5e3fd9c88ec1a8db4aa2d9e8075d74ee3d2670aa3cfc611df3cff4d4041ac888a0338c9d5f134bbc69aa32eb52ac40eb3e0981813afa18389cba14d3818  system-sleep-inhibitor.service
 c569b27925297672c479e12a6425abdf5791886fff77c2c2b67b7aa9277eb0a22e7b95b52dbc225870c97460d0988a4dae18ed864e19096c704c0895de55b699  system-tqftpserv.service
 c7ea2b18c9d8f82306fbaca6d07b7019de3819d7898c3f50c3d0aceef4da4d311ed3bf31385e2f8998b8e3e326b1eb13309ffd44cf1b2d9db9b40bca00222c16  system-udisks2.service
+023fc89481f9079ac2d2d6b8a9ab212cb13a6b309caaa92b336df4c6ee9cff05538f035f8411fd8f6b87ca73b400172f56022edbf02d3776ab6f2aa7af2eebef  system-waydroid-container.service
+841caa793d256cacea7eb651f3d77039b1c0ddb22727100d6cca74230e528aee09e945e1fdf20eaf40abbe3eaec9210eb7fa27144dc906cab65f8078b36921f9  system-waydroid-sensors.service
 210a7610acfcaee642ac34abe80e77f492e7e2411a9226d26578675893a125b8333a26c2756cf4376745e32fb99a2b7851d737e4df3b2c7d923f730d8ae33e9d  user-wireplumber.service
 d55edea6983ad73b1817dfac3e6d418113c8e0fbd6cb2835dedcad2e5c76c8889c09348a184ed4ab38397d7d539831ef6a7ce08037e12c7ab6dc274519dc5812  system-wpa_supplicant.service
 9a3620d3df53540a91efa48df322288d96ec887415f538877a979be40eb5239b95917b9ac57fda2c699fe3f1c6500f7de09a4ce6625b0818f5786e125713552f  user-xdg-desktop-portal.service

extra-repos/systemd/systemd-services/system-sensorfwd.service

+[Unit]
+Description=Sensor daemon for sensor framework
+After=dbus.socket
+After=oneshot-root.service
+Requires=dbus.service
+Conflicts=actdead.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/sensorfwd -c=/etc/sensorfw/primaryuse.conf --systemd --log-level=warning --no-magnetometer-bg-calibration
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+RestartSec=2
+# Sandboxing
+CapabilityBoundingSet=CAP_BLOCK_SUSPEND CAP_DAC_OVERRIDE CAP_FOWNER
+PrivateTmp=yes
+ProtectHome=yes
+ProtectSystem=full
+
+[Install]
+WantedBy=graphical.target

extra-repos/systemd/systemd-services/system-waydroid-container.service

+[Unit]
+Description=Waydroid Container
+
+[Service]
+UMask=0022
+BusName=id.waydro.Container
+ExecStart=/usr/bin/waydroid -w container start
+
+[Install]
+WantedBy=multi-user.target

extra-repos/systemd/systemd-services/system-waydroid-sensors.service

+[Unit]
+Description=Waydroid sensor daemon
+Requires=waydroid-container.service
+PartOf=waydroid-container.service
+After=waydroid-container.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/waydroid-sensord
+RestartSec=1
+TimeoutStartSec=5
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

extra-repos/systemd/systemd-services/user-plasma-kactivitymanagerd.service

+[Unit]
+Description=KActivityManager Activity manager Service
+PartOf=graphical-session.target
+Before=graphical-session.target
+
+[Service]
+ExecStart=/usr/lib/libexec/kactivitymanagerd
+BusName=org.kde.ActivityManager
+Slice=background.slice

extra-repos/systemd/systemd-services/user-plasma-kglobalaccel.service

+[Unit]
+Description=KDE Global Shortcuts Server
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/lib/libexec/kglobalacceld
+BusName=org.kde.kglobalaccel
+Slice=background.slice
+TimeoutSec=5sec
+Restart=on-failure
+# Exit status 1 is used when the X11 connection drops
+RestartPreventExitStatus=1