WIP: main/amazfish: new aport

i9100 now uses shared exynos4 kernel

[ci:skip-build]: already built successfully in CI

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.32.0
-pkgrel=7
+pkgrel=8
 
 _arch="aarch64"
 _mirror="http://dl-2.alpinelinux.org/alpine/"
@@ -31,4 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="1eb1f0950d50d53848c63cf03481486435cb7b3b504307412e54e92361f8b103d0c57a97b003ba5c74e615cbd01118e4c25f419f195db345c94242cbad363dc5  busybox-static-1.32.0-r7-aarch64-edge.apk"
+sha512sums="9e6078f585cee2f3bea8cc355a7f53d2efbebb47029f20f4c90f84acfbae7ade49bfff97c5b6e7eff0e4128d3f67c3f4d02e574cfa8d5483cba0a2dda2f679d5  busybox-static-1.32.0-r8-aarch64-edge.apk"

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.32.0
-pkgrel=7
+pkgrel=8
 
 _arch="armhf"
 _mirror="http://dl-2.alpinelinux.org/alpine/"
@@ -31,4 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="f5ccbc2a5f46dabebccb68b5a2fa86bc225f4c243a755abb0673e2a5723962edf359f0d75acd20d0bae17f5e58a14cb00c60b6a22092face054c6105878b149b  busybox-static-1.32.0-r7-armhf-edge.apk"
+sha512sums="57cd3ab0e504a6a6ee27fb2aee902a4426136d1e0d3ae3a55003e5f3a4f7df03cce6c201244287f4315f4f8ba162f19fee18f3159f11a07015b7c37fe607d701  busybox-static-1.32.0-r8-armhf-edge.apk"

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.32.0
-pkgrel=7
+pkgrel=8
 
 _arch="armv7"
 _mirror="http://dl-2.alpinelinux.org/alpine/"
@@ -31,4 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="96db60049d4c7cd8d98dab7ff6a00243f44ccf17dfd85f55d763d3ac0276eb82a6e34e90129985ebdff5ac74ed8c8814b4b8750a41e1f2cc654b2ee7ee7650d0  busybox-static-1.32.0-r7-armv7-edge.apk"
+sha512sums="2e11a7a2b7474ddf0705f066e211bb89f2d17b81ef008080168b1cbbf6330810737e60cd44cd7ab5d0379841d78916ca9f4386e76ccf0e731dc9d69296454f8e  busybox-static-1.32.0-r8-armv7-edge.apk"

device/testing/device-asus-z010d/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-asus-z010d
 pkgdesc="Asus Zenfone Max ZC550KL"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -50,4 +50,4 @@ nonfree_firmware_modem() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="5fbbed9d045c1ce73930174f5c87f30b6e5f80cac1d130bf20c321487fcbb2b5be803c76b22c37de2b26a17705bfd18da6f5d65152c8bb5df7760c4ea98e2aa3  deviceinfo"
+sha512sums="b678eb32cbb4d2976182d5dfa5177abd06d6a59cb584d1ca38959163b289c3372446fe3fc793a7936fae4d1d19e9fe81c7940b4c259c2c4343e97b44f1b05cb7  deviceinfo"

device/testing/device-asus-z010d/deviceinfo

@@ -6,7 +6,8 @@ deviceinfo_name="Asus Zenfone Max ZC550KL"
 deviceinfo_manufacturer="Asus"
 deviceinfo_codename="asus-z010d"
 deviceinfo_year="2016"
-deviceinfo_dtb="qcom/msm8916-asus-z010d"
+deviceinfo_dtb_mainline="qcom/msm8916-asus-z010d"
+deviceinfo_dtb_mainline_modem="qcom/msm8916-asus-z010d-modem"
 deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs=""
 deviceinfo_arch="aarch64"

device/testing/device-samsung-i9100/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-i9100
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 pkgdesc="Samsung Galaxy SII"
 url="https://postmarketos.org"
 arch="armv7"
@@ -13,7 +13,6 @@ options="!check !archcheck"
 subpackages="
 	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-kernel-mainline:kernel_mainline
-	$pkgname-kernel-mainline_exynos:kernel_mainline_exynos
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-weston:weston
 "
