device/community/device-oneplus-enchilada/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -48,7 +48,7 @@ phosh() {
 }
 
 sha512sums="
-41059dc04ba4d155fedef3e470bfd6ea993d89418a13e25b8284dc98a4c90c61ae00101b9912161acaf4ac8b346d8efcf63894ce1ddb12224f19b9be69e0de87  deviceinfo
+9b0603ceef02ec632ff333167b252743cc5461ae371b656a6468addf22d43ec10010d9348caebc9c21e2cdafb95af7bf6266ad405ac245779a325154d404bfde  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
 "

device/community/device-oneplus-enchilada/deviceinfo

@@ -39,5 +39,5 @@ deviceinfo_flash_kernel_on_update="true"
 deviceinfo_rootfs_image_sector_size="4096"
 
 # osk-sdl
-deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_smb2 bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_pmi8998_charger bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"

device/community/device-oneplus-fajita/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -42,6 +42,6 @@ phosh() {
 }
 
 sha512sums="
-3417d0703f489453920afa68e5ce8b01128d75c1c8b4442612d9379de0edd01f4b90ab5dc8329cb5697b3bc9e230333c1c5f8f8b4a4500f45185d8f5aef2e13c  deviceinfo
+8561a33c0e7d5085186258a71d2fc44daa01b24d05781d53be87222b462059fee26baa2e004e799404606429629e56baad3778d74d1f725cec389f572c92155e  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "

device/community/device-oneplus-fajita/deviceinfo

@@ -39,5 +39,5 @@ deviceinfo_flash_kernel_on_update="true"
 deviceinfo_rootfs_image_sector_size="4096"
 
 # osk-sdl
-deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_smb2 bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_pmi8998_charger bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"

device/community/device-shift-axolotl/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -50,6 +50,6 @@ phosh() {
 }
 
 sha512sums="
-50de253cfcab3731ffa8ee4a67d7436ffa7fc17d59058137eed78b8359c158128dd073565dd4b8f5ada9e0f898ad4bad7c731a77feed6a652019c37023a02060  deviceinfo
+6a075c5ea73bc2700cc5cb0325599e19b1380358f95938367150082253ab909140e2a02a496343a94b0b98b9e21a862953a0db4a023f5ceda9b7cef98250210f  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "

device/community/device-shift-axolotl/deviceinfo

@@ -41,4 +41,4 @@ deviceinfo_flash_kernel_on_update="true"
 deviceinfo_rootfs_image_sector_size="4096"
 deviceinfo_super_partitions="/dev/sda7 /dev/sda7"
 
-deviceinfo_modules_initfs="focaltech_fts gpi i2c_qcom_geni qcom_smb2 qcom_fg qcom_spmi_haptics"
+deviceinfo_modules_initfs="focaltech_fts gpi i2c_qcom_geni qcom_pmi8998_charger qcom_fg qcom_spmi_haptics"

device/community/device-xiaomi-beryllium/APKBUILD

@@ -4,8 +4,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -66,7 +66,7 @@ phosh() {
 }
 
 sha512sums="
-e7ae5136aab2accbf4f15c0a52b5e05bbb254541625200091794e7cfb7d700502818ed51071e0b7529a0bd1de530940f5999342ace404a3115d5c05e6edb681e  deviceinfo
+399e430a7340755c39680e436141dc141b38669791664bfb6d902bf4994516305fdf3e0e088717f60dc24faf64e0993c8695572f1afb7875a46548f494fdb54d  deviceinfo
 e2e417169345c86a5dd34ac0afac4b2b983a755f4c7ba5698c385a01f96b9bd2c3ace1ce5a0569c121675e8b87e88e1cf5c648e995d9c50cba66e52bbc83753c  phoc.ini
 7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
 "

device/community/device-xiaomi-beryllium/deviceinfo

@@ -37,5 +37,5 @@ deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"
 
 # osk-sdl
-deviceinfo_modules_initfs_tianma="gpi i2c_qcom_geni qcom_smb2 qcom_fg nt36xxx"
-deviceinfo_modules_initfs_ebbg="gpi i2c_qcom_geni qcom_smb2 qcom_fg focaltech_fts"
+deviceinfo_modules_initfs_tianma="gpi i2c_qcom_geni qcom_pmi8998_charger qcom_fg nt36xxx"
+deviceinfo_modules_initfs_ebbg="gpi i2c_qcom_geni qcom_pmi8998_charger qcom_fg focaltech_fts"

main/postmarketos-ui-phosh/APKBUILD

@@ -44,7 +44,7 @@ _pmb_recommends="
 	postmarketos-artwork-wallpapers
 	postmarketos-hidden-desktop-entries
 	postmarketos-tweaks
-	postmarketos-welcome-gtk3
+	postmarketos-welcome
 	ttyescape
 	xdg-user-dirs
 	"

main/postmarketos-welcome-gtk3/APKBUILD → main/postmarketos-welcome/APKBUILD

 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
-pkgname=postmarketos-welcome-gtk3
-pkgver=0.3.0
+pkgname=postmarketos-welcome
+pkgver=0.4.0
 pkgrel=0
 pkgdesc="postmarketOS welcome app"
-url="https://gitlab.com/postmarketOS/postmarketos-welcome-gtk3"
+url="https://gitlab.com/postmarketOS/postmarketos-welcome"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="meson libhandy1-dev"
-source="https://gitlab.com/postmarketOS/postmarketos-welcome-gtk3/-/archive/$pkgver/postmarketos-welcome-gtk3-$pkgver.tar.bz2"
+makedepends="
+	desktop-file-utils
+	glib-dev
+	gtk4.0-dev
+	libadwaita-dev
+	meson
+	"
+source="https://gitlab.com/postmarketOS/postmarketos-welcome/-/archive/$pkgver/postmarketos-welcome-$pkgver.tar.bz2"
 options="!check" # No tests
+replaces="postmarketos-welcome-gtk3"
+provides="postmarketos-welcome-gtk3"
 
 build() {
 	abuild-meson . output
@@ -18,9 +26,6 @@ build() {
 package() {
 	DESTDIR="$pkgdir" meson install -C output
 
-	install -Dm644 "data/welcome-message" \
-		"$pkgdir/etc/welcome-message"
-
 	# Autostart on first login, the app removes the symlink when started
 	local _autostartdir="$pkgdir/etc/skel/.config/autostart"
 	mkdir -p "$_autostartdir"
@@ -29,5 +34,5 @@ package() {
 }
 
 sha512sums="
-0bffbf16dac78c76824cc76e04d3b97465cf5cb3504c6b475345856308dd695b73e6fb3549874ea10882b41cf1593174e07537e77516f60376050e8a3afc1ceb  postmarketos-welcome-gtk3-0.3.0.tar.bz2
+653c049346df730abe8d10a1474dbbc6791af87d4895cf4533263214225c0f45ea7118069013b70c3f796544203eb66f05833b201bd2be3ffc9f9bb02e013ef3  postmarketos-welcome-0.4.0.tar.bz2
 "