CODEOWNERS

 # https://docs.gitlab.com/ee/user/project/code_owners.html
 
+device/*/*-htc-golfu/               @Newbyte
 device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
+device/*/*-htc-m8qlul/              @Newbyte
 device/*/*-purism-librem5/          @craftyguy @bshah
-main/osk-sdl/                       @craftyguy
-main/postmarketos-ui-plasma-mobile/ @bshah
-temp/u-boot-librem5/                @craftyguy @bshah
+device/*/device-lg-judyln/          @Newbyte
+device/*/device-samsung-m0/         @Newbyte
+device/*/linux-postmarketos-exynos4/        @Newbyte
+device/*/linux-postmarketos-msm8939/        @Newbyte
+device/*/linux-postmarketos-stericsson/     @Newbyte
 device/community/*-qcom-sdm845      @calebccff @joelselvaraj
+device/community/*-xiaomi-berrylium @joelselvaraj
 device/community/device-oneplus-enchilada   @calebccff
 device/community/device-oneplus-fajita      @calebccff
+main/osk-sdl/                       @craftyguy
+main/postmarketos-ui-plasma-mobile/ @bshah
 main/ttyescape                      @calebccff
-device/community/*-xiaomi-berrylium @joelselvaraj
+temp/u-boot-librem5/                @craftyguy @bshah
 
 # vim: ts=4 sw=4 et

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.35.0
-pkgrel=18
+pkgrel=20
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-2dd9617a1e0938a692acdb5c0ed943197f100a87274df96bc3ed7f77e0a5713d4e8c9642a666bb0391c5ceebc50960cf4ef9a467c813d6f5a149c6bd89b2dc3a  busybox-static-1.35.0-r18-aarch64-edge.apk
+4c8796e1c697d830e6093f7a52a3f8af2c7f64cca6b8313ba6cab74823a33d894e27a5846bd312e37fa3a39309cb22795c88f4385fdcfcdeed61a258d6c25d0c  busybox-static-1.35.0-r20-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.35.0
-pkgrel=18
+pkgrel=20
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-35461f4429030b5841c6cb071aac692f42f4935c5b94f80b848c8a9ce217b25370f9bb0df167f6d597535708d3c1d25b8e12d6d9b57588c4291facbc7681dd03  busybox-static-1.35.0-r18-armhf-edge.apk
+afb1ae42f143e1d592afe30bfc101929ae6dccaf0210bc373b537027f2c0a800201b7c9f63b75c21cbe2139064b2a2ae31d36497e243fe3d832796897fb2892b  busybox-static-1.35.0-r20-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.35.0
-pkgrel=18
+pkgrel=20
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-e91b9f5bd8e21525c471aeaf83a4fdc86098e8245b2d4119a3e6717d3402e9e134cf8cae6df8b076f0020eaf8a4eda68cfa417d4319ba5be4b32daf480133dd4  busybox-static-1.35.0-r18-armv7-edge.apk
+4e79d1d9a1861c4970c93d6095903e7de553b4dbd4196ce8d1c2b87150c27fc56fa3baff1856738b6390343f58708b395db1c5b073d9edd0c76d3bfe3b96689a  busybox-static-1.35.0-r20-armv7-edge.apk
 "

cross/gcc-aarch64/APKBUILD

@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,10 +182,15 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	if [ "$CBUILD" = "$CTARGET" ]; then
+		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+	else
+		subpackages="$subpackages libgnat::$CTARGET_ARCH"
+		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	fi
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -435,10 +440,12 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-			mv "$i" "$pkgdir"/usr/lib/
-			ln -s ../../../../${i##*/} $i
-		done
+		if [ "$CHOST" = "$CTARGET" ]; then
+			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+				mv "$i" "$pkgdir"/usr/lib/
+				ln -s ../../../../${i##*/} $i
+			done
+		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then

cross/gcc-armhf/APKBUILD

@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,10 +182,15 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	if [ "$CBUILD" = "$CTARGET" ]; then
+		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+	else
+		subpackages="$subpackages libgnat::$CTARGET_ARCH"
+		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	fi
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -435,10 +440,12 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-			mv "$i" "$pkgdir"/usr/lib/
-			ln -s ../../../../${i##*/} $i
-		done
+		if [ "$CHOST" = "$CTARGET" ]; then
+			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+				mv "$i" "$pkgdir"/usr/lib/
+				ln -s ../../../../${i##*/} $i
+			done
+		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then

cross/gcc-armv7/APKBUILD

@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,10 +182,15 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	if [ "$CBUILD" = "$CTARGET" ]; then
+		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+	else
+		subpackages="$subpackages libgnat::$CTARGET_ARCH"
+		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	fi
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -435,10 +440,12 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-			mv "$i" "$pkgdir"/usr/lib/
-			ln -s ../../../../${i##*/} $i
-		done
+		if [ "$CHOST" = "$CTARGET" ]; then
+			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+				mv "$i" "$pkgdir"/usr/lib/
+				ln -s ../../../../${i##*/} $i
+			done
+		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then

device/community/device-asus-me176c/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
 pkgver=5
-pkgrel=0
+pkgrel=1
 _commit=3155254999ac36c3051a2118c415de25a072c0f6
 url="https://postmarketos.org"
 license="MIT"
@@ -15,7 +15,7 @@ depends="
 	firmware-asus-me176c-acpi
 	intel-ucode
 	linux-asus-me176c
-	mesa-dri-classic
+	mesa-dri-gallium
 	postmarketos-base
 	"
 makedepends="devicepkg-dev meson eudev-dev"

device/community/device-pine64-pinephonepro/51_keyboard.gschema.override

+[org.gnome.desktop.input-sources]
+xkb-options=["lv3:ralt_switch"]

device/community/device-pine64-pinephonepro/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
-pkgver=3.2
-pkgrel=0
+pkgver=3.3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -16,20 +16,26 @@ depends="
 	mesa-dri-gallium
 	postmarketos-base
 	fwupd
-	fwupd-plugin-modem_manager
 	fwupd-plugin-fastboot
+	fwupd-plugin-logind
+	fwupd-plugin-modem_manager
+	fwupd-plugin-upower
 	"
 makedepends="
 	devicepkg-dev
 	grub
 	grub-efi
 	"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-gnome
+	"
 install="
 	$pkgname.post-install
 	$pkgname.post-upgrade
 	"
 source="
+	51_keyboard.gschema.override
 	90-modem-eg25.rules
 	deviceinfo
 	grub.cfg
@@ -110,7 +116,14 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
+gnome() {
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-base-ui-gnome"
+	install -Dm644 "$srcdir"/51_keyboard.gschema.override -t \
+		"$subpkgdir"/usr/share/glib-2.0/schemas
+}
+
 sha512sums="
+2d68ffe143f633a86670f30e45dbad1cc313f219f22b7cd3319ab44bb7209c20cb29f2ff2c60c92390154af9c9a6815c4186be555364cf31552005eba024c0e7  51_keyboard.gschema.override
 fdfa807c0de33aee3deb09ee25c37a58fa970ce71483e52f21793717cb89adeb74f251ff1a2c2086361e3e58877f8b2e5643f24186b1a537acf9c16e3419313c  90-modem-eg25.rules
 e591572d0bfc4d7d990fcc15bc82e78e60404becf62a38283b4ceee6f49a812b63eebbc5c304907330e33dce5f023edba26c9b86f1375affa3cf6b49fbd06539  deviceinfo
 eeddbd3712c7385ef8daea252d71f9f91f8be03be43dea4ce036ae7d7b8a38d199a709ae87b9aa8fe8a63f0201224dbda704fd4b95c8c7d3b4f9852ae4e95c11  grub.cfg

device/community/firmware-xiaomi-scorpio/APKBUILD

 # Maintainer: Yassine Oudjana (Tooniis) <y.oudjana@protonmail.com>
 pkgname=firmware-xiaomi-scorpio
-pkgver=2
+pkgver=3
 pkgrel=0
 pkgdesc="Firmware for Xiaomi Mi Note 2"
 url="https://gitlab.com/Tooniis/firmware-xiaomi-scorpio"
@@ -8,22 +8,30 @@ arch="aarch64"
 license="proprietary"
 options="!strip !check !archcheck !tracedeps pmb:cross-native"
 
-_commit="9412b604f4908566830023f9434c3ebf47a5d32d"
+_commit="4c7763beb4de1fc4ff0da99e7fd43ea767fac2e7"
+source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 
-source="
-	$pkgname.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
-	firmware.files
+_mbns="
+	a530_zap.mbn
+	adsp.mbn
+	mba.mbn
+	modem.mbn
+	slpi.mbn
+	venus.mbn
 	"
 
 package() {
 	cd "$srcdir/$pkgname-$_commit/"
-	while IFS="" read -r _i || [ -n "$_i" ]; do
-		[ ! -d $(dirname $_i) ] && mkdir -p $(dirname $_i)
-		echo $_i
-		install -Dm644 $_i "$pkgdir/$_i"
-	done < "$srcdir/firmware.files"
+
+	# Install MBNs
+	for _i in $_mbns; do
+		install -Dm644 $_i "$pkgdir/lib/firmware/qcom/msm8996/scorpio/$_i"
+	done
+
+	# Install QCA6174 board firmware
+	install -Dm644 board-2.bin "$pkgdir/lib/firmware/postmarketos/ath10k/QCA6174/hw3.0/board-2.bin"
 }
+
 sha512sums="
-84183c62bf7a432507b975892b1f1099a1ac6cf9b0f1c4e12924c3bd9c9f0989eacc964555d96ece861895dc252cac50f185c5b44aee9500d6b42762291d0b4c  firmware-xiaomi-scorpio.tar.gz
-2c909dcf7ea542fec51b34f31f29ef85e7aa745c5237df51ac7498ebaa40ee704e2fa7c67fbb72f747b598963bd8828bc4d131f3f54ddcc7f99d731ef74c504f  firmware.files
+b8be4f664608f88e8140c7182e855fbf5078d23445bba14cb2242a9ea785678ab88b4584b0dc35d6325693e911bdf3c1b8ff3913414c7a1f2e0eae75692a2e45  firmware-xiaomi-scorpio-4c7763beb4de1fc4ff0da99e7fd43ea767fac2e7.tar.gz
 "

device/community/firmware-xiaomi-scorpio/firmware.files

-./lib/firmware/qcom/msm8996/scorpio/a530_zap.mbn
-./lib/firmware/qcom/msm8996/scorpio/adsp.mbn
-./lib/firmware/qcom/msm8996/scorpio/mba.mbn
-./lib/firmware/qcom/msm8996/scorpio/modem.mbn
-./lib/firmware/qcom/msm8996/scorpio/slpi.mbn
-./lib/firmware/qcom/msm8996/scorpio/venus.mbn

device/community/linux-postmarketos-qcom-msm8996/APKBUILD

@@ -4,7 +4,7 @@
 _flavor="postmarketos-qcom-msm8996"
 pkgname=linux-$_flavor
 pkgver=5.18.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices"
 arch="aarch64"
 _carch="arm64"
@@ -55,5 +55,5 @@ package() {
 }
 sha512sums="
 909d9735623b9cf20e1efa735e520eed579751bcbb45f95821d489d993424c8ac3699f3fdbdd339c70188acb5b6315fee4a7dd9087f098e5dc23c1498277cc56  linux-v5.18.1-msm8996.tar.gz
-289a080aa4977141d2d36c5e2cc459d23241fbc59c3754768b08f93de6311950607379eac00dc84acd25c1974f495c508cb17b2111a08b53cd8dabb09b39abaa  config-postmarketos-qcom-msm8996.aarch64
+03ee47e62ae9eb4e45f55d876c9479ded028f607904df3fa591e9efcd335c7722660494dbf364ce9249cbfcf9bfe6fce1ec0c32e53cdcfa4c36dc5f2a167856c  config-postmarketos-qcom-msm8996.aarch64
 "

device/community/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64

@@ -2428,7 +2428,7 @@ CONFIG_INPUT_GPIO_VIBRA=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
-# CONFIG_INPUT_UINPUT is not set
+CONFIG_INPUT_UINPUT=m
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_PWM_VIBRA=y
@@ -6416,7 +6416,7 @@ CONFIG_PSTORE_COMPRESS=y
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
-# CONFIG_PSTORE_PMSG is not set
+CONFIG_PSTORE_PMSG=y
 CONFIG_PSTORE_RAM=y
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set

device/community/soc-qcom-sdm845/APKBUILD

 # Maintainer: Caleb Connolly (kalube) <caleb@connolly.tech>
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=7
+pkgver=8
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -16,6 +16,7 @@ subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-ucm
 	$pkgname-qbootctl
+	$pkgname-upower
 "
 
 _ucm_commit="621c71fd5f5742c60d38766ebb2d1bd3b863a2a4"
@@ -23,6 +24,7 @@ source="
 	alsa-ucm-conf-$_ucm_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_ucm_commit/alsa-ucm-conf-$_ucm_commit.tar.gz
 	90-feedbackd-pmi8998.rules
 	modemmanager.conf
+	UPower.conf
 "
 
 package() {
@@ -49,6 +51,15 @@ ucm() {
 	cp -r "$srcdir/alsa-ucm-conf-$_ucm_commit"/ucm2 "$subpkgdir"/usr/share/alsa/
 }
 
+upower() {
+	install_if="$pkgname=$pkgver-r$pkgrel upower"
+	replaces="upower"
+
+	# Shutdown when battery is critical instead of sleep
+	install -Dm644 "$srcdir"/UPower.conf \
+		"$subpkgdir"/etc/UPower/UPower.conf
+}
+
 qbootctl() {
 	pkgdesc="Enable qbootctl mark-boot-successful service"
 	depends="qbootctl"
@@ -60,4 +71,5 @@ sha512sums="
 a1a6c6f5a6156e76e5a15b0078e3baedf07fa02b354cb025b1124ed688434a620d80aa8c0069b2d7ded1a29e2bb9318ab6e8f8a85af33a9dd2478a7b7ec6b494  alsa-ucm-conf-621c71fd5f5742c60d38766ebb2d1bd3b863a2a4.tar.gz
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 e33f41360ccc4900bb76a26cc7b46bde1fb90facdf45c4fbcebc80499386939948401cacd6df9f779eafab10f4ee77ee1fef3e7bd06f483f8c2a4a644c84f327  modemmanager.conf
+9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
 "

device/community/soc-qcom-sdm845/UPower.conf

+# Only the system vendor should modify this file, ordinary users
+# should not have to change anything.
+
+[UPower]
+
+# Enable the Watts Up Pro device.
+#
+# The Watts Up Pro contains a generic FTDI USB device without a specific
+# vendor and product ID. When we probe for WUP devices, we can cause
+# the user to get a perplexing "Device or resource busy" error when
+# attempting to use their non-WUP device.
+#
+# The generic FTDI device is known to also be used on:
+#
+# - Sparkfun FT232 breakout board
+# - Parallax Propeller
+#
+# default=false
+EnableWattsUpPro=false
+
+# Don't poll the kernel for battery level changes.
+#
+# Some hardware will send us battery level changes through
+# events, rather than us having to poll for it. This option
+# allows disabling polling for hardware that sends out events.
+#
+# default=false
+NoPollBatteries=false
+
+# Do we ignore the lid state
+#
+# Some laptops are broken. The lid state is either inverted, or stuck
+# on or off. We can't do much to fix these problems, but this is a way
+# for users to make the laptop panel vanish, a state that might be used
+# by a couple of user-space daemons. On Linux systems, see also
+# logind.conf(5).
+#
+# default=false
+IgnoreLid=false
+
+# Policy for warnings and action based on battery levels
+#
+# Whether battery percentage based policy should be used. The default
+# is to use the time left, change to true to use the percentage, which
+# should work around broken firmwares. It is also more reliable than
+# the time left (frantically saving all your files is going to use more
+# battery than letting it rest for example).
+# default=true
+UsePercentageForPolicy=true
+
+# When UsePercentageForPolicy is true, the levels at which UPower will
+# consider the battery low, critical, or take action for the critical
+# battery level.
+#
+# This will also be used for batteries which don't have time information
+# such as that of peripherals.
+#
+# If any value is invalid, or not in descending order, the defaults
+# will be used.
+#
+# Defaults:
+# PercentageLow=20
+# PercentageCritical=5
+# PercentageAction=2
+PercentageLow=10
+PercentageCritical=5
+PercentageAction=3
+
+# When UsePercentageForPolicy is false, the time remaining in seconds at
+# which UPower will consider the battery low, critical, or take action for
+# the critical battery level.
+#
+# If any value is invalid, or not in descending order, the defaults
+# will be used.
+#
+# Defaults:
+# TimeLow=1200
+# TimeCritical=300
+# TimeAction=120
+TimeLow=1200
+TimeCritical=300
+TimeAction=120
+
+# The action to take when "TimeAction" or "PercentageAction" above has been
+# reached for the batteries (UPS or laptop batteries) supplying the computer
+#
+# Possible values are:
+# PowerOff
+# Hibernate
+# HybridSleep
+#
+# If HybridSleep isn't available, Hibernate will be used
+# If Hibernate isn't available, PowerOff will be used
+CriticalPowerAction=PowerOff

device/community/u-boot-pinebookpro/APKBUILD

@@ -3,7 +3,7 @@
 # a driver for the display and supports efi loading operating systems
 pkgname=u-boot-pinebookpro
 pkgver=2020.07
-pkgrel=4
+pkgrel=5
 pkgdesc="u-boot bootloader for the rk3399"
 url="https://gitlab.denx.de/u-boot/u-boot"
 arch="aarch64"

device/community/u-boot-rockpro64/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=u-boot-rockpro64
 pkgver=2021.07
-pkgrel=1
+pkgrel=2
 pkgdesc="u-boot bootloader for the rk3399"
 url="https://gitlab.com/pine64-org/u-boot"
 arch="aarch64"

device/main/device-pine64-pinephone/51_keyboard.gschema.override

+[org.gnome.desktop.input-sources]
+xkb-options=["lv3:ralt_switch"]

device/main/device-pine64-pinephone/APKBUILD

@@ -4,8 +4,8 @@
 # Co-Maintainer: Luca Weiss <luca@z3ntu.xyz>
 # Co-Maintainer: Dylan Van Assche <me@dylanvanassche.be>
 pkgname=device-pine64-pinephone
-pkgver=0.41
-pkgrel=3
+pkgver=0.42
+pkgrel=1
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -34,8 +34,10 @@ depends="
 	u-boot-pinephone>=2021.01_git20201228-r2
 	u-boot-tools
 	fwupd
-	fwupd-plugin-modem_manager
 	fwupd-plugin-fastboot
+	fwupd-plugin-logind
+	fwupd-plugin-modem_manager
+	fwupd-plugin-upower
 	"
 makedepends="devicepkg-dev dtc"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-upgrade"
@@ -43,6 +45,7 @@ source="
 	00_alsa_pinephone_dshare.conf
 	10-pinephone-proximity.rules
 	50_sleep.gschema.override
+	51_keyboard.gschema.override
 	60-flashlight.rules
 	70-wifi-pm.rules
 	90-modem-eg25.rules
@@ -172,6 +175,8 @@ gnome() {
 	install_if="$pkgname=$pkgver-r$pkgrel gnome-control-center"
 	install -Dm644 "$srcdir"/50_sleep.gschema.override \
 		"$subpkgdir"/usr/share/glib-2.0/schemas/50_sleep.gschema.override
+	install -Dm644 "$srcdir"/51_keyboard.gschema.override -t \
+		"$subpkgdir"/usr/share/glib-2.0/schemas
 }
 
 upower() {
@@ -211,6 +216,7 @@ sha512sums="
 5736444fd38ab4351d148ae96c479085f469bd1e51a692fb1827f8ac921a584389f7696985e1fba21c2deac88709910531f4ece282f45ff54e590c2b54b84ba3  00_alsa_pinephone_dshare.conf
 b53cc6f2531854cc9c1e4c334185a20551d64c8675ee8a8eaa03b99d80808fad421a0f6e99e5be212a974d88c85f461a71ba59ac59c29f298c82f211e3be1ef4  10-pinephone-proximity.rules
 bac664c504d9a3adc6e3d25f24ac63cf7c449a82374544a5b56c259dc25af580897b9dc992865ac83f854f95d17c439b7deb47bfb9557aabcb2e80c3942e22be  50_sleep.gschema.override
+2d68ffe143f633a86670f30e45dbad1cc313f219f22b7cd3319ab44bb7209c20cb29f2ff2c60c92390154af9c9a6815c4186be555364cf31552005eba024c0e7  51_keyboard.gschema.override
 9170da7ac869254644f2fc8d914102f2c16e917dbeb53e33b96c76936711d0540f55fa5c2526d73d5fe244500bc2728bc9d629e2524cf52c573d11e833aee666  60-flashlight.rules
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 9cb52e3c5d63dde68296f4c1f9b691629182f82181a7f0877a72aad6870698ea9e7d628309970afbcce01041274054d304de1ee3faf8c1d101f7f8e988a43098  90-modem-eg25.rules