@@ -41,12 +40,6 @@ kernel_downstream() {
 
 kernel_mainline() {
 	pkgdesc="Close to mainline kernel"
-	depends="linux-samsung-i9100-mainline mesa-dri-gallium"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_mainline_exynos() {
-	pkgdesc="Close to mainline kernel (exynos4 package)"
 	depends="linux-postmarketos-exynos4 mesa-dri-gallium"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
@@ -63,6 +56,6 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-sha512sums="f7d0864c8c2c0a122b95eb21d396c1c8f871c27c3b5f7c9cac135a7f66f6d1501624fb99b70c8b9f009a59fb30e86c919e90f7f2c8e090399153a0cd923dfe42  deviceinfo
+sha512sums="52222377a11999c05209135543c32737882c1933f455ef2cd8be869580cd27b12008904b5185caefb01d01ade64c53cd4791ad8cd7940fd550d41ee1200223e4  deviceinfo
 089635daddd88eec35451bfe98dc3713035e3623c896dd21305b990ecf422e8fbb54e010cf347919bbb3a7385f639ab119280477fe0783df3228168d97d96fc6  90-android-touch-dev.rules
 de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini"

device/testing/device-samsung-i9100/deviceinfo

@@ -6,8 +6,8 @@ deviceinfo_name="Samsung Galaxy SII"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-i9100"
 deviceinfo_year="2011"
-deviceinfo_append_dtb_mainline_exynos="true"
-deviceinfo_dtb_mainline_exynos="exynos4210-i9100"
+deviceinfo_append_dtb_mainline="true"
+deviceinfo_dtb_mainline="exynos4210-i9100"
 deviceinfo_modules_initfs=""
 deviceinfo_external_storage="true"
 deviceinfo_flash_method="heimdall-isorec"
@@ -18,10 +18,9 @@ deviceinfo_chassis="handset"
 deviceinfo_keyboard="false"
 deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
-deviceinfo_dev_touchscreen="/dev/input/event2"
 
 # Heimdall related
 deviceinfo_flash_heimdall_partition_kernel="KERNEL"
 deviceinfo_flash_heimdall_partition_initfs="RECOVERY"
-deviceinfo_flash_heimdall_partition_system="FACTORYFS"
+deviceinfo_flash_heimdall_partition_system="DATAFS"
 deviceinfo_flash_sparse="true"

device/testing/device-samsung-j3xnlte/APKBUILD

@@ -1,5 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-j3nxlte
+pkgname=device-samsung-j3xnlte
 pkgdesc="Samsung Galaxy J3"
 pkgver=0.1
 pkgrel=5
@@ -20,4 +20,4 @@ package() {
 }
 
 
-sha512sums="4274d4cb70b507e712783c75e9788e7e9e8be034a2f93c3c73ff31909e696916e608837b3256225521f76662b600a920305435d650caf1f43c156e730e4a25d0  deviceinfo"
+sha512sums="8de89b93337e624859ed9f39fdc89add1e293cf70a8574dd68e2b3bb8fe1cd14a5d1d6b086a43a131696099c40eca6ad69ff58e7ff7c5aa272610a02c4500ff3  deviceinfo"

device/testing/device-samsung-j3xnlte/deviceinfo

@@ -4,7 +4,7 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Samsung Galaxy J3"
 deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-j3nxlte"
+deviceinfo_codename="samsung-j3xnlte"
 deviceinfo_year="2016"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""

device/testing/firmware-asus-z010d/APKBUILD

@@ -1,8 +1,8 @@
 pkgname=firmware-asus-z010d
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Asus Zenfone Max ZC550KL"
-url="https://github.com/devajithvs/asus-z010d-firmware"
+url="https://gitlab.com/camillathechicken/firmware-max"
 subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
 arch="aarch64"
 license="proprietary"

device/testing/linux-samsung-i9100-mainline/01_flush_tlb.patch

@@ -1,34 +0,0 @@
-From 2a6027178ae40c1d3baa965fe21b19cbf09493ce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
-Date: Fri, 30 Nov 2012 17:05:40 -0800
-Subject: [PATCH] ARM: decompressor: Flush tlb before swiching domain 0 to
- client mode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the bootloader used a page table that is incompatible with domain 0
-in client mode, and boots with the mmu on, then swithing domain 0 to
-client mode causes a fault if we don't flush the tlb after updating
-the page table pointer.
-
-v2: Add ISB before loading dacr.
-
-Signed-off-by: Arve Hjønnevåg <arve@android.com>
----
- arch/arm/boot/compressed/head.S | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
-index 434a16982e344..d6f6a58ba931b 100644
---- a/arch/arm/boot/compressed/head.S
-+++ b/arch/arm/boot/compressed/head.S
-@@ -883,6 +883,8 @@ __armv7_mmu_cache_on:
- 		bic     r6, r6, #1 << 31        @ 32-bit translation system
- 		bic     r6, r6, #(7 << 0) | (1 << 4)	@ use only ttbr0
- 		mcrne	p15, 0, r3, c2, c0, 0	@ load page table pointer
-+		mcrne	p15, 0, r0, c8, c7, 0	@ flush I,D TLBs
-+		mcr	p15, 0, r0, c7, c5, 4	@ ISB
- 		mcrne	p15, 0, r1, c3, c0, 0	@ load domain access control
- 		mcrne   p15, 0, r6, c2, c0, 2   @ load ttb control
- #endif

device/testing/linux-samsung-i9100-mainline/APKBUILD

@@ -1,65 +0,0 @@
-pkgname=linux-samsung-i9100-mainline
-pkgver=5.8.12
-pkgrel=0
-pkgdesc="Samsung Galaxy SII mainline kernel"
-arch="armv7"
-url="https://kernel.org"
-license="GPL-2.0-only"
-options="!strip !check !tracedeps pmb:cross-native"
-makedepends="perl sed flex bison openssl-dev installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev busybox-static-$arch"
-
-_carch="arm"
-_flavor="samsung-i9100"
-_config="config-$_flavor.$arch"
-source="
-	$pkgname-$pkgver.tar.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$pkgver.tar.xz
-	$_config
-	init
-	initramfs.list
-	01_flush_tlb.patch
-"
-builddir="$srcdir/linux-$pkgver"
-
-prepare_isorec() {
-	_initramfsdir="$builddir/usr/i9100"
-	mkdir -p "$_initramfsdir"
-	cp -v /usr/$(arch_to_hostspec $arch)/bin/busybox.static "$_initramfsdir"
-	cp -v "$srcdir"/init "$_initramfsdir"
-	cp -v "$srcdir"/initramfs.list "$_initramfsdir"
-}
-
-prepare() {
-	default_prepare
-	prepare_isorec
-	cp -v "$srcdir"/$_config .config
-}
-
-build() {
-	unset LDFLAGS
-	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
-		LOADADDR=0x40008000
-}
-
-package() {
-	cat "$builddir/arch/arm/boot/zImage" \
-		"$builddir/arch/arm/boot/dts/exynos4210-i9100.dtb" \
-		> "$builddir/arch/arm/boot/zImage-dtb"
-
-	install -Dm644 "$builddir/arch/arm/boot/zImage-dtb" \
-		"$pkgdir/boot/vmlinuz-$_flavor"
-
-	install -D "$builddir/include/config/kernel.release" \
-		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
-
-	make modules_install \
-		ARCH="$_carch" \
-		INSTALL_MOD_STRIP=1 \
-		INSTALL_MOD_PATH="$pkgdir"
-}
-
-sha512sums="c1daa20dcdaa2cb805e7a973b684ea40327088d8fadf0cf44f4c73284923363397b12f2e1958d64d6a0ff348198366d46b59a5301a72d3431389d319a4bde489  linux-samsung-i9100-mainline-5.8.12.tar.xz
-f09d6c61f6f5573fc7512bab4b6b8ccf66ce6edf2c3783fbc05ab8aff142aae2b3fe0b8ad1085b8412f0664d0601362a79b43a502ff5e98de9de756b7b88a979  config-samsung-i9100.armv7
-1181e84aec07a1eb2d9f1491581893b1de8535abf784115ea5666891653b3c2f4ed062a4a9cf80e07731bc1553d30ff72601c64d966b33b669cc569f70d61610  init
-6a9a629805b5601db0183a796b13baae0fb2344ad24ef8ea55ea47ede8ee50a299c131d1862e15ed2bd3709aaf97f4f05633635b5764a83f4564c75cd5941967  initramfs.list
-f1368045393d9be596154099ef08833e8640005a88cbefb741e57be29440de263bf63bf9645a176bce6d3fd4e3ac7daf11433ee937064f792f61dd54d7339f06  01_flush_tlb.patch"

device/testing/linux-samsung-i9100-mainline/init

@@ -1,16 +0,0 @@
-#!/bin/busybox sh
-
-echo "### isorec initramfs ###"
-busybox mount -t proc proc /proc
-busybox mount -t sysfs sysfs /sys
-
-# Load the "isorec"-style lzop compressed 
-# initramfs from the recovery partition.
-load_image=/isorec.cpio
-busybox lzop -dc /dev/block/mmcblk0p6 > ${load_image}
-busybox cpio -iu < ${load_image}
-busybox rm ${load_image}
-
-busybox umount /sys
-busybox umount /proc
-exec /init

device/testing/linux-samsung-i9100-mainline/initramfs.list

@@ -1,21 +0,0 @@
-dir /dev 755 0 0
-dir /dev/block 755 0 0
-nod /dev/block/mmcblk0 600 0 0 b 179 0
-nod /dev/block/mmcblk0p1 600 0 0 b 179 1
-nod /dev/block/mmcblk0p2 600 0 0 b 179 2
-nod /dev/block/mmcblk0p3 600 0 0 b 179 3
-nod /dev/block/mmcblk0p4 600 0 0 b 179 4
-nod /dev/block/mmcblk0p5 600 0 0 b 179 5
-nod /dev/block/mmcblk0p6 600 0 0 b 179 6
-nod /dev/block/mmcblk0p7 600 0 0 b 179 7
-nod /dev/block/mmcblk0p8 600 0 0 b 179 8
-nod /dev/block/mmcblk0p9 600 0 0 b 179 9
-nod /dev/block/mmcblk0p10 600 0 0 b 179 10
-nod /dev/block/mmcblk0p11 600 0 0 b 179 11
-nod /dev/block/mmcblk0p12 600 0 0 b 179 12
-nod /dev/console 0600 0 0 c 5 1
-dir /bin 755 0 0
-dir /proc 755 0 0
-dir /sys 755 0 0
-file /bin/busybox usr/i9100/busybox.static 755 0 0
-file /init usr/i9100/init 755 0 0

device/testing/linux-samsung-j3xnlte/APKBUILD

@@ -1,13 +1,13 @@
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/j3xnlte_defconfig
 
-pkgname=linux-samsung-j3nxlte
+pkgname=linux-samsung-j3xnlte
 pkgver=3.10.100
 pkgrel=2
 pkgdesc="Samsung Galaxy J3 kernel fork"
 arch="armv7"
 _carch="arm"
-_flavor="samsung-j3nxlte"
+_flavor="samsung-j3xnlte"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
@@ -52,8 +52,8 @@ package() {
 		"$pkgdir/boot/dt.img"
 }
 
-sha512sums="733f04dee55effcbbd8c28b9b2b84b05ca9e95d538bd10177edc40f36ee640cd260f080c50497d28828a441c9c96046debdf1085453a4d8871ac8a3ef300380f  linux-samsung-j3nxlte-e3381e42b00e1ff977815b365cea53f18afff7a8.tar.gz
-fd2938deffd68ec451139193c8cb9383bdd8455358e6ee8fc5d8174e4857d6c55887e41b3201b0884c29c653877351290ee6ddf096dee21566e1bcc7e9bae7ac  config-samsung-j3nxlte.armv7
+sha512sums="733f04dee55effcbbd8c28b9b2b84b05ca9e95d538bd10177edc40f36ee640cd260f080c50497d28828a441c9c96046debdf1085453a4d8871ac8a3ef300380f  linux-samsung-j3xnlte-e3381e42b00e1ff977815b365cea53f18afff7a8.tar.gz
+fd2938deffd68ec451139193c8cb9383bdd8455358e6ee8fc5d8174e4857d6c55887e41b3201b0884c29c653877351290ee6ddf096dee21566e1bcc7e9bae7ac  config-samsung-j3xnlte.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch

kde/qqc2-breeze-style/APKBUILD

@@ -0,0 +1,41 @@
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=qqc2-breeze-style
+pkgver=0_git20201206
+pkgrel=0
+_commit="31187b5254a2c6bd6bb5acb77f0adc25e1afb0b0"
+pkgdesc="Breeze inspired QQC2 Style"
+url="https://invent.kde.org/plasma/qqc2-breeze-style"
+# armhf blocked by extra-cmake-modules
+arch="all !armhf"
+license="LicenseRef-KDE-Accepted-LGPL AND LicenseRef-KFQF-Accepted-GPL"
+depends="kirigami2"
+makedepends="
+	extra-cmake-modules
+	kconfig-dev
+	kconfigwidgets-dev
+	kguiaddons-dev
+	kiconthemes-dev
+	kirigami2-dev
+	qt5-qtbase-dev
+	qt5-qtdeclarative-dev
+	qt5-qtquickcontrols2-dev
+	qt5-qtx11extras-dev
+	"
+source="https://invent.kde.org/plasma/qqc2-breeze-style/-/archive/$_commit/qqc2-breeze-style-$_commit.tar.gz"
+subpackages="$pkgname-dev"
+options="!check" # No tests
+builddir="$srcdir/$pkgname-$_commit"
+
+build() {
+	cmake -B build \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --build build --target install
+}
+
+sha512sums="43a12147425849086508e651f4e9b46c1ba040cc16e371b278cfefe0d28a0e1bc197bffbfdde3c56f528b6cf4c3fae20a97851c957a6a299527105b5217edd3c  qqc2-breeze-style-31187b5254a2c6bd6bb5acb77f0adc25e1afb0b0.tar.gz"

main/amazfish/APKBUILD

@@ -0,0 +1,70 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=amazfish
+pkgver=1.7.1_git20201219
+pkgrel=0
+_commit="f74ceb81b7a9e87e478ddbaf7acc60b8d433fa8a"
+_commit_qble="d47239a4c2e125257c1fe1ed7cca85094a64fc94"
+_commit_libwatchfish="c0457613537ad9ddab26e46c3c3e2b074a6c208a"
+pkgdesc="Companion app for several smartwatches"
+url="https://github.com/piggz/harbour-amazfish"
+arch="all"
+license="AGPL-3.0-ONLY"
+depends="kirigami2"
+makedepends="
+	cmake
+	dbus-dev
+	kcontacts-dev
+	kdb-dev
+	kirigami2-dev
+	qt5-qtbase-dev
+	qt5-qtconnectivity-dev
+	qt5-qtlocation-dev
+	qtmpris-dev
+	"
+source="https://github.com/piggz/harbour-amazfish/archive/$_commit/harbour-amazfish-$_commit.tar.gz
+	https://github.com/piggz/qble/archive/$_commit_qble/qble-$_commit_qble.tar.gz
+	https://github.com/piggz/libwatchfish/archive/$_commit_libwatchfish/libwatchfish-$_commit_libwatchfish.tar.gz
+	build-fix.patch
+	cmake.patch
+	cmake-qble.diff
+	"
+options="!check" # No tests
+builddir="$srcdir/harbour-amazfish-$_commit"
+
+prepare() {
+	default_prepare
+
+	rmdir \
+		qble \
+		daemon/libwatchfish
+	mv "$srcdir/qble-$_commit_qble" qble
+	mv "$srcdir/libwatchfish-$_commit_libwatchfish" daemon/libwatchfish
+
+	cd "$builddir"/qble
+	patch -p1 < "$srcdir"/cmake-qble.diff
+}
+
+build() {
+#	qmake-qt5 \
+#		PREFIX=/usr \
+#		FLAVOR=kirigami
+#	make
+	cmake -B build \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	#cmake --build build
+	VERBOSE=1 make -C build -j1
+}
+
+package() {
+#	INSTALL_ROOT="$pkgdir" make install
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="e32a6179aeed9fe543938bb4ff428619f368c3c532f6bd148739c07305f5ae16d64c578c0885133595a649ee2006f5123579c6d4fc8b73c212f39b4630ca7f8b  harbour-amazfish-f74ceb81b7a9e87e478ddbaf7acc60b8d433fa8a.tar.gz
+999082ad1045aab724ef858166e58fdee3818cccc77cb1595631161bcf199eb5db7725fce826dc58bd3a1bbc1bfb4dcaf31abc4d8cc37532ec0d531caaa28680  qble-d47239a4c2e125257c1fe1ed7cca85094a64fc94.tar.gz
+44decc27fa889a87ed74925d67b81bcacf27b06becaf094c52caf4eb9a954443c6c83321d70db351c087d82d1423abc50a0f63455318c8e41d750698707e09de  libwatchfish-c0457613537ad9ddab26e46c3c3e2b074a6c208a.tar.gz
+cf7795f53966a1624d0ba4da72944f7d986a81073ca96e2e0c30389111c09c4c1abb8016f909e71c74e8340a538bdd9efcbe14b9b1bd7829219545cd82f3e30e  build-fix.patch
+d894938110ecdd90820a7979e9c1b936884fd7a5324485832889f838dfd38fb7cf271e0593e19deafda8f626f4f20568932eaf0581e502165349272ebeb5a12c  cmake.patch
+0ea41b2d64ee64a8872d588958f084961d57fd37acf97498238eee3f2f52a11e0c57462a9a860eb63ab30e61cd92a03c3dc3185883c911124444e725856aef43  cmake-qble.diff"

main/amazfish/build-fix.patch

@@ -0,0 +1,13 @@
+diff --git a/daemon/src/devices/abstractfirmwareinfo.h b/daemon/src/devices/abstractfirmwareinfo.h
+index 061d4b0..dc97e65 100644
+--- a/daemon/src/devices/abstractfirmwareinfo.h
++++ b/daemon/src/devices/abstractfirmwareinfo.h
+@@ -35,7 +35,7 @@ public:
+ protected:
+     QByteArray m_bytes;
+     uint16_t m_crc16;
+-    u_int32_t m_crc32;
++    uint32_t m_crc32;
+     Type m_type;
+     QString m_version;
+ 

main/amazfish/busybox-cp-compat.patch

@@ -0,0 +1,13 @@
+diff --git a/ui/ui.pro b/ui/ui.pro
+index 537cb59..dd7689b 100644
+--- a/ui/ui.pro
++++ b/ui/ui.pro
+@@ -231,7 +231,7 @@ js.path = $$DATADIR/qml/tools
+ icons.files = qml/pics/*.png qml/pics/devices  qml/custom-icons
+ icons.path = $$DATADIR/qml/pics
+ 
+-qmlplatform.extra = mkdir -p ${INSTALL_ROOT}$$DATADIR/qml/components/platform && cp -L -v $$PWD/qml/components/platform.$$FLAVOR/*.qml -t ${INSTALL_ROOT}$$DATADIR/qml/components/platform
++qmlplatform.extra = mkdir -p ${INSTALL_ROOT}$$DATADIR/qml/components/platform && cp -L -v $$PWD/qml/components/platform.$$FLAVOR/*.qml ${INSTALL_ROOT}$$DATADIR/qml/components/platform
+ qmlplatform.path = $$DATADIR/qml/platform
+ 
+ INSTALLS += qmlplatform qml js icons

main/amazfish/cmake-qble.diff

@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..4ee7a57
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,10 @@
++list(APPEND SRC
++	${cmake_current_source_dir}/qbledevice.cpp
++	${cmake_current_source_dir}/qbleservice.cpp
++	${cmake_current_source_dir}/qblecharacteristic.cpp
++	${cmake_current_source_dir}/bluezadapter.cpp)
++set(APPEND HEADERS
++	${cmake_current_source_dir}/qbledevice.h
++	${cmake_current_source_dir}/qbleservice.h
++	${cmake_current_source_dir}/qblecharacteristic.h
++	${cmake_current_source_dir}/bluezadapater.h)

main/amazfish/cmake-watchfish.diff

@@ -0,0 +1,104 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..8de6be0
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,98 @@
++include(GenerateExportHeader)
++
++option(WATCHFIST_FEATURE_NOTIFICATIONMONITOR "Build notification monitor" TRUE)
++option(WATCHFIST_FEATURE_WALLTIME "Build walltime" TRUE)
++option(WATCHFIST_FEATURE_MUSIC "Build music" TRUE)
++option(WATCHFIST_FEATURE_CALENDAR "Build calendar" TRUE)
++option(WATCHFIST_FEATURE_VOICECALL "Build voicecall" TRUE)
++option(WATCHFIST_FEATURE_VOLUME "Build volume" TRUE)
++
++add_library(watchfish SHARED)
++generate_export_header(watchfish)
++
++if (EXISTS "/usr/lib/qt5/qml/Sailfish/Silica/SilicaGridView.qml")
++	set(MER_EDITION_SAILFISH TRUE)
++	target_link_libraries(
++		Qt5::Contacts)
++else()
++	set(MER_EDITION_SAILFISH FALSE)
++endif()
++
++target_link_libraries(watchfish
++	Qt::DBus)
++if (WATCHFIST_FEATURE_NOTIFICATIONMONITOR)
++	target_link_libraries(watchfish
++		dbus-1)
++
++	list(APPEND SRC
++		notificationmonitor.cpp
++		notification.cpp)
++	list(APPEND HEADERS
++		notificationmonitor.h
++		notificationmonitor_p.h
++		notification.h)
++endif()
++
++if (WATCHFIST_FEATURE_WALLTIME)
++	target_link_libraries(watchfish
++		timed-qt5)
++
++	list(APPEND SRC
++		walltimemonitor.cpp)
++	list(APPEND HEADERS
++		walltimemonitor.h
++		walltimemonitor_p.h)
++endif()
++
++if (WATCHFIST_FEATURE_MUSIC)
++	target_link_libraries(watchfish
++		mpris-qt5)
++
++	list(APPEND SRC
++		musiccontroller.cpp)
++	list(APPEND HEADERS
++		musiccontroller.h
++		musiccontroller_p.h)
++endif()
++
++if (WATCHFIST_FEATURE_CALENDAR)
++	if (EXISTS "/usr/lib/qt5/qml/Sailfish/Silica/SilicaGridView.qml")
++		target_link_libraries(watchfish
++			libmkcal-qt5
++			libkcalcoren-qt5)
++	else()
++		target_link_libraries(watchfish
++			KF5::Contacts)
++	endif()
++
++	list(APPEND SRC
++		calendarsource.cpp
++		calendarevent.cpp)
++	list(APPEND HEADERS
++		calendarsource.h
++		calendarevent.h)
++
++	if (MER_EDITION_SAILFISH)
++		list(APPEND HEADERS
++			calendarsource_p.h)
++	endif()
++endif()
++
++if (WATCHFIST_FEATURE_VOICECALL)
++	list(APPEND SRC
++		voicecallcontroller.cpp)
++	list(APPEND HEADERS
++		voicecallcontroller.h
++		voicecallcontroller_p.h)
++endif()
++
++if (WATCHFIST_FEATURE_VOLUME)
++	list(APPEND SRC
++		volumecontroller.cpp)
++	list(APPEND HEADERS
++		volumecontroller.h
++		volumecontroller_p.h)
++endif()
++
++install(TARGETS watchfish
++	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

main/amazfish/cmake.patch

@@ -0,0 +1,307 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..4d9d77d
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,37 @@
++cmake_minimum_required(VERSION 3.13.0)
++
++project(harbour-amazfish
++	VERSION 1.7.2
++	DESCRIPTION "Companion application for various smartwatches")
++
++set(CMAKE_AUTOMOC ON)
++set(CMAKE_AUTORCC ON)
++
++set(CMAKE_INCLUDE_CURRENT_DIR ON)
++
++include(FeatureSummary)
++include(GNUInstallDirs)
++
++option(FLAVOR "Supported platforms: kirigami, silica, qtcontrols, ubports" silica)
++
++set(QT_MIN_VERSION "5.6.0")
++set(KF5_MIN_VERSION "5.75.0")
++find_package(Qt5 ${QT_MIN_VERSION} COMPONENTS Qml Bluetooth Location REQUIRED)
++find_package(PkgConfig REQUIRED)
++find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED)
++find_package(KDb CONFIG REQUIRED)
++find_package(DBus1 CONFIG REQUIRED)
++
++pkg_check_modules(MPRIS-QT mpris-qt5 REQUIRED IMPORTED_TARGET)
++
++if(MPRIS-QT_FOUND)
++	set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND mpris-qt5)
++else()
++	set_property(GLOBAL APPEND PROPERTY PACKAGES_NOT_FOUND mpris-qt5)
++endif()
++
++add_subdirectory(lib)
++add_subdirectory(daemon)
++#add_subdirectory(ui)
++
++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
+new file mode 100644
+index 0000000..29ae2c6
+--- /dev/null
++++ b/daemon/CMakeLists.txt
+@@ -0,0 +1,233 @@
++set(SRC
++	src/devices/abstractfirmwareinfo.cpp
++	src/devices/biplitedevice.cpp
++	src/devices/biplitefirmwareinfo.cpp
++	src/devices/gtsdevice.cpp
++	src/devices/gtsfirmwareinfo.cpp
++	src/devices/pinetimejfdevice.cpp
++	src/operations/updatefirmwareoperationnew.cpp
++	src/qaesencryption.cpp
++	src/services/currenttimeservice.cpp
++	src/services/pinetimemusicservice.cpp
++	src/typeconversion.cpp
++	src/bipbatteryinfo.cpp
++	src/devicefactory.cpp
++	src/services/mibandservice.cpp
++	src/services/miband2service.cpp
++	src/services/alertnotificationservice.cpp
++	src/services/hrmservice.cpp
++	src/services/deviceinfoservice.cpp
++	src/services/bipfirmwareservice.cpp
++	src/operations/abstractoperation.cpp
++	src/operations/activityfetchoperation.cpp
++	src/operations/logfetchoperation.cpp
++	src/operations/sportssummaryoperation.cpp
++	src/operations/updatefirmwareoperation.cpp
++	src/devices/abstractdevice.cpp
++	src/devices/bipdevice.cpp
++	src/devices/bipfirmwareinfo.cpp
++	src/dbushrm.cpp
++	src/activitysummary.cpp
++	src/deviceinterface.cpp
++	src/activitysample.cpp
++	src/activitykind.cpp
++	src/operations/sportsdetailoperation.cpp
++	src/operations/abstractfetchoperation.cpp
++	src/bipactivitydetailparser.cpp
++	src/activitycoordinate.cpp
++	src/harbour-amazfish-daemon.cpp
++	src/huamiweathercondition.cpp
++
++	# Qble
++	${PROJECT_SOURCE_DIR}/qble/qbledevice.cpp
++	${PROJECT_SOURCE_DIR}/qble/qbleservice.cpp
++	${PROJECT_SOURCE_DIR}/qble/qblecharacteristic.cpp
++	${PROJECT_SOURCE_DIR}/qble/bluezadapter.cpp
++	)
++set(HEADERS
++	src/devices/abstractfirmwareinfo.h
++	src/devices/biplitedevice.h
++	src/devices/biplitefirmwareinfo.h
++	src/devices/gtsdevice.h
++	src/devices/gtsfirmwareinfo.h
++	src/devices/pinetimejfdevice.h
++	src/operations/updatefirmwareoperationnew.h
++	src/qaesencryption.h
++	src/services/currenttimeservice.h
++	src/services/pinetimemusicservice.h
++	src/typeconversion.h
++	src/bipbatteryinfo.h
++	src/deviceinterface.h
++	src/activitykind.h
++	src/devices/bipfirmwareinfo.h
++	src/dbushrm.h
++	src/activitysummary.h
++	src/activitysample.h
++	src/devicefactory.h
++	src/services/mibandservice.h
++	src/services/miband2service.h
++	src/services/alertnotificationservice.h
++	src/services/hrmservice.h
++	src/services/deviceinfoservice.h
++	src/services/bipfirmwareservice.h
++	src/operations/abstractoperation.h
++	src/operations/activityfetchoperation.h
++	src/operations/logfetchoperation.h
++	src/operations/sportssummaryoperation.h
++	src/operations/updatefirmwareoperation.h
++	src/operations/sportsdetailoperation.h
++	src/operations/abstractfetchoperation.h
++	src/devices/abstractdevice.h
++	src/devices/bipdevice.h
++	src/bipactivitydetailparser.h
++	src/activitycoordinate.h
++
++	# Qble
++	${PROJECT_SOURCE_DIR}/qble/qbledevice.h
++	${PROJECT_SOURCE_DIR}/qble/qbleservice.h
++	${PROJECT_SOURCE_DIR}/qble/qblecharacteristic.h
++	${PROJECT_SOURCE_DIR}/qble/bluezadapter.h)
++
++include_directories(
++	${PROJECT_SOURCE_DIR}/lib/src
++	src
++	src/devices
++	src/operations
++	src/services
++	libwatchfish)
++
++add_executable(harbour-amazfishd ${SRC} ${HEADERS})
++
++# TODO: Debug, remove
++set_target_properties(harbour-amazfishd PROPERTIES COMPILE_OPTIONS "-w")
++
++target_link_libraries(harbour-amazfishd
++	Qt5::Bluetooth
++	Qt5::Location
++	Qt5::DBus
++	Qt5::Xml
++	KDb
++	amazfish
++	z)
++
++# libwatchfish
++if (EXISTS "/usr/lib/qt5/qml/Sailfish/Silica/SilicaGridView.qml")
++	add_definitions(-DMER_EDITION_SAILFISH=TRUE)
++	set(MER_EDITION_SAILFISH TRUE)
++
++	pkg_check_modules(MLITE5 mlite5 REQUIRED IMPORTED_TARGET)
++	if(MLITE5_FOUND)
++		set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND mlite5)
++	else()
++		set_property(GLOBAL APPEND PROPERTY PACKAGES_NOT_FOUND mlite5)
++	endif()
++	target_link_libraries(watchfish
++		Qt5::Contacts
++		PkgConfig::MLITE5)
++	set(WATCHFIST_FEATURE_NOTIFICATIONMONITOR TRUE)
++	set(WATCHFIST_FEATURE_MUSIC TRUE)
++	set(WATCHFIST_FEATURE_CALENDAR TRUE)
++	set(WATCHFIST_FEATURE_VOICECALL TRUE)
++else()
++	set(MER_EDITION_SAILFISH FALSE)
++	set(WATCHFIST_FEATURE_NOTIFICATIONMONITOR TRUE)
++	set(WATCHFIST_FEATURE_MUSIC TRUE)
++	set(WATCHFIST_FEATURE_CALENDAR TRUE)
++endif()
++
++if (WATCHFIST_FEATURE_NOTIFICATIONMONITOR)
++	target_link_libraries(harbour-amazfishd
++		dbus-1)
++
++	list(APPEND SRC
++		libwatchfish/notificationmonitor.cpp
++		libwatchfish/notification.cpp)
++	target_sources(harbour-amazfishd
++		PUBLIC
++			libwatchfish/notificationmonitor.h
++			libwatchfish/notificationmonitor_p.h
++			libwatchfish/notification.h)
++
++endif()
++
++if (WATCHFIST_FEATURE_WALLTIME)
++	pkg_check_modules(TIMED-QT timed-qt5 REQUIRED IMPORTED_TARGET)
++	if(TIMED-QT_FOUND)
++		set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND timed-qt5)
++	else()
++		set_property(GLOBAL APPEND PROPERTY PACKAGES_NOT_FOUND timed-qt5)
++	endif()
++
++	target_link_libraries(harbour-amazfishd
++		PkgConfig::TIMED-QT)
++
++	list(APPEND SRC
++		libwatchfish/walltimemonitor.cpp)
++	list(APPEND HEADERS
++		libwatchfish/walltimemonitor.h
++		libwatchfish/walltimemonitor_p.h)
++	target_sources(harbour-amazfishd
++		PUBLIC
++			libwatchfish/walltimemonitor.h
++			libwatchfish/walltimemonitor_p.h)
++
++endif()
++
++if (WATCHFIST_FEATURE_MUSIC)
++	target_link_libraries(harbour-amazfishd
++		PkgConfig::MPRIS-QT)
++
++	target_sources(harbour-amazfishd
++		PUBLIC
++			libwatchfish/musiccontroller.cpp
++			libwatchfish/musiccontroller.h
++			libwatchfish/musiccontroller_p.h)
++	list(APPEND SRC
++		libwatchfish/musiccontroller.cpp)
++endif()
++
++if (WATCHFIST_FEATURE_CALENDAR)
++	if (EXISTS "/usr/lib/qt5/qml/Sailfish/Silica/SilicaGridView.qml")
++		target_link_libraries(harbour-amazfishd
++			libmkcal-qt5
++			libkcalcoren-qt5)
++	else()
++		target_link_libraries(harbour-amazfishd
++			KF5::Contacts)
++	endif()
++
++	list(APPEND SRC
++		libwatchfish/calendarsource.cpp
++		libwatchfish/calendarevent.cpp)
++	target_sources(harbour-amazfishd
++		PUBLIC
++			libwatchfish/calendarsource.h
++			libwatchfish/calendarevent.h)
++
++	if (MER_EDITION_SAILFISH)
++		target_sources(harbour-amazfishd
++			PUBLIC
++				libwatchfish/calendarsource_p.h)
++	endif()
++endif()
++
++if (WATCHFIST_FEATURE_VOICECALL)
++	list(APPEND SRC
++		libwatchfish/voicecallcontroller.cpp)
++	target_sources(harbour-amazfishd
++		PUBLIC
++			libwatchfish/voicecallcontroller.h
++			libwatchfish/voicecallcontroller_p.h)
++endif()
++
++if (WATCHFIST_FEATURE_VOLUME)
++	list(APPEND SRC
++		libwatchfish/volumecontroller.cpp)
++	target_sources(harbour-amazfishd
++		PUBLIC
++			libwatchfish/volumecontroller.h
++			libwatchfish/volumecontroller_p.h)
++endif()
++
++install(TARGETS harbour-amazfishd RUNTIME
++	DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+new file mode 100644
+index 0000000..a70df02
+--- /dev/null
++++ b/lib/CMakeLists.txt
+@@ -0,0 +1,19 @@
++set(SRC
++	src/amazfishconfig.cpp
++	src/weather/city.cpp
++	src/weather/citymanager.cpp
++	src/weather/citysearchmodel.cpp
++	src/weather/currentweather.cpp)
++set(HEADERS
++	src/amazfishconfig.h
++	src/weather/apikey.h
++	src/weather/city.h
++	src/weather/citymanager.h
++	src/weather/citysearchmodel.h
++	src/weather/currentweather.h)
++
++add_library(amazfish SHARED ${SRC} ${HEADERS})
++
++target_link_libraries(amazfish
++	Qt5::Core
++	Qt5::Network)

main/kdb/APKBUILD

@@ -0,0 +1,51 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=kdb
+pkgver=3.2.0_git20201116
+pkgrel=0
+_commit="b36d74f13a1421437a725fb74502c993c359392a"
+pkgdesc="A database connectivity and creation framework for various database vendors"
+url="http://www.kexi-project.org"
+arch="all"
+license="LGPL-2.0-or-later"
+depends_dev="
+	icu-dev
+	kcoreaddons-dev
+	ki18n-dev
+	postgresql-dev
+	qt5-qtbase-dev
+	"
+makedepends="$depends_dev
+	doxygen
+	extra-cmake-modules
+	qt5-qttools-dev
+	"
+subpackages="$pkgname-dev $pkgname-doc"
+#source="https://download.kde.org/stable/kdb/src/kdb-$pkgver.tar.xz"
+source="https://invent.kde.org/libraries/kdb/-/archive/$_commit/kdb-$_commit.tar.gz
+	include-kdeinstalldirs-as-first-thing.patch
+	"
+builddir="$srcdir/$pkgname-$_commit"
+
+build() {
+	cmake -B build \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_QCH=ON \
+		-DBUILD_TESTING=ON
+	cmake --build build
+}
+
+check() {
+	cd build
+	# HeadersTest requires itself to be installed
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "HeadersTest"
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="ff61fad286083eee2c6b17655e5b9fbb7ecbb0dfc492fbf9f6781ce4808ce0a2fe2f554bd351d2a4c4d7c5821692194bb88043252448bbf43abc631d96fb0ba4  kdb-b36d74f13a1421437a725fb74502c993c359392a.tar.gz
+c8593da0841a422fa7085144916d90552b4ff47e2776ad9fb442c4f609747b92d4e60b5ef2cda1af4f21809e2bfaf0db0dbea742352184b3652feaf722f41089  include-kdeinstalldirs-as-first-thing.patch"

main/kdb/include-kdeinstalldirs-as-first-thing.patch

@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+

main/linux-postmarketos-allwinner/0003-Disable-8723cs-power-saving.patch

@@ -1,34 +0,0 @@
-From 1020a8a88853f2b9dbbd269079cccb07e9f6e5aa Mon Sep 17 00:00:00 2001
-From: Dalton <dalton@ubports.com>
-Date: Tue, 23 Jun 2020 20:54:12 -0500
-Subject: [PATCH] Disable 8723cs power saving
-
-The runtime power management features in the 8723cs firmware on the
-PinePhone don't seem to work correctly. While we expect the chipset to
-leave a low power state when it's time to send or receive data, instead
-we get a delay of 10-20 seconds before any packets are sent.
----
- drivers/staging/rtl8723cs-new/os_dep/linux/os_intfs.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/staging/rtl8723cs-new/os_dep/linux/os_intfs.c b/drivers/staging/rtl8723cs-new/os_dep/linux/os_intfs.c
-index 3e6ba0a0fd17..5bb850a4caf0 100644
---- a/drivers/staging/rtl8723cs-new/os_dep/linux/os_intfs.c
-+++ b/drivers/staging/rtl8723cs-new/os_dep/linux/os_intfs.c
-@@ -54,7 +54,12 @@ int rtw_adhoc_tx_pwr = 1;
- int rtw_soft_ap = 0;
- /* int smart_ps = 1; */
- #ifdef CONFIG_POWER_SAVING
--	int rtw_power_mgnt = PS_MODE_MAX;
-+	// Setting PS_MODE_ACTIVE by default keeps the power saving code in the
-+	// driver but works around an issue where the 8723cs won't leave Leisure
-+	// Power Saving mode without long delays. Allows for testing different
-+	// firmwares.
-+	// int rtw_power_mgnt = PS_MODE_MAX;
-+	int rtw_power_mgnt = PS_MODE_ACTIVE;
- 	#ifdef CONFIG_IPS_LEVEL_2
- 		int rtw_ips_mode = IPS_LEVEL_2;
- 	#else
--- 
-2.25.4
-

main/linux-postmarketos-allwinner/0009-dts-pinephone-allow-leds-in-suspend.patch

@@ -1,45 +0,0 @@
-From b9517238d29b2d0b6ddb1664454d1bba894cb2ea Mon Sep 17 00:00:00 2001
-From: Miles Alan <m@milesalan.com>
-Date: Wed, 11 Nov 2020 12:51:01 +0100
-Subject: [PATCH] dts: pinephone: allow leds in suspend
-
-Seems to be a regression since we switched to the 5.9/megi kernel - LEDs
-should be allowed to stay on in suspend for status etc. Sxmo depends on
-this functionality so that the users know the phone is on and in suspend
-rather then off.
-
-Patch taken from:
-https://gitlab.com/postmarketOS/pmaports/-/merge_requests/1691
----
- arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index d897b6a28cc4..73b3f54528ff 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -204,18 +204,21 @@ blue {
- 			function = LED_FUNCTION_INDICATOR;
- 			color = <LED_COLOR_ID_BLUE>;
- 			gpios = <&pio 3 20 GPIO_ACTIVE_HIGH>; /* PD20 */
-+			retain-state-suspended;
- 		};
- 
- 		green {
- 			function = LED_FUNCTION_INDICATOR;
- 			color = <LED_COLOR_ID_GREEN>;
- 			gpios = <&pio 3 18 GPIO_ACTIVE_HIGH>; /* PD18 */
-+			retain-state-suspended;
- 		};
- 
- 		red {
- 			function = LED_FUNCTION_INDICATOR;
- 			color = <LED_COLOR_ID_RED>;
- 			gpios = <&pio 3 19 GPIO_ACTIVE_HIGH>; /* PD19 */
-+			retain-state-suspended;
- 		};
- 	};
- 
--- 
-2.25.4
-

main/linux-postmarketos-allwinner/APKBUILD

@@ -5,9 +5,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=5.9.10_git20201123
+pkgver=5.10.0_git20201202
 pkgrel=1
-_tag="orange-pi-5.9-20201123-0250"
+_tag="orange-pi-5.10-20201202-1530"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64"
 _carch="arm64"
@@ -28,14 +28,12 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
 	config-$_flavor.aarch64
 	0001-dts-add-dontbeevil-pinephone-devkit.patch
 	0002-dts-add-pinetab-dev-old-display-panel.patch
-	0003-Disable-8723cs-power-saving.patch
-	0004-media-gc2145-Added-BGGR-bayer-mode.patch
-	0005-dts-pinetab-add-missing-bma223-ohci1.patch
-	0006-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
-	0007-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
-	0008-dts-pinephone-remove-bt-firmware-suffix.patch
-	0009-dts-pinephone-allow-leds-in-suspend.patch
-	0010-media-ov5640-Implement-autofocus.patch
+	0003-media-gc2145-Added-BGGR-bayer-mode.patch
+	0004-dts-pinetab-add-missing-bma223-ohci1.patch
+	0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+	0006-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
+	0007-dts-pinephone-remove-bt-firmware-suffix.patch
+	0008-media-ov5640-Implement-autofocus.patch
 	"
 subpackages="$pkgname-dev"
 builddir="$srcdir/linux-$_tag"
@@ -76,15 +74,13 @@ dev() {
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }
 
-sha512sums="2fc654070d93352f383d777859e65529ca92c3258ffcb629150d4ac85a2156f7eb030bb8c4906d3ea4b3aba55087afbbd8f18dcd5f0bc53b1956704730f2800d  linux-postmarketos-allwinner-orange-pi-5.9-20201123-0250.tar.gz
-16d1117142425abb47c8eea1f10af5ac8aa02ed06aa165a0eb74dfb8b0cb6d9e5fc9ebc08f7830432d8856002713c5dd0fad23ce1725710af09c7d49c3ab457e  config-postmarketos-allwinner.aarch64
+sha512sums="eab6c6371997b48954a8eae2bab1c132ce9d50f6162045360098aa7d3bfea0cd99f65586401b9f34fb4e63bd49fa504ec14c4ebdc658b584b7a5ce07ba0b5981  linux-postmarketos-allwinner-orange-pi-5.10-20201202-1530.tar.gz
+b2c05a08d994f7dc310673859c3411af73e3bf51ae8662afcb3a9f502d3d313462cac5115be2fb4cdfd156f0f56a8e60ebe960d3a3424b0bbb90622ba74b0658  config-postmarketos-allwinner.aarch64
 6b96dcdca84f0581d1f6354dfb752ef382b2a70793e881233e71c2af0c58d0eed965be7a494308a639e2e9035e46535f659e0c1721c0e3b8444a2ac981d7dc99  0001-dts-add-dontbeevil-pinephone-devkit.patch
 5cd62667ebe1d5213d5d89423fe2a810c55fa84a238790af5f087b31cee3a3db66bcaba14001c345731bc1212060f74c0629433403be2485a5bbd4f0dd1c4f65  0002-dts-add-pinetab-dev-old-display-panel.patch
-9ce2497ee1e4efd049bb41051f4e7f20bd82c2b0ed608e37d119b4973d0bc96361366fee56924c403b28d03a55264d97ac8744face524f1b88cd2731c5914509  0003-Disable-8723cs-power-saving.patch
-d92db05628de20c57f69edd0558fc56eb5a1c90f6dd3046813dc2b8c7393030f55e4980ae4135f9a03dadfe9ea0d51755d997c0ba8933af7091277a5fa3a611b  0004-media-gc2145-Added-BGGR-bayer-mode.patch
-10eb10fe09258e524b8770961e44bcda55189f86b0f21cf12c831beb94e9b81c66857771bbe75833d56a7bd44907efceb0e1c4022fcaaf8f1d106a83ec8a19eb  0005-dts-pinetab-add-missing-bma223-ohci1.patch
-26bd19eb7849ad59ac73a002edeb5d015630c0f802b4da1ec75a01581aeb406350097b5e37ef5c0981cc503cdbfc4d24d446c193a533f01e3e4b51426c9e192e  0006-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
-79f244794906b84f2033b04429f9bf187f171291c8f808a65f6d2c3a9b8a029eb0460f281148ff4a43c12be4fac3d78fcc4ddfa4c14e687a3f7fc310a5921048  0007-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
-11e3210958afcd9a04885f364d9ce707845173430581601cc8d08451529f80aab137f1c578ab3453e7249fe38001eb6aafe728ba5e34e39b65c7e47a3ecd9fda  0008-dts-pinephone-remove-bt-firmware-suffix.patch
-8654178915bc8251239cc2d2ee8b2f1fad6089d3fc0127d11cb1826eb88abf8b7e01aaf7e620a9e15cbc993e1120da27896b229d32a339eeb829fba7076e3efe  0009-dts-pinephone-allow-leds-in-suspend.patch
-510e1cf463485315f99dfc86511fb7271591159c39cf1bbeecbc1056f8861c35603d61946f3488bfbb7a779ce9324c69d230fa159386b7920f866b47ada444a4  0010-media-ov5640-Implement-autofocus.patch"
+d92db05628de20c57f69edd0558fc56eb5a1c90f6dd3046813dc2b8c7393030f55e4980ae4135f9a03dadfe9ea0d51755d997c0ba8933af7091277a5fa3a611b  0003-media-gc2145-Added-BGGR-bayer-mode.patch
+10eb10fe09258e524b8770961e44bcda55189f86b0f21cf12c831beb94e9b81c66857771bbe75833d56a7bd44907efceb0e1c4022fcaaf8f1d106a83ec8a19eb  0004-dts-pinetab-add-missing-bma223-ohci1.patch
+26bd19eb7849ad59ac73a002edeb5d015630c0f802b4da1ec75a01581aeb406350097b5e37ef5c0981cc503cdbfc4d24d446c193a533f01e3e4b51426c9e192e  0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+79f244794906b84f2033b04429f9bf187f171291c8f808a65f6d2c3a9b8a029eb0460f281148ff4a43c12be4fac3d78fcc4ddfa4c14e687a3f7fc310a5921048  0006-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
+11e3210958afcd9a04885f364d9ce707845173430581601cc8d08451529f80aab137f1c578ab3453e7249fe38001eb6aafe728ba5e34e39b65c7e47a3ecd9fda  0007-dts-pinephone-remove-bt-firmware-suffix.patch
+510e1cf463485315f99dfc86511fb7271591159c39cf1bbeecbc1056f8861c35603d61946f3488bfbb7a779ce9324c69d230fa159386b7920f866b47ada444a4  0008-media-ov5640-Implement-autofocus.patch"

main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64

@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.9.10 Kernel Configuration
+# Linux/arm64 5.10.0-rc6 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre0) 10.2.1 20201113"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
@@ -49,6 +49,7 @@ CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
+CONFIG_GENERIC_IRQ_IPI=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_IRQ_MSI_IOMMU=y
@@ -237,7 +238,8 @@ CONFIG_ARM64=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
 CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_CONT_SHIFT=4
+CONFIG_ARM64_CONT_PTE_SHIFT=4
+CONFIG_ARM64_CONT_PMD_SHIFT=4
 CONFIG_ARCH_MMAP_RND_BITS_MIN=18
 CONFIG_ARCH_MMAP_RND_BITS_MAX=33
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
@@ -301,6 +303,7 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_THUNDER2 is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_VISCONTI is not set
 # CONFIG_ARCH_XGENE is not set
 # CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set
@@ -331,6 +334,7 @@ CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
 CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
+CONFIG_ARM64_ERRATUM_1508412=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -382,7 +386,6 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -392,8 +395,6 @@ CONFIG_XEN_DOM0=y
 CONFIG_XEN=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
-CONFIG_ARM64_SSBD=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -456,6 +457,7 @@ CONFIG_CMDLINE="console=ttyAMA0"
 
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
 
 #
 # Power management options
@@ -546,7 +548,6 @@ CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_ARM_SCPI_POWER_DOMAIN=y
 # CONFIG_ARM_SDE_INTERFACE is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_EFI_EARLYCON=y
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_HAVE_ARM_SMCCC=y
@@ -586,6 +587,7 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
 #
 CONFIG_CRASH_CORE=y
 CONFIG_KEXEC_CORE=y
+CONFIG_SET_FS=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
@@ -619,7 +621,9 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
@@ -628,6 +632,7 @@ CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
@@ -650,7 +655,6 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 CONFIG_HAVE_ARCH_COMPILER_H=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 
@@ -1350,7 +1354,6 @@ CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_NET=y
-CONFIG_OF_MDIO=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
@@ -1397,6 +1400,7 @@ CONFIG_BLK_DEV_NBD=m
 CONFIG_SRAM=y
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_PVPANIC is not set
+# CONFIG_HISI_HIKEY_USB is not set
 CONFIG_MODEM_POWER=y
 # CONFIG_C2PORT is not set
 
@@ -1419,13 +1423,6 @@ CONFIG_MODEM_POWER=y
 
 # CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_ALTERA_STAPL is not set
-
-#
-# Intel MIC & related support
-#
-# CONFIG_VOP_BUS is not set
-# end of Intel MIC & related support
-
 # CONFIG_ECHO is not set
 # CONFIG_MISC_RTSX_USB is not set
 # CONFIG_UACCE is not set
@@ -1583,53 +1580,30 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVRES=y
-# CONFIG_MDIO_BCM_UNIMAC is not set
-CONFIG_MDIO_BITBANG=y
-CONFIG_MDIO_BUS_MUX=y
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-CONFIG_MDIO_BUS_MUX_MMIOREG=y
-# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
-# CONFIG_MDIO_GPIO is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_IPQ4019 is not set
-# CONFIG_MDIO_IPQ8064 is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-# CONFIG_MDIO_MVUSB is not set
-# CONFIG_MDIO_OCTEON is not set
-# CONFIG_MDIO_SUN4I is not set
-# CONFIG_MDIO_XPCS is not set
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
 # CONFIG_LED_TRIGGER_PHY is not set
+CONFIG_FIXED_PHY=y
 
 #
 # MII PHY device drivers
 #
-# CONFIG_ADIN_PHY is not set
 # CONFIG_AMD_PHY is not set
+# CONFIG_ADIN_PHY is not set
 # CONFIG_AQUANTIA_PHY is not set
 # CONFIG_AX88796B_PHY is not set
-# CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_BCM54140_PHY is not set
+# CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCM84881_PHY is not set
+# CONFIG_BCM87XX_PHY is not set
 # CONFIG_CICADA_PHY is not set
 # CONFIG_CORTINA_PHY is not set
 # CONFIG_DAVICOM_PHY is not set
-# CONFIG_DP83822_PHY is not set
-# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-# CONFIG_DP83869_PHY is not set
-CONFIG_FIXED_PHY=y
 # CONFIG_ICPLUS_PHY is not set
+# CONFIG_LXT_PHY is not set
 # CONFIG_INTEL_XWAY_PHY is not set
 # CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LXT_PHY is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MARVELL_10G_PHY is not set
 # CONFIG_MICREL_PHY is not set
@@ -1643,11 +1617,45 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_REALTEK_PHY=m
 # CONFIG_RENESAS_PHY is not set
 # CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_SMSC_PHY is not set
+CONFIG_SMSC_PHY=m
 # CONFIG_STE10XP is not set
 # CONFIG_TERANETICS_PHY is not set
+# CONFIG_DP83822_PHY is not set
+# CONFIG_DP83TC811_PHY is not set
+# CONFIG_DP83848_PHY is not set
+# CONFIG_DP83867_PHY is not set
+# CONFIG_DP83869_PHY is not set
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_XILINX_GMII2RGMII is not set
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_OF_MDIO=y
+CONFIG_MDIO_DEVRES=y
+# CONFIG_MDIO_SUN4I is not set
+CONFIG_MDIO_BITBANG=y
+# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_MDIO_GPIO is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_MVUSB is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
+# CONFIG_MDIO_OCTEON is not set
+# CONFIG_MDIO_IPQ4019 is not set
+# CONFIG_MDIO_IPQ8064 is not set
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=y
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
+CONFIG_MDIO_BUS_MUX_MMIOREG=y
+
+#
+# PCS device drivers
+#
+# CONFIG_PCS_XPCS is not set
+# end of PCS device drivers
+
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
 CONFIG_USB_NET_DRIVERS=y
@@ -1903,6 +1911,7 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_ZINITIX is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -2026,6 +2035,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+# CONFIG_VIRTIO_CONSOLE is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
@@ -2033,6 +2043,7 @@ CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_BA431 is not set
 CONFIG_HW_RANDOM_OPTEE=m
 # CONFIG_HW_RANDOM_CCTRNG is not set
+# CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_DEVMEM=y
 # CONFIG_RAW_DRIVER is not set
 CONFIG_TCG_TPM=y
@@ -2116,6 +2127,7 @@ CONFIG_I2C_RK3X=y
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 # CONFIG_I2C_SLAVE_EEPROM is not set
+# CONFIG_I2C_SLAVE_TESTUNIT is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -2150,6 +2162,12 @@ CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_OCELOT is not set
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
 CONFIG_PINCTRL_SUNXI=y
 # CONFIG_PINCTRL_SUN4I_A10 is not set
 # CONFIG_PINCTRL_SUN5I is not set
@@ -2167,6 +2185,8 @@ CONFIG_PINCTRL_SUN8I_H3_R=y
 # CONFIG_PINCTRL_SUN9I_A80_R is not set
 CONFIG_PINCTRL_SUN50I_A64=y
 CONFIG_PINCTRL_SUN50I_A64_R=y
+CONFIG_PINCTRL_SUN50I_A100=y
+CONFIG_PINCTRL_SUN50I_A100_R=y
 CONFIG_PINCTRL_SUN50I_H5=y
 CONFIG_PINCTRL_SUN50I_H6=y
 CONFIG_PINCTRL_SUN50I_H6_R=y
@@ -2176,6 +2196,8 @@ CONFIG_OF_GPIO=y
 CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=y
 
 #
@@ -2228,8 +2250,6 @@ CONFIG_GPIO_PCA953X_IRQ=y
 # CONFIG_GPIO_AGGREGATOR is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_W1 is not set
-CONFIG_POWER_AVS=y
-# CONFIG_QCOM_CPR is not set
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_BRCMSTB=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -2253,7 +2273,6 @@ CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_MANAGER_SBS is not set
@@ -2279,6 +2298,7 @@ CONFIG_AXP288_FUEL_GAUGE=y
 # CONFIG_CHARGER_BQ24735 is not set
 # CONFIG_CHARGER_BQ2515X is not set
 # CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_BQ25980 is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_CHARGER_RT9455 is not set
@@ -2350,6 +2370,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_MAX31790 is not set
 # CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_TC654 is not set
+# CONFIG_SENSORS_MR75203 is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM73 is not set
 # CONFIG_SENSORS_LM75 is not set
@@ -2537,6 +2558,7 @@ CONFIG_MFD_AXP20X_RSB=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SL28CPLD is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_ABX500_CORE is not set
@@ -2624,6 +2646,9 @@ CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_PWM=y
 # CONFIG_REGULATOR_QCOM_SPMI is not set
 # CONFIG_REGULATOR_QCOM_USB_VBUS is not set
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+# CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RTMV20 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
@@ -3000,7 +3025,6 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_RCAR_WRITEBACK=y
 CONFIG_DRM_SUN4I=y
 CONFIG_DRM_SUN4I_HDMI=y
 # CONFIG_DRM_SUN4I_HDMI_CEC is not set
@@ -3030,6 +3054,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
 # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
 # CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
@@ -3041,6 +3066,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
@@ -3064,6 +3090,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CDNS_DSI is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_LONTIUM_LT9611 is not set
 # CONFIG_DRM_LVDS_CODEC is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_NWL_MIPI_DSI is not set
@@ -3075,15 +3102,18 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_SII9234 is not set
 # CONFIG_DRM_SIMPLE_BRIDGE is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
+# CONFIG_DRM_TOSHIBA_TC358762 is not set
 # CONFIG_DRM_TOSHIBA_TC358764 is not set
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 # CONFIG_DRM_TOSHIBA_TC358768 is not set
+# CONFIG_DRM_TOSHIBA_TC358775 is not set
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
 # CONFIG_DRM_TI_TPD12S015 is not set
 # CONFIG_DRM_ANALOGIX_ANX6345 is not set
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
+# CONFIG_DRM_CDNS_MHDP8546 is not set
 CONFIG_DRM_DW_HDMI=y
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
@@ -3145,6 +3175,7 @@ CONFIG_FB_SIMPLE=y
 CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_LCD_PLATFORM is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_KTD253 is not set
 CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -3307,6 +3338,7 @@ CONFIG_SND_SOC_BT_SCO=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4234 is not set
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
 # CONFIG_SND_SOC_CS4271_I2C is not set
@@ -3357,6 +3389,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_STI_SAS is not set
 # CONFIG_SND_SOC_TAS2552 is not set
 # CONFIG_SND_SOC_TAS2562 is not set
+# CONFIG_SND_SOC_TAS2764 is not set
 # CONFIG_SND_SOC_TAS2770 is not set
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
@@ -3453,6 +3486,7 @@ CONFIG_HID_EZKEY=y
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_GLORIOUS is not set
 # CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_VIVALDI is not set
 # CONFIG_HID_GT683R is not set
 # CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
@@ -3548,6 +3582,7 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_PRODUCTLIST is not set
@@ -3850,12 +3885,14 @@ CONFIG_TYPEC=y
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_TYPEC_RT1711H is not set
+# CONFIG_TYPEC_TCPCI_MAXIM is not set
 # CONFIG_TYPEC_FUSB302 is not set
 CONFIG_TYPEC_UCSI=m
 # CONFIG_UCSI_CCG is not set
 CONFIG_TYPEC_ANX7688=m
 # CONFIG_TYPEC_HD3SS3220 is not set
 # CONFIG_TYPEC_TPS6598X is not set
+# CONFIG_TYPEC_STUSB160X is not set
 
 #
 # USB Type-C Multiplexer/DeMultiplexer Switch support
@@ -3935,6 +3972,7 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP3952 is not set
+# CONFIG_LEDS_LP50XX is not set
 # CONFIG_LEDS_LP55XX_COMMON is not set
 # CONFIG_LEDS_LP8860 is not set
 # CONFIG_LEDS_PCA955X is not set
@@ -4040,6 +4078,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
 # CONFIG_RTC_DRV_RV3028 is not set
+# CONFIG_RTC_DRV_RV3032 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
 # CONFIG_RTC_DRV_SD3078 is not set
 
@@ -4254,16 +4293,16 @@ CONFIG_ASHMEM=y
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_WFX is not set
-CONFIG_RTL8723CS_NEW=m
+# CONFIG_SPMI_HISI3670 is not set
+# CONFIG_MFD_HI6421_SPMI is not set
+CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
-# CONFIG_MFD_CROS_EC is not set
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_HAVE_CLK=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
-# CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_SCPI=y
 # CONFIG_COMMON_CLK_SI5341 is not set
@@ -4286,6 +4325,8 @@ CONFIG_CLK_SUNXI_PRCM_SUN8I=y
 CONFIG_CLK_SUNXI_PRCM_SUN9I=y
 CONFIG_SUNXI_CCU=y
 CONFIG_SUN50I_A64_CCU=y
+CONFIG_SUN50I_A100_CCU=y
+CONFIG_SUN50I_A100_R_CCU=y
 CONFIG_SUN50I_H6_CCU=y
 CONFIG_SUN50I_H6_R_CCU=y
 # CONFIG_SUN8I_A83T_CCU is not set
@@ -4338,6 +4379,7 @@ CONFIG_ARM_SMMU=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_V3=y
+# CONFIG_ARM_SMMU_V3_SVA is not set
 
 #
 # Remoteproc drivers
@@ -4434,6 +4476,8 @@ CONFIG_MEMORY=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 # CONFIG_IIO_BUFFER_CB is not set
+# CONFIG_IIO_BUFFER_DMA is not set
+# CONFIG_IIO_BUFFER_DMAENGINE is not set
 # CONFIG_IIO_BUFFER_HW_CONSUMER is not set
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_TRIGGERED_BUFFER=m
@@ -4442,6 +4486,7 @@ CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_IIO_SW_DEVICE is not set
 # CONFIG_IIO_SW_TRIGGER is not set
+# CONFIG_IIO_TRIGGERED_EVENT is not set
 
 #
 # Accelerometers
@@ -4610,6 +4655,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AM2315 is not set
 # CONFIG_DHT11 is not set
 # CONFIG_HDC100X is not set
+# CONFIG_HDC2010 is not set
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
@@ -4637,6 +4683,7 @@ CONFIG_INV_MPU6050_I2C=m
 # CONFIG_AL3320A is not set
 # CONFIG_APDS9300 is not set
 # CONFIG_APDS9960 is not set
+# CONFIG_AS73211 is not set
 # CONFIG_BH1750 is not set
 # CONFIG_BH1780 is not set
 # CONFIG_CM32181 is not set
@@ -4822,6 +4869,7 @@ CONFIG_RESET_SUNXI=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 CONFIG_PHY_XGENE=y
+# CONFIG_USB_LGM_PHY is not set
 CONFIG_PHY_SUN4I_USB=y
 CONFIG_PHY_SUN6I_MIPI_DPHY=y
 # CONFIG_PHY_SUN9I_USB is not set
@@ -4852,6 +4900,7 @@ CONFIG_PHY_SAMSUNG_USB2=y
 #
 # CONFIG_ARM_CCI_PMU is not set
 # CONFIG_ARM_CCN is not set
+# CONFIG_ARM_CMN is not set
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
@@ -5246,6 +5295,7 @@ CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 
 #
@@ -5314,21 +5364,16 @@ CONFIG_CRYPTO_SM3=m
 #
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_TI is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_SALSA20 is not set
 CONFIG_CRYPTO_CHACHA20=m
-# CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SERPENT is not set
 # CONFIG_CRYPTO_SM4 is not set
-# CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 
 #
@@ -5488,6 +5533,7 @@ CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_REMAP=y
 CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_CMA=y
+CONFIG_DMA_PERNUMA_CMA=y
 
 #
 # Default contiguous memory area size:
@@ -5518,6 +5564,7 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
+CONFIG_ARCH_STACKWALK=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
 # end of Library routines
@@ -5653,6 +5700,8 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)
 
 # CONFIG_STACKTRACE is not set
@@ -5675,7 +5724,7 @@ CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 #
 # RCU Debugging
 #
-# CONFIG_RCU_PERF_TEST is not set
+# CONFIG_RCU_SCALE_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_REF_SCALE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
@@ -5735,7 +5784,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
-# CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_XARRAY is not set
 # CONFIG_TEST_OVERFLOW is not set

main/linux-postmarketos-exynos4/0002-Input-atmel_mxt_ts-fix-lost-interrupts.patch

@@ -0,0 +1,52 @@
+From 8c3b55a299c325830a987de21dab6a89ecb71164 Mon Sep 17 00:00:00 2001
+From: Linus Walleij <linus.walleij@linaro.org>
+Date: Tue, 1 Dec 2020 09:55:29 -0800
+Subject: [PATCH] Input: atmel_mxt_ts - fix lost interrupts
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+After commit 74d905d2d38a devices requiring the workaround for edge
+triggered interrupts stopped working.
+
+The hardware needs the quirk to be used before even proceeding to
+check if the quirk is needed because mxt_acquire_irq() is called
+before mxt_check_retrigen() is called and at this point pending IRQs
+need to be checked, and if the workaround is not active, all
+interrupts will be lost from this point.
+
+Solve this by switching the calls around.
+
+Reported-by: Andre Müller <andre.muller@web.de>
+Tested-by: Andre Müller <andre.muller@web.de>
+Suggested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Fixes: 74d905d2d38a ("Input: atmel_mxt_ts - only read messages in mxt_acquire_irq() when necessary")
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20201201123026.1416743-1-linus.walleij@linaro.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+---
+ drivers/input/touchscreen/atmel_mxt_ts.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
+index 6b71b0aff115..99a33cd5e675 100644
+--- a/drivers/input/touchscreen/atmel_mxt_ts.c
++++ b/drivers/input/touchscreen/atmel_mxt_ts.c
+@@ -2183,11 +2183,11 @@ static int mxt_initialize(struct mxt_data *data)
+ 		msleep(MXT_FW_RESET_TIME);
+ 	}
+ 
+-	error = mxt_acquire_irq(data);
++	error = mxt_check_retrigen(data);
+ 	if (error)
+ 		return error;
+ 
+-	error = mxt_check_retrigen(data);
++	error = mxt_acquire_irq(data);
+ 	if (error)
+ 		return error;
+ 
+-- 
+2.25.1
+

main/linux-postmarketos-exynos4/APKBUILD

@@ -3,7 +3,7 @@
 # Kernel config based on: arch/arm/configs/exynos_defconfig
 
 pkgname=linux-postmarketos-exynos4
-pkgver=5.9.1
+pkgver=5.9.12
 pkgrel=0
 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices"
 arch="armv7"
@@ -24,6 +24,7 @@ source="
 	https://cdn.kernel.org/pub/linux/kernel/v${_kernver%%.*}.x/linux-$_kernver.tar.xz
 	$_config
 	0001-ARM-decompressor-Flush-tlb-before-swiching-domain-0-.patch
+	0002-Input-atmel_mxt_ts-fix-lost-interrupts.patch
 	initramfs.list
 	init
 "
@@ -62,8 +63,9 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
 
-sha512sums="96af08c1dc964e5dbb3d221880ef8ca246f13370d2dc2f5ae64039f0352efc687c7446a2b4f86dad553b776ee75f78bbf58bb9bc845c9b57a9013ece63264874  linux-5.9.1.tar.xz
-c817cbc005b7f3c14c2f171c800753b6180f3a72d8164db977c341015b331fe0865c4024454a22604765bc53f1df4554b29f3c8b86c3ab9f8020c8ba148960e7  config-postmarketos-exynos4.armv7
+sha512sums="164a89388a56140140e0b4ba3f39a45f85a73c9862f5104cf591a6d6826cfc2498b4080f862cc592f04853328ba9236f8aa305e4f0f876f6b18eda2e42ea6dcb  linux-5.9.12.tar.xz
+287dccd4028590a94aa6c068975ec94f7fe5fc3184acb4c70ffebb2e39d62ed2e5f1456b78db1120d38046c42b6cbddbe3aac30134812c101ace7c8c3752c148  config-postmarketos-exynos4.armv7
 4bb111db4396a1981ad0883737c6594ca93701699846298b940d2ea202c666be0158a0f9ddc5b95b9147fa4cfe62639512ae78e9315f8d975b379ccc4e15da36  0001-ARM-decompressor-Flush-tlb-before-swiching-domain-0-.patch
+fa5cd612690276dd3f37906674a86e0de74208bfc8ab28a689d0ea4cec13987deda75f72c084a7da03699738cd03d5977d597942796aacaac59d399e7369b236  0002-Input-atmel_mxt_ts-fix-lost-interrupts.patch
 aaff0332b90e1f9f62de1128cace934717336e54ab09de46477369fa808302482d97334e43a85ee8597c1bcab64d3484750103559fea2ce8cd51776156bf7591  initramfs.list
 09f1f214a24300696809727a7b04378887c06ca6f40803ca51a12bf2176a360b2eb8632139d6a0722094e05cb2038bdb04018a1e3d33fc2697674552ade03bee  init"

main/linux-postmarketos-exynos4/config-postmarketos-exynos4.armv7

@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.9.1 Kernel Configuration
+# Linux/arm 5.9.12 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.0) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100200
+CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -25,9 +25,9 @@ CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KERNEL_LZ4=y
-# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
-CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_INIT=""
@@ -224,7 +224,6 @@ CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 # CONFIG_PROFILING is not set
-CONFIG_TRACEPOINTS=y
 # end of General setup
 
 CONFIG_ARM=y
@@ -287,22 +286,15 @@ CONFIG_ARCH_MULTI_V6_V7=y
 # CONFIG_ARCH_DIGICOLOR is not set
 CONFIG_ARCH_EXYNOS=y
 CONFIG_S5P_DEV_MFC=y
-CONFIG_ARCH_EXYNOS3=y
+# CONFIG_ARCH_EXYNOS3 is not set
 CONFIG_ARCH_EXYNOS4=y
-CONFIG_ARCH_EXYNOS5=y
+# CONFIG_ARCH_EXYNOS5 is not set
 
 #
 # Exynos SoCs
 #
-CONFIG_SOC_EXYNOS3250=y
 CONFIG_CPU_EXYNOS4210=y
 CONFIG_SOC_EXYNOS4412=y
-CONFIG_SOC_EXYNOS5250=y
-CONFIG_SOC_EXYNOS5260=y
-CONFIG_SOC_EXYNOS5410=y
-CONFIG_SOC_EXYNOS5420=y
-CONFIG_SOC_EXYNOS5800=y
-CONFIG_EXYNOS_MCPM=y
 CONFIG_EXYNOS_CPU_SUSPEND=y
 CONFIG_PLAT_SAMSUNG=y
 
@@ -642,7 +634,6 @@ CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 # CONFIG_JUMP_LABEL is not set
-CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_HAVE_KPROBES=y
@@ -1067,7 +1058,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options
 
@@ -1243,9 +1233,6 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 #
 # Bus devices
 #
-CONFIG_ARM_CCI=y
-CONFIG_ARM_CCI400_COMMON=y
-CONFIG_ARM_CCI400_PORT_CTRL=y
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_MOXTET is not set
 # CONFIG_SIMPLE_PM_BUS is not set
@@ -4324,7 +4311,6 @@ CONFIG_EXYNOS_CHIPID=y
 CONFIG_EXYNOS_PMU=y
 CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
 CONFIG_EXYNOS_PM_DOMAINS=y
-CONFIG_EXYNOS_REGULATOR_COUPLER=y
 # CONFIG_SOC_TI is not set
 
 #
@@ -4864,9 +4850,7 @@ CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
 CONFIG_PHY_SAMSUNG_USB2=y
 CONFIG_PHY_EXYNOS4210_USB2=y
 CONFIG_PHY_EXYNOS4X12_USB2=y
-CONFIG_PHY_EXYNOS5250_USB2=y
 CONFIG_PHY_EXYNOS5_USBDRD=y
-CONFIG_PHY_EXYNOS5250_SATA=y
 # end of PHY Subsystem
 
 # CONFIG_POWERCAP is not set
@@ -5353,8 +5337,6 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # end of Certificates for signature checking
 
-CONFIG_BINARY_PRINTF=y
-
 #
 # Library routines
 #
@@ -5531,7 +5513,6 @@ CONFIG_DEBUG_MISC=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_WX is not set
 # CONFIG_DEBUG_OBJECTS is not set
@@ -5559,10 +5540,7 @@ CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_SOFTLOCKUP_DETECTOR is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_WQ_WATCHDOG is not set
 # CONFIG_TEST_LOCKUP is not set
@@ -5571,36 +5549,32 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 #
 # Scheduler Debugging
 #
-CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
 # CONFIG_DEBUG_TIMEKEEPING is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_PROVE_LOCKING=y
-# CONFIG_PROVE_RAW_LOCK_NESTING is not set
+# CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
-CONFIG_DEBUG_RWSEMS=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_LOCKDEP=y
-# CONFIG_DEBUG_LOCKDEP is not set
-CONFIG_DEBUG_ATOMIC_SLEEP=y
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)
 
-CONFIG_TRACE_IRQFLAGS=y
-CONFIG_STACKTRACE=y
+# CONFIG_STACKTRACE is not set
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 
@@ -5619,12 +5593,11 @@ CONFIG_STACKTRACE=y
 #
 # RCU Debugging
 #
-CONFIG_PROVE_RCU=y
 # CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_REF_SCALE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
-CONFIG_RCU_TRACE=y
+# CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging
 
@@ -5632,7 +5605,6 @@ CONFIG_RCU_TRACE=y
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
-CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -5640,41 +5612,12 @@ CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_PREEMPTIRQ_TRACEPOINTS=y
-CONFIG_TRACING=y
 CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_ENABLE_DEFAULT_TRACERS is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-# CONFIG_STRICT_DEVMEM is not set
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_IO_STRICT_DEVMEM is not set
 
 #
 # arm Debugging
@@ -5739,6 +5682,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_FREE_PAGES is not set
 # CONFIG_MEMTEST is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking

main/linux-postmarketos-qcom-msm8974/APKBUILD

@@ -3,9 +3,9 @@ _flavor=postmarketos-qcom-msm8974
 _config="config-$_flavor.$CARCH"
 
 pkgname=linux-$_flavor
-pkgver=5.9.0_rc4
-pkgrel=1
-_commit="2d11e1d8eee79e884286ba200829f227d5ba1f1a"
+pkgver=5.9.13
+pkgrel=0
+_commit="ad989a3e7324563b3a85e521e052fec2c6b56752"
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8974 devices"
 arch="armv7"
 _carch="arm"
@@ -49,5 +49,5 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
 
-sha512sums="953727752af25fc8fa41201ebcf25363512f32e3d6d81afc4046c86719911c0b221bfff0d0f5631157f2b242918a6fee686b701bb74d8d28ec56cc41b482be9a  linux-postmarketos-2d11e1d8eee79e884286ba200829f227d5ba1f1a.tar.gz
-b746e9d3ee4541b6e2e08fa30e6064624c92a125675cb6b57ff072b82e8f927ddba0d476b7ba57cb657fcc1cb6dd5d5c4781cd27983d7427244b7f1338e121f8  config-postmarketos-qcom-msm8974.armv7"
+sha512sums="935b1949e659ba83a54430346c7e4a1c32cc51910e2300b89ed54e2d3da890b281cfea51eb12af633c1f6c94c599e95842b81c6db04fbb5b2dbded46d8d0180a  linux-postmarketos-ad989a3e7324563b3a85e521e052fec2c6b56752.tar.gz
+9757a1339a102196e60b0e681a892227c1d008e66b01c6ad594969b9a3015f1897f935dee8bfa71ed368add25c6516bd413ab9045a8d536f82bb0c5b54e5b70d  config-postmarketos-qcom-msm8974.armv7"

main/linux-postmarketos-qcom-msm8974/config-postmarketos-qcom-msm8974.armv7

@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.9.0-rc4 Kernel Configuration
+# Linux/arm 5.9.13 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre0) 10.2.1 20201113"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
@@ -648,6 +648,7 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 #
 # GCOV-based kernel profiling
 #
+# CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
@@ -3820,6 +3821,7 @@ CONFIG_FB_DEFERRED_IO=y
 #
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
+# CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
@@ -6566,6 +6568,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_FREE_PAGES is not set
 # CONFIG_MEMTEST is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking

main/postmarketos-ui-phosh/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-phosh
 pkgver=6
-pkgrel=2
+pkgrel=3
 pkgdesc="(Wayland) Mobile UI developed for the Librem 5 (works only with numeric passwords!)"
 url="https://puri.sm"
 arch="noarch !armhf !x86" # x86: aports#11807
@@ -14,6 +14,7 @@ depends="bluez
 	polkit-elogind
 	pulseaudio
 	tinydm
+	tinydm-openrc
 	"
 _pmb_recommends="calls
 	chatty

main/postmarketos-ui-plasma-bigscreen/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-plasma-bigscreen
 pkgver=0.2
-pkgrel=2
+pkgrel=3
 _commit_configs="757db09c8738b88d59e5d7b35b9939e91a7a31d7"
 pkgdesc="(Wayland) 10-feet variant of Plasma, made for big screen TVs"
 url="https://wiki.postmarketos.org/wiki/Plasma_Mobile"
@@ -18,6 +18,7 @@ depends="
 # Required to launch
 depends="$depends
 	tinydm
+	tinydm-openrc
 	"
 _pmb_recommends="
 	aura-browser

main/postmarketos-ui-plasma-mobile/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-plasma-mobile
 pkgver=3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration, allows only numeric passwords!)"
 url="https://wiki.postmarketos.org/wiki/Plasma_Mobile"
 arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807
@@ -29,6 +29,7 @@ depends="bluedevil
 # Required to launch
 depends="$depends
 	tinydm
+	tinydm-openrc
 	xorg-server
 	"
 _pmb_recommends="breeze-gtk

main/postmarketos-ui-sxmo/APKBUILD

@@ -1,12 +1,12 @@
 # Maintainer: Miles Alan <m@milesalan.com>
 pkgname=postmarketos-ui-sxmo
-pkgver=0.2
+pkgver=1.2.0
 pkgrel=0
 pkgdesc="(X11) Simple X Mobile: Mobile environment based on simple & suckless software (best compatibility on pinephone)"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch !armhf"
 license="MIT"
-depends="sxmo-xdm"
+depends="sxmo-xdm-config"
 _pmb_recommends="
 	firefox-esr
 	foxtrotgps

main/qtdbusextended/APKBUILD

@@ -0,0 +1,32 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=qtdbusextended
+pkgver=0.0.3
+pkgrel=0
+pkgdesc="Provides additional features to the QDBusAbstractInterface class"
+url="https://github.com/nemomobile/qtdbusextended"
+arch="all"
+license="LGPL-2.1-or-later"
+makedepends="
+	cmake
+	qt5-qtbase-dev
+	"
+subpackages="$pkgname-dev"
+source="https://github.com/nemomobile/qtdbusextended/archive/$pkgver/qtdbusextended-$pkgver.tar.gz
+	cmake-support.patch
+	"
+
+build() {
+	cmake -B build \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --build build --target install
+}
+
+sha512sums="76d962a7f8c31fc46875095a51dca39c3fcea1d4f3a26ac3f451a6a3bd15f480231786ad8756d5d19c10a3cae594926d426ee0c7697d28183f328733243af3d6  qtdbusextended-0.0.3.tar.gz
+34afdf54a890a85227561fa46610d1a2051eef496d8328b62eb846472fe20ceb765a421579fabb8616bfe2f891f6f4f1526b3ade325a29933cf3c7977c18a267  cmake-support.patch"

main/qtdbusextended/cmake-support.patch

@@ -0,0 +1,195 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..0b8e002
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,44 @@
++cmake_minimum_required(VERSION 3.1.0)
++
++project(dbusextended
++	VERSION 0.0.3
++	DESCRIPTION "Provides additional features to the QDBusAbstractInterface class")
++
++set(CMAKE_AUTOMOC ON)
++set(CMAKE_AUTORCC ON)
++set(CMAKE_AUTOUIC ON)
++
++set(CMAKE_INCLUDE_CURRENT_DIR ON)
++
++include(FeatureSummary)
++include(GNUInstallDirs)
++
++set(QT_MIN_VERSION "5.6.0")
++find_package(Qt5 COMPONENTS Core DBus REQUIRED)
++
++add_subdirectory(src)
++
++# CMake Config File
++include(CMakePackageConfigHelpers)
++set(CMAKECONFIG_INSTALL_DIR "share/cmake/${PROJECT_NAME}")
++
++configure_package_config_file(
++	"${PROJECT_NAME}Config.cmake.in"
++	"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
++	INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/)
++write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
++	VERSION ${$PROJECT_NAME}_VERSION}
++	COMPATIBILITY AnyNewerVersion)
++
++install(FILES
++	"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
++	"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
++	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/
++	COMPONENT Devel)
++export(TARGETS ${PROJECT_NAME} FILE ${PROJECT_NAME}Targets.cmake)
++install(EXPORT ${PROJECT_NAME}Targets
++	FILE ${PROJECT_NAME}Targets.cmake
++	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/
++	COMPONENT Devel)
++
++feature_summary(WHAT PACKAGES_FOUND PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
+diff --git a/dbusextended-qt.pro b/dbusextended-qt.pro
+deleted file mode 100644
+index 65d9262..0000000
+--- a/dbusextended-qt.pro
++++ /dev/null
+@@ -1,2 +0,0 @@
+-TEMPLATE = subdirs
+-SUBDIRS = src
+diff --git a/dbusextendedConfig.cmake.in b/dbusextendedConfig.cmake.in
+new file mode 100644
+index 0000000..a5f86b4
+--- /dev/null
++++ b/dbusextendedConfig.cmake.in
+@@ -0,0 +1,7 @@
++@PACKAGE_INIT@
++
++include(CMakeFindDependencyMacro)
++find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
++
++include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
++@PACKAGE_INCLUDE_QCHTARGETS@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+new file mode 100644
+index 0000000..62ed74e
+--- /dev/null
++++ b/src/CMakeLists.txt
+@@ -0,0 +1,42 @@
++set(SRC
++	dbusextendedabstractinterface.cpp
++	dbusextendedpendingcallwatcher.cpp
++	dbusextended.h
++	dbusextendedabstractinterface.h)
++set(HEADERS
++	dbusextended.h
++	dbusextendedabstractinterface.h
++	DBusExtended
++	DBusExtendedAbstractInterface)
++
++add_library(${PROJECT_NAME} SHARED ${SRC})
++
++target_link_libraries(${PROJECT_NAME}
++	Qt5::Core
++	Qt5::DBus)
++target_include_directories(${PROJECT_NAME} PUBLIC
++	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}>
++	$<INSTALL_INTERFACE:include/${PROJECT_NAME}>)
++
++set_target_properties(${PROJECT_NAME} PROPERTIES
++	SOVERSION ${PROJECT_VERSION_MAJOR}
++	VERSION ${PROJECT_VERSION})
++
++# Create pkgconfig file
++configure_file(${PROJECT_NAME}.pc.in
++	${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-qt5.pc
++	@ONLY)
++
++configure_file(${PROJECT_NAME}-qt5.prf.in
++	${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-qt5.prf
++	@ONLY)
++
++install(TARGETS ${PROJECT_NAME}
++	EXPORT ${PROJECT_NAME}Targets
++	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES ${HEADERS} DESTINATION
++	${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-qt5.pc
++	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-qt5.prf
++	DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/mkspecs/features/)
+diff --git a/src/dbusextended-qt5.prf.in b/src/dbusextended-qt5.prf.in
+index 63c81dd..5cace20 100644
+--- a/src/dbusextended-qt5.prf.in
++++ b/src/dbusextended-qt5.prf.in
+@@ -1,2 +1,2 @@
+ CONFIG += link_pkgconfig
+-PKGCONFIG += $$TARGET
++PKGCONFIG += @PROJECT_NAME@
+diff --git a/src/dbusextended.pc.in b/src/dbusextended.pc.in
+new file mode 100644
+index 0000000..07c34d3
+--- /dev/null
++++ b/src/dbusextended.pc.in
+@@ -0,0 +1,11 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@PROJECT_NAME@
++
++Name: @PROJECT_NAME@
++Description: @PROJECT_DESCRIPTION@
++Version: @PROJECT_VERSION@
++Libs: -l@PROJECT_NAME@
++Cflags: -I${includedir}
++Requires: Qt5Core Qt5DBus
+diff --git a/src/src.pro b/src/src.pro
+deleted file mode 100644
+index e9c2c28..0000000
+--- a/src/src.pro
++++ /dev/null
+@@ -1,45 +0,0 @@
+-include(../common.pri)
+-
+-TEMPLATE = lib
+-CONFIG += qt
+-
+-QT = core dbus
+-
+-TARGET = $${QTDBUSEXTENDEDLIB}
+-
+-QMAKE_SUBSTITUTES = $${TARGET}.prf.in
+-
+-DEFINES += QT_DBUS_EXTENDED_LIBRARY
+-
+-# Generate pkg-config support by default
+-# Note that we HAVE TO also create prl config as QMake implementation
+-# mixes both of them together.
+-CONFIG += create_pc create_prl no_install_prl
+-
+-SOURCES += \
+-    dbusextendedabstractinterface.cpp \
+-    dbusextendedpendingcallwatcher.cpp
+-
+-HEADERS += \
+-    dbusextended.h \
+-    dbusextendedabstractinterface.h \
+-    dbusextendedpendingcallwatcher_p.h
+-
+-INSTALL_HEADERS = \
+-    DBusExtended \
+-    DBusExtendedAbstractInterface \
+-    dbusextended.h \
+-    dbusextendedabstractinterface.h
+-
+-target.path = $$[QT_INSTALL_LIBS]
+-headers.files = $$INSTALL_HEADERS
+-headers.path = $$[QT_INSTALL_HEADERS]/DBusExtended
+-prf.files = $${TARGET}.prf
+-prf.path = $$[QMAKE_MKSPECS]/features
+-INSTALLS += target headers prf
+-
+-QMAKE_PKGCONFIG_LIBDIR = $$target.path
+-QMAKE_PKGCONFIG_INCDIR = $$headers.path
+-QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+-QMAKE_PKGCONFIG_NAME = DBusExtended
+-QMAKE_PKGCONFIG_REQUIRES += Qt5Core Qt5DBus

main/qtmpris/APKBUILD

@@ -0,0 +1,28 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=qtmpris
+pkgver=1.0.4
+pkgrel=0
+pkgdesc="Qt and QML MPRIS interface and adaptor"
+url="https://git.sailfishos.org/mer-core/qtmpris"
+arch="all"
+license="LGPL-2.1-or-later"
+depends_dev="nemo-qml-plugin-dbus-dev"
+makedepends="$depends_dev
+	qt5-qtbase-dev
+	qtdbusextended-dev
+	"
+subpackages="$pkgname-dev"
+source="https://git.sailfishos.org/mer-core/qtmpris/-/archive/$pkgver/qtmpris-$pkgver.tar.gz"
+options="!check" # No suitable tests
+
+build() {
+	qmake-qt5
+	make
+}
+
+package() {
+	INSTALL_ROOT="$pkgdir" make install
+}
+
+sha512sums="8dfcff60b2fb3906923236ae1457e603b9921e49c83fef531474712bc73ba2acf702482f53c4abb49c9921d2ff836250b92818b610baa8b14a47f50f171f5c5d  qtmpris-1.0.4.tar.gz"

sxmo/sxmo-dmenu/APKBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Miles Alan <m@milesalan.com>
 pkgname=sxmo-dmenu
-pkgver=4.9.6
+pkgver=4.9.7
 pkgrel=0
 pkgdesc="Dmenu fork for Sxmo UI; supports highlight, centering, volume-key navigation and more"
 url="https://git.sr.ht/~mil/sxmo-dmenu"
@@ -31,4 +31,4 @@ package() {
 		-C "$builddir" install
 }
 
-sha512sums="eaab7fe2b8d1f64f0cd2d46b06a6061e9e7d0db7800d82097d82c6f4a6055a65c19e2bf38a6c250419eb6110e1e6eefe33375f8757192bc3ae5e9b2bd3648540  sxmo-dmenu-4.9.6.tar.gz"
+sha512sums="c14e45dbf2f73cf5dfd96d16ceb3ede121f44c78c44bc7b441d76387c53838f75b92e57364da57a86c373270acbe371a70311128c2a1a72cd15c61ff36cb4f42  sxmo-dmenu-4.9.7.tar.gz"

sxmo/sxmo-dwm/APKBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Miles Alan <m@milesalan.com>
 pkgname=sxmo-dwm
-pkgver=6.2.9
+pkgver=6.2.10
 pkgrel=0
 pkgdesc="Dwm fork for Sxmo UI; supports volume-key hotkeys, swallow, keyboard, among other patches"
 url="https://git.sr.ht/~mil/sxmo-dwm"
@@ -32,4 +32,4 @@ package() {
 		-C "$builddir" install
 }
 
-sha512sums="37738af79d8797742bf3df32001db4543c5cb8c5b8b7d6ded53a5f22de498c305c80a7b1d8f17d84717950d0be237b51a06c9ca65a36bb8bc51f4b01e7b358aa  sxmo-dwm-6.2.9.tar.gz"
+sha512sums="22179b4fdb113faf02ee9d517e69a763d2f1b345861b442740e8f730e35354542df048dc44e4227b806eead441c043a0fcc9d8672ef97fbf355268e3b555a608  sxmo-dwm-6.2.10.tar.gz"

sxmo/sxmo-svkbd/APKBUILD

@@ -1,29 +0,0 @@
-# Maintainer: Miles Alan <m@milesalan.com>
-pkgname=sxmo-svkbd
-pkgver=1.0.5
-pkgrel=0
-pkgdesc="Svkbd fork for Sxmo UI; supports mobile-optimized layout, Xft, SIGTERM, multiple layers functionality"
-url="https://git.sr.ht/~mil/sxmo-svkbd"
-arch="all"
-license="MIT/X"
-makedepends="libxtst-dev libxft-dev libxinerama-dev"
-provides="svkbd"
-options="!check" # has no tests
-source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~mil/sxmo-svkbd/archive/$pkgver.tar.gz"
-
-prepare() {
-	default_prepare
-	sed -i -e '/CFLAGS/{s/-Os//;s/=/+=/}' \
-		-e '/LDFLAGS/{s/=/+=/}' \
-		"$builddir"/config.mk
-}
-
-build() {
-	make svkbd-sxmo X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 FREETYPEINC=/usr/include/freetype2 -C "$builddir"
-}
-
-package() {
-	LAYOUT=sxmo make PREFIX=/usr DESTDIR="$pkgdir"  -C "$builddir" install
-}
-
-sha512sums="7666c42197e7505036b824ff07955d12c246fd176c2eb2be0dcf108aab367c4769f55ac5265250711c408079ec5dc9d640d31f6e7b0ba66e224c359a0322d167  sxmo-svkbd-1.0.5.tar.gz"

sxmo/sxmo-utils/0001-enable-bluetooth-and-modem-drivers-during-crust-susp.patch

@@ -1,46 +0,0 @@
-Upstream: yes
-https://lists.sr.ht/~mil/sxmo-devel/patches/14544
-
-From a0c6e4c2e293cc2d663c35c4798b2e53462ca54b Mon Sep 17 00:00:00 2001
-From: Anjandev Momi <anjan@momi.ca>
-Date: Tue, 27 Oct 2020 16:14:49 -0400
-Subject: [PATCH] enable bluetooth and modem drivers during crust suspend
-
-With the megi 5.9 kernel and other suspend-related merge requests in
-postmarketos, disabling these drivers is no longer needed. All of this
-should result in a more reliable suspending system.
-
-Source: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/1651
-Signed-off-by: Miles Alan <m@milesalan.com>
----
- programs/sxmo_screenlock.c | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/programs/sxmo_screenlock.c b/programs/sxmo_screenlock.c
-index 791511f..34ed5e7 100644
---- a/programs/sxmo_screenlock.c
-+++ b/programs/sxmo_screenlock.c
-@@ -169,20 +169,6 @@ configuresuspendsettingsandwakeupsources()
- 	//set RTC wake
- 	if (wakeinterval > 0) setup_rtc_wakeup();
- 
--	// Temporary hack to disable USB driver that doesn't suspend
--	fprintf(stderr, "Disabling buggy USB driver\n");
--	writefile(
--		"/sys/devices/platform/soc/1c19000.usb/driver/unbind",
--		"1c19000.usb"
--	);
--
--	// Temporary hack to disable Bluetooth driver that crashes on suspend 1/5th the time
--	fprintf(stderr, "Disabling buggy Bluetooth driver\n");
--	writefile(
--		"/sys/bus/serial/drivers/hci_uart_h5/unbind",
--		"serial0-0"
--	);
--
- 	// E.g. make sure we're using CRUST
- 	fprintf(stderr, "Flip mem_sleep setting to use crust\n");
- 	writefile("/sys/power/mem_sleep", "deep");
--- 
-2.20.1
-

sxmo/sxmo-utils/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Miles Alan <m@milesalan.com>
 pkgname=sxmo-utils
-pkgver=1.1.11
-pkgrel=1
+pkgver=1.2.0
+pkgrel=0
 pkgdesc="Utility scripts, programs, and configs that hold the Sxmo UI environment together"
 url="https://git.sr.ht/~mil/sxmo-utils"
 arch="all"
@@ -12,7 +12,8 @@ depends="
 	sxmo-dwm
 	sxmo-st
 	sxmo-surf
-	sxmo-svkbd
+	svkbd
+	lisgd
 
 	alsa-utils
 	autocutsel
@@ -26,7 +27,6 @@ depends="
 	geoclue
 	grep
 	inotify-tools
-	lisgd
 	mediainfo
 	modemmanager
 	mpv
@@ -53,9 +53,7 @@ depends="
 "
 
 options="suid !check" # has no tests
-source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~mil/sxmo-utils/archive/$pkgver.tar.gz
-	0001-enable-bluetooth-and-modem-drivers-during-crust-susp.patch
-	"
+source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~mil/sxmo-utils/archive/$pkgver.tar.gz"
 install="$pkgname.post-install $pkgname.pre-deinstall"
 
 package() {
@@ -70,5 +68,4 @@ package() {
 	chmod u+s $pkgdir/usr/bin/sxmo_screenlock
 }
 
-sha512sums="e1a23a0899f5a6bc25a3fe0d20401ccb218b6f0150f3cc06dda822c81075af9b08d59b310acf1310844c44b0adc0f1973c3d0a74ea53c4e7d8e1ab2132eb1684  sxmo-utils-1.1.11.tar.gz
-7afe015b5f7a0c6fb644f0268d5558e02ee4d141d0c7f6167ce262c42e2ca767d7b4cdd9fc5cc52ca516bbbbb513d720fec5fd70269ef93f1511d5b6e6017fbd  0001-enable-bluetooth-and-modem-drivers-during-crust-susp.patch"
+sha512sums="bb765a1392492acbd6bb56ec870dcb4adf0decafd719678ba3e937c8bc592233b86f0e2bb8e034b572d6e9a1eeaa283a12731d26344cffb13be6d3e758ee3888  sxmo-utils-1.2.0.tar.gz"

sxmo/sxmo-xdm-config/APKBUILD

@@ -0,0 +1,25 @@
+# Maintainer: Maarten van Gompel <proycon@anaproy.nl>
+pkgname=sxmo-xdm-config
+pkgver=0.2.1
+pkgrel=0
+pkgdesc="X Display Manager configuration for Sxmo; starts with virtual keyboard and launches Sxmo UI"
+options="!check" # No testsuite
+url="https://git.sr.ht/~mil/sxmo-xdm-config"
+arch="noarch"
+license="MIT"
+depends="sxmo-utils svkbd xdm"
+replaces="sxmo-xdm xdm xdm-openrc"
+subpackages="$pkgname-openrc"
+source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~mil/sxmo-xdm-config/archive/$pkgver.tar.gz"
+install="$pkgname-openrc.post-install $pkgname.pre-deinstall"
+
+package() {
+	mkdir -p "$pkgdir/etc/X11/xdm" "$pkgdir/usr/lib/X11/xdm" "$pkgdir/etc/conf.d" "$pkgdir/etc/profile.d"
+
+	make  -C "$builddir" DESTDIR=$pkgdir install
+
+	# E.g. hide the cursor for Xorg
+	echo ":0 local /usr/bin/X -nocursor :0" > "$pkgdir/etc/X11/xdm/Xservers"
+}
+
+sha512sums="48f315fa2244d2f75b023c75282ee600f2fb421fccb41643c6cb12e323aea5fa9617674bba7f49a4e51cd7ad0110eb1fc988d223311b821fbadb7532510da7f0  sxmo-xdm-config-0.2.1.tar.gz"

sxmo/sxmo-xdm-config/sxmo-xdm-config-openrc.post-install

@@ -1,2 +1,3 @@
 #!/bin/sh
+
 rc-update add xdm default

sxmo/sxmo-xdm/APKBUILD

@@ -1,64 +0,0 @@
-# Maintainer: Miles Alan <m@milesalan.com>
-pkgname=sxmo-xdm
-pkgver=1.1.12
-pkgrel=0
-pkgdesc="X Display Manager fork for Sxmo; starts with virtual keyboard and launches Sxmo UI"
-options="!check" # No testsuite
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="MIT"
-depends="xorg-server sessreg sxmo-utils sxmo-svkbd"
-makedepends="linux-pam-dev libxmu-dev libxaw-dev libxft libxft-dev"
-subpackages="$pkgname-doc"
-source="
-	$url/releases/individual/app/xdm-1.1.12.tar.bz2
-	xdm.initd
-	xdm.confd
-	Xsession
-	Xsetup_0
-	GiveConsole
-"
-install="$pkgname.post-install $pkgname.pre-deinstall"
-provides="xdm"
-
-build() {
-	cd xdm-$pkgver
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-ipv6 \
-		--with-xdmconfigdir=/etc/X11/xdm \
-		--with-pam \
-		--with-xft
-	make
-}
-
-package() {
-	cd $srcdir/xdm-$pkgver && make DESTDIR="$pkgdir" install
-	install -Dm755 "$srcdir"/xdm.initd "$pkgdir"/etc/init.d/xdm
-	install -Dm644 "$srcdir"/xdm.confd "$pkgdir"/etc/conf.d/xdm
-	install -Dm755 "$srcdir"/Xsession "$pkgdir"/usr/lib/X11/xdm/
-	install -Dm755 "$srcdir"/GiveConsole "$pkgdir"/usr/lib/X11/xdm/
-	install -Dm755 "$srcdir"/Xsetup_0 "$pkgdir"/usr/lib/X11/xdm/
-
-	# E.g. hide the cursor for Xorg
-	echo ":0 local /usr/bin/X -nocursor :0" >> "$pkgdir/etc/X11/xdm/Xservers"
-
-	echo "xlogin*logoPadding: 20" >> "$pkgdir/etc/X11/xdm/Xresources"
-	echo "xlogin*geometry: 550x300+100+400" >> "$pkgdir/etc/X11/xdm/Xresources"
-	echo "xlogin*greeting: Sxmo" >> "$pkgdir/etc/X11/xdm/Xresources"
-	echo "xlogin*greetFace:   Monospace:bold:size=20" >> "$pkgdir/etc/X11/xdm/Xresources"
-	echo "xlogin*face:       Monospace:size=15:italic" >> "$pkgdir/etc/X11/xdm/Xresources"
-	echo "xlogin*promptFace:    Monospace:size=15:bold" >> "$pkgdir/etc/X11/xdm/Xresources"
-	echo "xlogin*failFace:    Monospace:size=15" >> "$pkgdir/etc/X11/xdm/Xresources"
-}
-
-sha512sums="1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb  xdm-1.1.12.tar.bz2
-24f0c8dd71db73df34b3f59709e6cfb3ef58c18b7baa0fee83eac943fc6faa2e77e1e95351dfc1687534f52c9cd84cf2033d745502745422e7fae9c2cb52f43b  xdm.initd
-36a442c9d82445217a6a7eca21a1f64636bf7b9cb920bed7b24fd808a4d1e60d9a09af7024fb84218b3c9c499e7b9067e8f8e4cba23928cf9fff63139ea5960b  xdm.confd
-c07672dd079bb3840ec5777c46aaa1a86aca9ad1be5193ced4fa00521dc32aeb6c50817c800863b9296c5f21399cc4805dcbf02963709db8c62ff27494ad241c  Xsession
-02c45b2776a1b64a2191c870b9c80d37983feb8979c97ac94ba65e1e0556e01687ca9f463334d2d435d38ca2ff05fc1a848fd3625e16828409887037e8988b4c  Xsetup_0
-eeccc1384559166972a6cff2687418423422cb4b7be8f45296db1e78aa727d290e527703ed0236e109bd3d8687c5da1ec502b7245c6228f7860c0336c7f47500  GiveConsole"

sxmo/sxmo-xdm/GiveConsole

@@ -1,10 +0,0 @@
-#!/bin/sh
-# Assign ownership of the console to the invoking user
-#
-# By convention, both xconsole and xterm -C check that the
-# console is owned by the invoking user and is readable before attaching
-# the console output.  This way a random user can invoke xterm -C without
-# causing serious grief.
-#
-pkill -9 svkbd-sxmo
-chown $USER /dev/console

sxmo/sxmo-xdm/Xsession

@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/sxmo_xinit.sh

sxmo/sxmo-xdm/Xsetup_0

@@ -1,4 +0,0 @@
-#!/bin/sh
-xsetroot -mod 29 29 -fg '#e8e8e8' -bg '#ffffff'
-svkbd-sxmo &
-xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail

sxmo/sxmo-xdm/xdm.confd

@@ -1 +0,0 @@
-xdm_opts=""

sxmo/sxmo-xdm/xdm.initd

@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-
-supervisor=supervise-daemon
-
-name="Display Manager"
-description="X Display Manager"
-
-command=/usr/bin/xdm
-command_args="${xdm_opts}"
-command_args_foreground="-nodaemon"
-
-depends() {
-	needs localmount
-}
-
-# uses the openrc templates for start()/stop()

temp/geary/APKBUILD

@@ -1,8 +1,8 @@
 # Forked from Alpine to apply Purism's mobile patches
 pkgname=geary
-pkgver=9999_git20201126
+pkgver=9999_git20201210
 pkgrel=0
-_commit="7644e034c4034658305c23008db8d12dcf01a9c9"
+_commit="dd971251d7fd85c7b73f2e153beef9939354cec7"
 pkgdesc="Geary is an email application built around conversations"
 url="https://wiki.gnome.org/Apps/Geary"
 # libhandy is not available on s390x or mips
@@ -11,6 +11,7 @@ license="LGPL-2.1-or-later AND CC-BY-3.0 AND BSD-2-Clause"
 depends="iso-codes dbus:org.freedesktop.Secrets"
 makedepends="
 	appstream-glib-dev
+	cmake
 	enchant2-dev
 	folks-dev
 	gcr-dev
@@ -18,6 +19,7 @@ makedepends="
 	gmime-dev
 	gnome-online-accounts-dev
 	gspell-dev
+	gsound-dev
 	gtk+3.0-dev
 	iso-codes-dev
 	itstool
@@ -28,6 +30,7 @@ makedepends="
 	libnotify-dev
 	libpeas-dev
 	libsecret-dev
+	libunwind-dev
 	libxml2-dev
 	meson
 	sqlite-dev
@@ -45,9 +48,22 @@ subpackages="$pkgname-lang $pkgname-doc"
 source="https://source.puri.sm/Librem5/geary/-/archive/$_commit/geary-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit"
 
+prepare() {
+	default_prepare
+	# The branch of geary is from Purism's fork, which has all adaptive
+	# patches in the /debian dir in this branch for generating a debian
+	# package. There are dozens of patches, so we apply them here manually
+	# (the location is not compatible with what abuild expects for package
+	# patches).
+	# Patches have to be applied in the order they are listed in
+	# debian/pathes/series
+	grep "\.patch$" debian/patches/series |xargs -I {} -t -r -n1 patch -p1 -i debian/patches/{}
+}
+
 build() {
 	abuild-meson \
 		-Dlibunwind_optional=true \
+		-Dprofile=release \
 		. output
 	meson compile ${JOBS:+-j ${JOBS}} -C output
 }
@@ -60,4 +76,4 @@ package() {
 	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="bd208108f6f22864422daf26a0a689f4100d30c1eadbac31bb67b8cd897faf5353064b5af99f8b74882d794cf3050483e84ffddc356bc1768cff2dabd0358054  geary-7644e034c4034658305c23008db8d12dcf01a9c9.tar.gz"
+sha512sums="f88317a690e8ea54572a3550738ccc1cec6f071e939c5cb857923c213db506ed16f249c980a2fc4a53af389ea5ebf001cfef60700623b7c9cc83f5baa79b3821  geary-dd971251d7fd85c7b73f2e153beef9939354cec7.tar.gz"

temp/gtk+3.0/APKBUILD

@@ -1,8 +1,8 @@
 # Forked from Alpine to apply Purism's patches for responsivness
 pkgname=gtk+3.0
-pkgver=9999_git20201022
+pkgver=9999_git20201211
 pkgrel=0
-_commit="a3994f140fe20c0bc7c6cd13a60cdf9700461a94"
+_commit="dd1aa3de371d618707473d4ffb5986cc5896ed2f"
 pkgdesc="The GTK+ Toolkit (v3)"
 url="https://www.gtk.org/"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
@@ -136,5 +136,5 @@ doc() {
 	default_doc
 }
 
-sha512sums="bd573a5d48b5621cb243418f6bb9a5b2954e218d7955f7acb1a340c8b67f363bb1c4fcde24fa7e5314a557aaa00e5e0fb7d6b8d3ffbf79da733c0ce422c608ec  gtk-a3994f140fe20c0bc7c6cd13a60cdf9700461a94.tar.gz
+sha512sums="f795f2896ccdbc87291ecdc7b1884f046e1916445f1c98087f6a5fb43d848b20602d4594a9838c9fe3982a0da04c04da2136f9bd8b74d0f4a9c41581499c9a53  gtk-dd1aa3de371d618707473d4ffb5986cc5896ed2f.tar.gz
 b97ccd8fb78d7c32fe91607befd6a7c0dd969fbfc9c242948fc88085133e3461583a0b18ade199b73f9659cae5f5525b940e66535a6ced4b916af9a88b3cc578  check-version.py"

temp/phosh/0001-PMOS-Hide-Logout-action.patch

@@ -1,26 +0,0 @@
-From d0ed89ba5902a5f301f102f8073098525e3c11ad Mon Sep 17 00:00:00 2001
-From: Luca Weiss <luca@z3ntu.xyz>
-Date: Thu, 23 Jul 2020 22:10:18 +0200
-Subject: [PATCH 2/2] PMOS: Hide Logout action
-
-It doesn't work on pmOS and we don't need it.
----
- src/ui/top-panel.ui | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ui/top-panel.ui b/src/ui/top-panel.ui
-index a91e9c4..7c6791b 100644
---- a/src/ui/top-panel.ui
-+++ b/src/ui/top-panel.ui
-@@ -17,7 +17,7 @@
-         </child>
- 	<child>
-           <object class="GtkModelButton">
--            <property name="visible">True</property>
-+            <property name="visible">False</property>
-             <property name="action-name">panel.logout</property>
-             <property name="text" translatable="yes">Logout</property>
-           </object>
--- 
-2.27.0
-

temp/phosh/0002-mode-manager-default-to-being-a-phone-when-chassis-i.patch

@@ -1,38 +0,0 @@
-Upstream: no
-Needed until openrc-settingsd reports chassis:
-https://gitlab.com/postmarketOS/pmaports/-/issues/851
-
-From 4833a4e29df2ce3fff1f3b082537569e48bf4340 Mon Sep 17 00:00:00 2001
-From: Martijn Braam <martijn@brixit.nl>
-Date: Wed, 28 Oct 2020 17:33:22 +0100
-Subject: [PATCH] mode-manager: default to being a phone when chassis isn't set
-
----
- src/mode-manager.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/mode-manager.c b/src/mode-manager.c
-index 7b9b30b..963587e 100644
---- a/src/mode-manager.c
-+++ b/src/mode-manager.c
-@@ -102,7 +102,7 @@ update_props (PhoshModeManager *self)
-   } else if (g_strcmp0 (self->chassis, "tablet") == 0) {
-     device_type = PHOSH_MODE_DEVICE_TYPE_TABLET;
-   } else {
--    device_type = PHOSH_MODE_DEVICE_TYPE_UNKNOWN;
-+    device_type = PHOSH_MODE_DEVICE_TYPE_PHONE;
-   }
-   mimicry = device_type;
- 
-@@ -346,7 +346,7 @@ static void
- phosh_mode_manager_init (PhoshModeManager *self)
- {
-   self->hw_flags = PHOSH_MODE_HW_NONE;
--  self->device_type = PHOSH_MODE_DEVICE_TYPE_UNKNOWN;
-+  self->device_type = PHOSH_MODE_DEVICE_TYPE_PHONE;
-   self->mimicry = PHOSH_MODE_DEVICE_TYPE_UNKNOWN;
- }
- 
--- 
-2.29.0
-

temp/phosh/APKBUILD

@@ -1,50 +0,0 @@
-# Forked from Alpine to apply Hide-Logout-action patch
-pkgname=phosh
-pkgver=9999
-_pkgver=0.6.0
-pkgrel=4
-pkgdesc="Shell PoC for the Librem5"
-# Blocked on mips and s390x by gnome-session, gnome-settings-daemon, squeekboard and libhandy
-# Blocked on ppc64le by gnome-session
-arch="all !s390x !ppc64le !mips !mips64"
-url="https://source.puri.sm/Librem5/phosh"
-license="GPL-3.0-only"
-depends="wayland-protocols phoc gnome-session bash dbus-x11 gnome-settings-daemon
-	squeekboard libpulse dbus:org.freedesktop.Secrets elogind gnome-control-center"
-makedepends="gtk+3.0-dev meson ninja gnome-desktop-dev libhandy1-dev gcr-dev upower-dev
-	linux-pam-dev git cmake pulseaudio-dev networkmanager-dev polkit-elogind-dev
-	libsecret-dev feedbackd-dev"
-subpackages="$pkgname-lang"
-source="$pkgname-$_pkgver.tar.xz::https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$_pkgver.tar.xz
-	phosh.desktop
-	sm.puri.OSK0.desktop
-	0001-PMOS-Hide-Logout-action.patch
-	0002-mode-manager-default-to-being-a-phone-when-chassis-i.patch
-	"
-options="!check" # Needs a running Wayland compositor
-builddir="$srcdir/$pkgname-$_pkgver"
-
-build() {
-	abuild-meson . output
-	meson compile ${JOBS:+-j ${JOBS}} -C output
-}
-
-check() {
-	meson test --no-rebuild -v -C output
-}
-
-package() {
-	DESTDIR="$pkgdir/" meson install --no-rebuild -C output
-
-	install -D -m644 "$srcdir"/phosh.desktop \
-		"$pkgdir"/usr/share/wayland-sessions/phosh.desktop
-
-	install -D -m644 "$srcdir"/sm.puri.OSK0.desktop \
-		"$pkgdir"/usr/share/applications/sm.puri.OSK0.desktop
-
-}
-sha512sums="9be5a9e81eeeb2e9f6f5585fe81fd847c6fb38cf3feb3192d966d23a4396146b221602e8ac34b75343dcfc76402c6f6954b5b59417a3a086e1fb06485af41327  phosh-0.6.0.tar.xz
-6644870edbbbc6b88d6e19f7771d81dba1a11066c2b34e4c22736db73a2dfd0d4909b4967503059c35385c5139a834a5c06a3c56b148ba1275d7f089c0c5f33c  phosh.desktop
-f97019598323276cf97ae62f04b6245983198e04b228ddc605835ee46845d9b88c6890fb86e97e4bb6f1ad73361437d9ed18c91e81fe1284a88cdcb92d3fdc69  sm.puri.OSK0.desktop
-f289c8a9db01741058881ca6b20c386fcd87f00d3f638f1d32d181bed70d36e9696d84f4c210b581138fff6fceeafa5dcbcb4e1097f04eb29d8cee2930ca4446  0001-PMOS-Hide-Logout-action.patch
-00b29af6c3540b7c7518d5b5e09d79748bd23899a2d292e3c5b4e6c26f8c27f42100db88450c34904787d89a28b727486aa77eff9aa57bb1c2a7954e9b8fcbf1  0002-mode-manager-default-to-being-a-phone-when-chassis-i.patch"

temp/phosh/phosh.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Phosh
-Name[en]=Phosh
-Comment=This session logs you into Phosh
-Comment[en]=This session logs in you into Phosh
-Exec=dbus-run-session /usr/bin/phosh
-TryExec=/usr/bin/phosh
-Icon=
-Type=Application
-X-DesktopNames=Phosh
-Keywords=launch;Phosh;desktop;session;

temp/phosh/sm.puri.OSK0.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=On-screen keyboard
-Comment=Default on-screen keyboard
-Exec=/usr/bin/osk-wayland
-Categories=GNOME;Core;
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Panel
-X-GNOME-Provides=inputmethod
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true

temp/plasma-phone-components/APKBUILD

@@ -1,8 +1,8 @@
 # Forked from Alpine to package newer commits
 pkgname=plasma-phone-components
-pkgver=5.20.4_git20201112
+pkgver=5.20.4_git20201206
 pkgrel=0
-_commit="b19543b56ab3d019daacefe0d6a7b253b7713ea9"
+_commit="27772fca5466f2597d80647c2bee1636d8314c69"
 pkgdesc="Modules providing phone functionality for Plasma"
 arch="all !armhf !x86" # x86 blocked by maliit-keyboard
 url="https://www.plasma-mobile.org/"
@@ -18,6 +18,7 @@ depends="
 	plasma-pa
 	plasma-settings
 	plasma-workspace
+	qqc2-breeze-style
 	qt5-qtquickcontrols2
 	telepathy-ofono
 	"
@@ -69,5 +70,5 @@ package() {
 	DESTDIR="$pkgdir" cmake --build build --target install
 }
 
-sha512sums="629e60c234d6b71a1886a4285a221b1189528efdde026b00cad195ca0585f6e4ba43d611d97039a0641b4e9afa92cbf7ce6ae45252c675f641e23aae1dc0edfb  plasma-phone-components-b19543b56ab3d019daacefe0d6a7b253b7713ea9.tar.gz
+sha512sums="ac8d24e2ccaca4aaa582fd70a23b5ac6eb1ad0e2ad027c94bbac4c9466c4db456b8f1818c0b24d77147713240a2e6a6257cce258a0c04cb1480a3ece47d48322  plasma-phone-components-27772fca5466f2597d80647c2bee1636d8314c69.tar.gz
 aef46ceb3cd4c49fe22b62a9821951bec366291e8ec060c7304d9db9c150a58311f545445c47605afc17dc061466b04bde0abe2d7a3791fa254ef0b7f4ec4e1e  set-postmarketos-wallpaper.patch"