diff --git a/aports/cross/busybox-static-aarch64/APKBUILD b/aports/cross/busybox-static-aarch64/APKBUILD
index 22a50134de6f213881cb692dd0a645bd29ecb672..89e2b1b4941fbec90f5687678cfb8286dc1acd3a 100644
--- a/aports/cross/busybox-static-aarch64/APKBUILD
+++ b/aports/cross/busybox-static-aarch64/APKBUILD
@@ -2,8 +2,8 @@
 # Generator: pmbootstrap aportgen busybox-static-aarch64
 
 pkgname=busybox-static-aarch64
-pkgver=1.28.2
-pkgrel=3
+pkgver=1.28.3
+pkgrel=0
 
 _arch="aarch64"
 _mirror="http://dl-cdn.alpinelinux.org/alpine/"
@@ -26,4 +26,4 @@ package() {
     rm .PKGINFO .SIGN.*
 }
 
-sha512sums="08b514896dd723e0c39c4de3980bad1a49dbb386b4dce1d95457a803a77ed711a7bbc754e15f74cb004b26f66e0eb10e3a1f73b73968cb72277a496649e242f6  busybox-static-1.28.2-r3-aarch64.apk"
+sha512sums="225a3b3a69d865dbbfe3e47882b69430fdce791ae5481765ffdc1ca9c744f79432b3256dd1c2fd142751887affbbddc2faabd1ff492d212446ffc0bf833e8826  busybox-static-1.28.3-r0-aarch64.apk"
diff --git a/aports/cross/busybox-static-armhf/APKBUILD b/aports/cross/busybox-static-armhf/APKBUILD
index 2573c561112c48f24740502193ee1553b64d753a..7de6c2dccb5b2081580c558ce2ff20e9db50df41 100644
--- a/aports/cross/busybox-static-armhf/APKBUILD
+++ b/aports/cross/busybox-static-armhf/APKBUILD
@@ -2,8 +2,8 @@
 # Generator: pmbootstrap aportgen busybox-static-armhf
 
 pkgname=busybox-static-armhf
-pkgver=1.28.2
-pkgrel=3
+pkgver=1.28.3
+pkgrel=0
 
 _arch="armhf"
 _mirror="http://dl-cdn.alpinelinux.org/alpine/"
@@ -26,4 +26,4 @@ package() {
     rm .PKGINFO .SIGN.*
 }
 
-sha512sums="5eeb8c2b22af2d5bc0cecb3dc625dc53b0699dbf6a7dbbc1ff6d4eaaa11cb7bbe9734fab1eebac90a1a7715b695385e4052f31763ce1ca245e6064a7b1750463  busybox-static-1.28.2-r3-armhf.apk"
+sha512sums="1318a21e59ae4773eb44c6af33decbf5177c679c0cc6c6b23e28f19114b7d8a7d9b021ff0e21f29390cbc5ea0973462952b7af112e5e739ccd2763d42cedd0f7  busybox-static-1.28.3-r0-armhf.apk"
diff --git a/aports/cross/gcc-aarch64/APKBUILD b/aports/cross/gcc-aarch64/APKBUILD
index 9ef4510e0e0faf25dfa7d3ea5c910f2936155e72..13cdb07b9b2127271c3e94160bffc509e5d852ac 100644
--- a/aports/cross/gcc-aarch64/APKBUILD
+++ b/aports/cross/gcc-aarch64/APKBUILD
@@ -4,7 +4,6 @@
 
 CTARGET_ARCH=aarch64
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
-CBUILDROOT="/usr/$CTARGET"
 LANG_OBJC=false
 LANG_JAVA=false
 LANG_GO=false
@@ -12,40 +11,16 @@ LANG_FORTRAN=false
 LANG_ADA=false
 options="!strip !tracedeps"
 
-# Wrap the package function, to make the resulting package
-# lazy-reproducible
-package() {
-    # Repack the *.a files to be reproducible (see #64)
-    _temp="$_builddir"/_reproducible-patch
-    cd "$_builddir"
-    for f in $(find -name '*.a'); do
-        # Copy to a temporary folder
-        echo "Repack $f to be reproducible"
-        mkdir -p "$_temp"
-        cd "$_temp"
-        cp "$_builddir"/"$f" .
-
-        # Repack with a sorted file order
-        ar x *.a
-        rm *.a
-        ar r sorted.a $(find -name '*.o' | sort)
-
-        # Copy back and clean up
-        cp -v sorted.a "$_builddir"/"$f"
-        cd ..
-        rm -r "$_temp"
-    done
-
-    # Unmodified package function from the gcc APKBUILD
-    _package
-
-    # Workaround for: postmarketOS/binary-package-repo#1
-    echo "Replacing hardlinks with symlinks"
-    rm -v "$pkgdir"/usr/bin/"$CTARGET"-c++
-    ln -s -v /usr/bin/"$CTARGET"-g++ "$pkgdir"/usr/bin/"$CTARGET"-c++
-    rm -v "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
-    ln -s -v /usr/bin/"$CTARGET"-gcc "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
-}
+# abuild doesn't try to tries to install "build-base-$CTARGET_ARCH"
+# when this variable matches "no*"
+BOOTSTRAP="nobuildbase"
+
+# abuild will only cross compile when this variable is set, but it
+# needs to find a valid package database in there for dependency
+# resolving, so we set it to /.
+CBUILDROOT="/"
+
+_cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname="gcc-aarch64"
 pkgver=6.4.0
@@ -287,7 +262,6 @@ prepare() {
 build() {
 	local _arch_configure=
 	local _libc_configure=
-	local _cross_configure=
 	local _bootstrap_configure=
 	local _symvers=
 
@@ -325,8 +299,6 @@ build() {
 		;;
 	esac
 
-	[ "$CBUILD" != "$CHOST"   ] && _cross_configure="--disable-bootstrap"
-	[ "$CHOST"  != "$CTARGET" ] && _cross_configure="--disable-bootstrap --with-sysroot=$CBUILDROOT"
 
 	case "$BOOTSTRAP" in
 	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
@@ -382,7 +354,7 @@ build() {
 	make
 }
 
-_package() {
+package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="${pkgdir}" install
 
diff --git a/aports/cross/gcc-armhf/APKBUILD b/aports/cross/gcc-armhf/APKBUILD
index 735bac4cf30f484be3ffa08ef8364e7d26b50023..1e226a959b2f4b08b0b3879a761504aa18777a39 100644
--- a/aports/cross/gcc-armhf/APKBUILD
+++ b/aports/cross/gcc-armhf/APKBUILD
@@ -4,7 +4,6 @@
 
 CTARGET_ARCH=armhf
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
-CBUILDROOT="/usr/$CTARGET"
 LANG_OBJC=false
 LANG_JAVA=false
 LANG_GO=false
@@ -12,40 +11,16 @@ LANG_FORTRAN=false
 LANG_ADA=false
 options="!strip !tracedeps"
 
-# Wrap the package function, to make the resulting package
-# lazy-reproducible
-package() {
-    # Repack the *.a files to be reproducible (see #64)
-    _temp="$_builddir"/_reproducible-patch
-    cd "$_builddir"
-    for f in $(find -name '*.a'); do
-        # Copy to a temporary folder
-        echo "Repack $f to be reproducible"
-        mkdir -p "$_temp"
-        cd "$_temp"
-        cp "$_builddir"/"$f" .
-
-        # Repack with a sorted file order
-        ar x *.a
-        rm *.a
-        ar r sorted.a $(find -name '*.o' | sort)
-
-        # Copy back and clean up
-        cp -v sorted.a "$_builddir"/"$f"
-        cd ..
-        rm -r "$_temp"
-    done
-
-    # Unmodified package function from the gcc APKBUILD
-    _package
-
-    # Workaround for: postmarketOS/binary-package-repo#1
-    echo "Replacing hardlinks with symlinks"
-    rm -v "$pkgdir"/usr/bin/"$CTARGET"-c++
-    ln -s -v /usr/bin/"$CTARGET"-g++ "$pkgdir"/usr/bin/"$CTARGET"-c++
-    rm -v "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
-    ln -s -v /usr/bin/"$CTARGET"-gcc "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
-}
+# abuild doesn't try to tries to install "build-base-$CTARGET_ARCH"
+# when this variable matches "no*"
+BOOTSTRAP="nobuildbase"
+
+# abuild will only cross compile when this variable is set, but it
+# needs to find a valid package database in there for dependency
+# resolving, so we set it to /.
+CBUILDROOT="/"
+
+_cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname="gcc-armhf"
 pkgver=6.4.0
@@ -287,7 +262,6 @@ prepare() {
 build() {
 	local _arch_configure=
 	local _libc_configure=
-	local _cross_configure=
 	local _bootstrap_configure=
 	local _symvers=
 
@@ -325,8 +299,6 @@ build() {
 		;;
 	esac
 
-	[ "$CBUILD" != "$CHOST"   ] && _cross_configure="--disable-bootstrap"
-	[ "$CHOST"  != "$CTARGET" ] && _cross_configure="--disable-bootstrap --with-sysroot=$CBUILDROOT"
 
 	case "$BOOTSTRAP" in
 	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
@@ -382,7 +354,7 @@ build() {
 	make
 }
 
-_package() {
+package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="${pkgdir}" install
 
diff --git a/aports/cross/gcc-x86_64/APKBUILD b/aports/cross/gcc-x86_64/APKBUILD
index 63726de527dde89e02de1b20cdbc27c647c2a43f..82c333bcdeedb9df1f4eba6b302873c45a935a22 100644
--- a/aports/cross/gcc-x86_64/APKBUILD
+++ b/aports/cross/gcc-x86_64/APKBUILD
@@ -4,7 +4,6 @@
 
 CTARGET_ARCH=x86_64
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
-CBUILDROOT="/usr/$CTARGET"
 LANG_OBJC=false
 LANG_JAVA=false
 LANG_GO=false
@@ -12,40 +11,16 @@ LANG_FORTRAN=false
 LANG_ADA=false
 options="!strip !tracedeps"
 
-# Wrap the package function, to make the resulting package
-# lazy-reproducible
-package() {
-    # Repack the *.a files to be reproducible (see #64)
-    _temp="$_builddir"/_reproducible-patch
-    cd "$_builddir"
-    for f in $(find -name '*.a'); do
-        # Copy to a temporary folder
-        echo "Repack $f to be reproducible"
-        mkdir -p "$_temp"
-        cd "$_temp"
-        cp "$_builddir"/"$f" .
-
-        # Repack with a sorted file order
-        ar x *.a
-        rm *.a
-        ar r sorted.a $(find -name '*.o' | sort)
-
-        # Copy back and clean up
-        cp -v sorted.a "$_builddir"/"$f"
-        cd ..
-        rm -r "$_temp"
-    done
-
-    # Unmodified package function from the gcc APKBUILD
-    _package
-
-    # Workaround for: postmarketOS/binary-package-repo#1
-    echo "Replacing hardlinks with symlinks"
-    rm -v "$pkgdir"/usr/bin/"$CTARGET"-c++
-    ln -s -v /usr/bin/"$CTARGET"-g++ "$pkgdir"/usr/bin/"$CTARGET"-c++
-    rm -v "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
-    ln -s -v /usr/bin/"$CTARGET"-gcc "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
-}
+# abuild doesn't try to tries to install "build-base-$CTARGET_ARCH"
+# when this variable matches "no*"
+BOOTSTRAP="nobuildbase"
+
+# abuild will only cross compile when this variable is set, but it
+# needs to find a valid package database in there for dependency
+# resolving, so we set it to /.
+CBUILDROOT="/"
+
+_cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname="gcc-x86_64"
 pkgver=6.4.0
@@ -287,7 +262,6 @@ prepare() {
 build() {
 	local _arch_configure=
 	local _libc_configure=
-	local _cross_configure=
 	local _bootstrap_configure=
 	local _symvers=
 
@@ -325,8 +299,6 @@ build() {
 		;;
 	esac
 
-	[ "$CBUILD" != "$CHOST"   ] && _cross_configure="--disable-bootstrap"
-	[ "$CHOST"  != "$CTARGET" ] && _cross_configure="--disable-bootstrap --with-sysroot=$CBUILDROOT"
 
 	case "$BOOTSTRAP" in
 	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
@@ -382,7 +354,7 @@ build() {
 	make
 }
 
-_package() {
+package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="${pkgdir}" install
 
diff --git a/aports/device/device-lg-hammerhead/APKBUILD b/aports/device/device-lg-hammerhead/APKBUILD
index 001ba977e7536429188d2adbcc80f6b5500da578..4d4482d59499312cd8e38dd143ff57e6a5676624 100644
--- a/aports/device/device-lg-hammerhead/APKBUILD
+++ b/aports/device/device-lg-hammerhead/APKBUILD
@@ -1,13 +1,13 @@
 pkgname=device-lg-hammerhead
-pkgver=1
-pkgrel=25
+pkgver=2
+pkgrel=0
 pkgdesc="Google Nexus 5"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-postmarketos-qcom mkbootimg mesa-dri-freedreno"
+depends="postmarketos-base linux-postmarketos-qcom mkbootimg mesa-dri-freedreno ofono"
 makedepends=""
-install=""
+install="$pkgname.post-install"
 subpackages="$pkgname-weston $pkgname-x11 $pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
@@ -44,8 +44,8 @@ weston() {
 }
 
 nonfree_firmware() {
-	pkgdesc="Wifi/GPU firmware"
-	depends="linux-firmware-qcom linux-firmware-brcm firmware-adreno"
+	pkgdesc="Wifi, GPU, Modem and ADSP firmware"
+	depends="linux-firmware-qcom linux-firmware-brcm firmware-adreno firmware-lg-hammerhead-adsp firmware-lg-hammerhead-modem modem-qcom-msm-mainline-common"
 	mkdir "$subpkgdir"
 }
 
diff --git a/aports/device/device-lg-hammerhead/device-lg-hammerhead.post-install b/aports/device/device-lg-hammerhead/device-lg-hammerhead.post-install
new file mode 100644
index 0000000000000000000000000000000000000000..f3cc5122e61398fff850b0089e6ac612f3c96574
--- /dev/null
+++ b/aports/device/device-lg-hammerhead/device-lg-hammerhead.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Enable ofono
+rc-update add ofono default
diff --git a/aports/device/device-nokia-n900/APKBUILD b/aports/device/device-nokia-n900/APKBUILD
index e88652352a08b6e62128a3c5483b8fc7916c6882..4fb90d6cfbed2dfa12a4830d5853704552c6ae2e 100644
--- a/aports/device/device-nokia-n900/APKBUILD
+++ b/aports/device/device-nokia-n900/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-nokia-n900
 pkgver=2
-pkgrel=7
+pkgrel=8
 pkgdesc="Nokia N900"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -30,6 +30,7 @@ source="
 	weston.ini
 	i3wm/i3wm.conf
 	i3wm/i3status.conf
+	i3wm/bq27200_status.sh
 "
 options="!check"
 
@@ -93,6 +94,8 @@ i3wm() {
 		"$subpkgdir"/etc/skel/.config/i3/config
 	install -D -m644 "$srcdir"/i3status.conf \
 		"$subpkgdir"/etc/skel/.config/i3/i3status.conf
+	install -D -m755 "$srcdir"/bq27200_status.sh \
+		"$subpkgdir"/etc/skel/.config/i3/bq27200_status.sh
 }
 
 nonfree_firmware() {
@@ -114,5 +117,6 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
 e023df91295fe7e410e163747d17e5b92fe3c022ff076e286778b8334368f885603b8fda65671e4a7328766da7b2552ea4df1b1399df23e504a41a6655771142  asound.state
 7f48d1a044f8c02f7b1d11487ec1f83978d9b0ea12529156e7418f82be556d9baee32b70c4d911174e388bb4941dc19519e93e7551d00ffcd825c848665ff096  weston.ini
-bd140c57259f8788c1db49e0b85d17868d837fa094f8d3bb3dc5114b4c6ad5c184b718ceb60b920cefe6f42162477c9753d7784494b7787202c6ba57b49d5005  i3wm.conf
-ea70ed51ed55ff307a6562985c8919d3e57c8bf6a4f6ab9fe5329477f0409da9424ca5c8371fb497ecfc5438c106d967f8258054725e4eb84e4a49e7f95f5dcd  i3status.conf"
+387c76ef51d08b1f397364657ab32c5915fbd62b2786e9fd61b47e9eeed36d24571e22974ea36cb1b01c25eef5789c4e8e1de9a23de3a4a9192e727ed6a7ab67  i3wm.conf
+3bed8554400d6bbebf7e61b14f347a0f3e24b29be296c56fc829ed655cf67fa547c09bb715589b716d6c3f04492e9f3a12473dce6c7151bc15562b9d102bac2f  i3status.conf
+4e7abd1ac6223494b2ce96f7fb2dfe6116ee8a526440df07307994ed577f1860222548f7512273b5a21febac8119794774658f60e5d6976747ddc60323d26a62  bq27200_status.sh"
diff --git a/aports/device/device-nokia-n900/i3wm/bq27200_status.sh b/aports/device/device-nokia-n900/i3wm/bq27200_status.sh
new file mode 100755
index 0000000000000000000000000000000000000000..599e994f58d62411fa4d75d6701d2454458dcf41
--- /dev/null
+++ b/aports/device/device-nokia-n900/i3wm/bq27200_status.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# i3status wrapper for displaying correct battery status on N900/bq27200
+#
+# Author:
+# - Sicelo A. Mhlongo <absicsz@gmail.com> (2018)
+#
+# Based on i3status/contrib/net-speed.sh by
+#
+# - Moritz Warning <moritzwarning@web.de> (2016)
+# - Zhong Jianxin <azuwis@gmail.com> (2014)
+#
+# See file LICENSE in the i3status root directory for license information.
+#
+
+battery_path="/sys/class/power_supply/bq27200-0/"
+
+get_battery(){
+        read capacity < "${battery_path}capacity"
+        read chg_full < "${battery_path}charge_full"
+        read voltage < "${battery_path}voltage_now"
+        read disch_rate < "${battery_path}current_now"
+        notification="$capacity%\/$(( ( chg_full / 1000 ) ))mAh -- $(( ( voltage / 1000 ) ))mV @ $(( ( disch_rate / -1000 ) ))mA"
+}
+
+# When 'output_mode' is set to "i3bar", i3status produces JSON output. We
+# must read and emit the first three lines of output without modification
+# as they make up the header. Once in the 'while' loop, we read a line of
+# output from i3status, remove the opening field delimiter ,[ and prepend
+# the calculated battery info and a delimiter
+
+/usr/bin/i3status -c ~/.config/i3/i3status.conf |  ( read line && \
+echo "$line" && read line && echo "$line" && read line && echo "$line" && \
+while :
+do
+        read line
+        get_battery
+        echo ",[{\"full_text\":\"${notification}\"},${line#,\[}" || exit 1
+done )
diff --git a/aports/device/device-nokia-n900/i3wm/i3status.conf b/aports/device/device-nokia-n900/i3wm/i3status.conf
index ef9c77d8d08195faa7202baab612d96a4086c616..a24d29807ccacde05667d1de8add71974b16c571 100644
--- a/aports/device/device-nokia-n900/i3wm/i3status.conf
+++ b/aports/device/device-nokia-n900/i3wm/i3status.conf
@@ -12,11 +12,11 @@ general {
         color_good = "#009900"
         color_bad = "#990000"
         color_degraded = "#999900"
+        output_format = "i3bar"
 }
 
 order += "disk /"
 order += "wireless _first_"
-order += "battery all"
 order += "load"
 order += "tztime local"
 
@@ -25,12 +25,8 @@ wireless _first_ {
         format_down = "W: down"
 }
 
-battery all {
-        format = "%status %percentage %remaining"
-}
-
 tztime local {
-        format = "%Y-%m-%d %H:%M:%S"
+        format = "%Y-%m-%d %H:%M"
 }
 
 load {
diff --git a/aports/device/device-nokia-n900/i3wm/i3wm.conf b/aports/device/device-nokia-n900/i3wm/i3wm.conf
index edae49dcf16cc47bd933ab4e1f01243894a4b99b..de7198a537328f8eb6e05e80df670eca1bb18e1b 100644
--- a/aports/device/device-nokia-n900/i3wm/i3wm.conf
+++ b/aports/device/device-nokia-n900/i3wm/i3wm.conf
@@ -3,6 +3,11 @@ font pango:monospace 8
 new_window 1pixel
 
 mode "workspace" {
+        bindsym a workspace 1
+        bindsym s workspace 2
+        bindsym d workspace 3
+        bindsym f workspace 4
+        bindsym g workspace 5
         bindsym Left workspace prev
         bindsym Right workspace next
         bindsym Shift+Left move container to workspace prev
@@ -44,7 +49,7 @@ bindsym XF86ScreenSaver exec --no-startup-id lock.sh
 # finds out, if available)
 bar {
         position top
-        status_command i3status --conf ~/.config/i3/i3status.conf
+        status_command exec ~/.config/i3/bq27200_status.sh
         colors {
                 background #000000
                 statusline #ffffff
diff --git a/aports/device/device-samsung-klte/APKBUILD b/aports/device/device-samsung-klte/APKBUILD
index a1cd4855dd6392525412040c4feebe37992f07f7..60215f4f9bf541af11f720b929329cc2f77e6af7 100644
--- a/aports/device/device-samsung-klte/APKBUILD
+++ b/aports/device/device-samsung-klte/APKBUILD
@@ -1,13 +1,17 @@
 pkgname="device-samsung-klte"
 pkgdesc="Samsung Galaxy S5"
-pkgver=0.1
-pkgrel=3
+pkgver=0.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="postmarketos-base linux-samsung-klte mkbootimg msm-fb-refresher"
+depends="postmarketos-base mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+"
 source="deviceinfo"
 
 build() {
@@ -18,4 +22,16 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+kernel_downstream() {
+	pkgdesc="Display and touchscreen works (see device table for details)"
+	depends="linux-samsung-klte"
+	mkdir "$subpkgdir"
+}
+
+kernel_mainline() {
+	pkgdesc="For kernel development only (most features aren't working)"
+	depends="linux-postmarketos-qcom"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="fc39550299d6ffee33c1b984671a91a5da9a4f24db5994cfd8650a75f96416bc30c3b169353ea3939c765df6a5801ee9647808c82d46a00190a0c1db44708b73  deviceinfo"
diff --git a/aports/firmware/firmware-lg-hammerhead/APKBUILD b/aports/firmware/firmware-lg-hammerhead/APKBUILD
new file mode 100644
index 0000000000000000000000000000000000000000..a2d352c05aceab41cb3ab27cb42b75e25ec02e97
--- /dev/null
+++ b/aports/firmware/firmware-lg-hammerhead/APKBUILD
@@ -0,0 +1,37 @@
+pkgname=firmware-lg-hammerhead
+pkgver=1
+pkgrel=1
+pkgdesc="Firmware for LG hammerhead (Nexus 5)"
+subpackages="$pkgname-modem $pkgname-adsp"
+url="https://github.com/TheMuppets/proprietary_vendor_lge"
+arch="noarch"
+license="proprietary"
+options="!check !strip !archcheck"
+
+# Sources
+source="https://bshah.in/hammerhead-firmware.tar.gz"
+
+package() {
+	# parent package is empty
+	mkdir -p "$pkgdir"
+}
+
+modem() {
+	pkgdesc="LG Nexus 5 modem firmware"
+
+	cd "$srcdir"
+	for _i in modem.* mba.*; do
+		install -Dm644 $_i "$subpkgdir"/lib/firmware/$_i
+	done
+}
+
+adsp() {
+	pkgdesc="LG Nexus 5 adsp firmware"
+
+	cd "$srcdir"
+	for _i in adsp.*; do
+		install -Dm644 $_i "$subpkgdir"/lib/firmware/$_i
+	done
+}
+
+sha512sums="ae8cd5ad7bd6486117131b407454be79df9e8b092d7eabfcb0eec029867d6aa037f52ec0a15dd2bf268a9d9eb74e01dca7e8a4b779eb1564a95ab19457402f64  hammerhead-firmware.tar.gz"
diff --git a/aports/kde/attica-qt/APKBUILD b/aports/kde/attica-qt/APKBUILD
index 182cae5fc42217350e4ea7ffde6c1de17c2d7645..80b0af05a2655c8833f20822deb50a8b043e4473 100644
--- a/aports/kde/attica-qt/APKBUILD
+++ b/aports/kde/attica-qt/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=attica-qt
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 arch="all"
 pkgdesc='Qt5 library that implements the Open Collaboration Services API'
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="a810bf4535fe7a012c63c27542e6fd5a58486118ffd3bb10be9aebbf2ef4f122a5141af45c051f50492bd872daa81f575447860b78eff4a26c646a2adc62b110  attica-5.45.0.tar.xz"
+sha512sums="cd5036c5475f3efc502002c4d18f7bddb322095dbc6faaf99958cf76ea6a3e95cb39b3ceaf7d6a5a38b5e6eefd2708463c8023a877e3f96b83642780d942fa98  attica-5.46.0.tar.xz"
diff --git a/aports/kde/baloo/APKBUILD b/aports/kde/baloo/APKBUILD
index 1c4ca88d08d034d2b71ad94a156b83fbf1fd08f9..8f8bdffb52a5a0636198dd299e1500b279f1685b 100644
--- a/aports/kde/baloo/APKBUILD
+++ b/aports/kde/baloo/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=baloo
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='A framework for searching and managing metadata'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="d4106d118b133c3719575d43467cdc8fb78311959a87147b98d8c3db947a05fd1bcd2a7f27521494cf989ca5fe79c2a66b0337676a960e36a7c02b4f8f076403  baloo-5.45.0.tar.xz"
+sha512sums="b47a2da7b53aac66fd624955bd222b3dfa2cdb220f80b10abc19a396f69463c38e0a2cb8200700255e2393b3645b2035a19225f27097940ccded5486afb4c96c  baloo-5.46.0.tar.xz"
diff --git a/aports/kde/breeze-icons/APKBUILD b/aports/kde/breeze-icons/APKBUILD
index d868e5e6542534b73842623fa9992a45de4aed40..0495fa9888305b0b01b1725c2fb9f1b6444a2b44 100644
--- a/aports/kde/breeze-icons/APKBUILD
+++ b/aports/kde/breeze-icons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=breeze-icons
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Breeze icon themes'
 arch="noarch"
@@ -10,6 +10,7 @@ license="LGPL-3.0"
 depends_dev="qt5-qtbase-dev"
 makedepends="$depends_dev extra-cmake-modules"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
+options="!check" # plasma-browser-integration icon is not available in a scalable directory
 
 build() {
 	cmake \
@@ -28,4 +29,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="da2dae391508baa696412ddd83ae32deb98941cebcc5fc1d6f3ed63b1886223d0a753f02ee052b2b82c4faabfde124b7409784ac3ff50528131e6ab080ca82fb  breeze-icons-5.45.0.tar.xz"
+sha512sums="ff17523e154692ebc90d21b04758b051e80b5df9cad8ae82baabfaec906d99b9efcb0bfc36d5ce38e5a55698f8284ff73f67c24df9e4b5c35d484e18db9647dc  breeze-icons-5.46.0.tar.xz"
diff --git a/aports/kde/breeze/APKBUILD b/aports/kde/breeze/APKBUILD
index c75899ade6f4dccc4124175ad09980b6aa7d7e97..599323c6c771c687a3beaded66e8258737aa06cf 100644
--- a/aports/kde/breeze/APKBUILD
+++ b/aports/kde/breeze/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=breeze
-pkgver=5.12.3
-pkgrel=1
+pkgver=5.12.5
+pkgrel=0
 pkgdesc='Artwork, styles and assets for the Breeze visual style for the Plasma Desktop'
 arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="e9164dafdc6324103db4428e9e6d1819d3ff9e9d8f846392862e0f22719ffeb34b30c591dba8df48f733d4f0c18cca537b8d7d0d6e8d64ea55126fde56cf7c5e  breeze-5.12.3.tar.xz"
+sha512sums="5d21fe948c8a480ce04c45ce21b56a3b2517c7642de588debfd1e76d2b53bd1e1ef1204cbb28398d5a673a986698baf91dbfb49d95e8810188f21c104e185d46  breeze-5.12.5.tar.xz"
diff --git a/aports/kde/elisa/APKBUILD b/aports/kde/elisa/APKBUILD
index bd233bb5b5cf4d772ce472cf46284e66dece61e2..781e1eb9a247b75d9c0380c0ad2408e616f26393 100644
--- a/aports/kde/elisa/APKBUILD
+++ b/aports/kde/elisa/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=elisa
-pkgver=0_git20180205
-pkgrel=1
-_commit=d7c4cdff4565316d690d95b417ab87375cb9b9b2
+pkgver=0_git20180510
+pkgrel=0
+_commit="7c35d883b8e129171211713bf074627796855d75"
 pkgdesc='Elisa Music Player'
 arch="all"
 url='https://github/com/kde/elisa'
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="499c5f3f6b154e98e3f5dde3663c7bab726edccbc2704f7805745f6e6c5c9084e7fe450629bd5a66e90bd4b96f2f23a7ac9d016d9c8e805464741d83800243f7  d7c4cdff4565316d690d95b417ab87375cb9b9b2.tar.gz"
+sha512sums="69cc097452f649dfe7a97ff37026ccd65b3115173b98e8136f666e60cdb9375c23ad4b6958b23d2675b8d2fed5ca09a678e5f48decd1962c6026c17a52879a43  7c35d883b8e129171211713bf074627796855d75.tar.gz"
diff --git a/aports/kde/extra-cmake-modules/APKBUILD b/aports/kde/extra-cmake-modules/APKBUILD
index 8d17d9f64fec6da3ef650ae6fd5536a5733df45c..ff5f21461827266d7c37ce074eff0f610f964644 100644
--- a/aports/kde/extra-cmake-modules/APKBUILD
+++ b/aports/kde/extra-cmake-modules/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: k0r10n <k0r10n.dev@gmail.com>
 # Contributor: Ivan Tham <pickfire@riseup.net>
 pkgname=extra-cmake-modules
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc="Extra CMake modules"
 url="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
@@ -27,4 +27,4 @@ package() {
 		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="d33e22ab08e16c3d8de3f7fc26fbc36a6940fb2d4387cf2b0ce4443fbc34e6dbbdfe2019bc31fc3b0005c582ef487ce97c02f3e7e2361f43676092ef846e9b68  extra-cmake-modules-5.45.0.tar.xz"
+sha512sums="6431ad8e5230bbc0a5e1199037102014c376a682d711211b257359c35c8a3aaddb6128277721ca40cedf43fcca77312a2754f306487a1b3dbea728d643f0ad3a  extra-cmake-modules-5.46.0.tar.xz"
diff --git a/aports/kde/kactivities/APKBUILD b/aports/kde/kactivities/APKBUILD
index 420a8a068d26ead0f987e094d2af863a4b24413d..5d9c153b4b086eb54b328a5f169efe82be64cb67 100644
--- a/aports/kde/kactivities/APKBUILD
+++ b/aports/kde/kactivities/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kactivities
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 arch="all"
 pkgdesc="Core components for the KDE's Activities"
@@ -37,4 +37,4 @@ package() {
 	cd "$srcdir"/build
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="d4982a8f00add14a5d8d3133d4296a7bf95771eeeda3456d120a521fc9c0fda93a6c1179500442fd558d51b57584b888eac7bb1d75fd67f11817ce6a6d1a15ab  kactivities-5.45.0.tar.xz"
+sha512sums="9a51cc011764a959a82f45b150d05e0171444dcbdcfa1320fe67bfa97a1cdda4faddbdab3e97496485a7025a44536614b359876fd93c976c6289820f7ada285c  kactivities-5.46.0.tar.xz"
diff --git a/aports/kde/kactivitymanagerd/APKBUILD b/aports/kde/kactivitymanagerd/APKBUILD
index b4d2945ec078e37c23c4b6041ca04bbd8f384f0b..676a2b4975f0d8b520080b9897ce3a4fa0746abb 100644
--- a/aports/kde/kactivitymanagerd/APKBUILD
+++ b/aports/kde/kactivitymanagerd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kactivitymanagerd
-pkgver=5.12.3
+pkgver=5.12.5
 pkgrel=0
 pkgdesc="System service to manage user's activities and track the usage patterns"
 arch="all"
@@ -39,4 +39,4 @@ package() {
 	cd "$srcdir"/build
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="a0250362a37edfc176caa9fd2b2fe9ca00eb78840f320255bf9a9c2d90c0b8bdeb608f7995f9ab5ddbf573cf8ac5307932e3b6c23b2d27d548f13508500daba9  kactivitymanagerd-5.12.3.tar.xz"
+sha512sums="59c3d0dfd07f5bf620860c0a5e6d5989855ba323134e826c2ae79b3e40fc62768ef179f6969d9abace249963d99ba0db0eaea0de23686b67eb0fafcd2f1af84f  kactivitymanagerd-5.12.5.tar.xz"
diff --git a/aports/kde/karchive/APKBUILD b/aports/kde/karchive/APKBUILD
index acb37706cbaa78f2689ce8423c63e7c34ecda43e..f9594375e1812770f91cf9b2b4fff520b8b62425 100644
--- a/aports/kde/karchive/APKBUILD
+++ b/aports/kde/karchive/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=karchive
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Qt 5 addon providing access to numerous types of archives'
 arch="all"
@@ -30,4 +30,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="322483e1ad2daaca101ba8ed2f5c1565a7425cec459dddcb3fd2852383cdb135a6b8031df162e5cff635f37c73cabce27545bc3621daf16f08777e5ffe37cede  karchive-5.45.0.tar.xz"
+sha512sums="ab218a2d629ce7e9847cfe78b7a7c6c329d52e8ad270013a0c8e6bed70c425ad55b18ced015a833b27f8dcd1428e61c63c31d60db85c283f672e1f58a7ffc265  karchive-5.46.0.tar.xz"
diff --git a/aports/kde/kauth/APKBUILD b/aports/kde/kauth/APKBUILD
index ede1a2e05916d46de82b1033aaf36945f6084a43..b00069ac40ebadf16b8aa74f4d91e445edc06f0b 100644
--- a/aports/kde/kauth/APKBUILD
+++ b/aports/kde/kauth/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kauth
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Abstraction to system policy and authentication features'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="59fdb7269b8cdb31d8da06b00cff102a1c309e813e47f400be98736978cec98476be068f6fcd659fa0e7bf2bbc228e9d1a2027ecd662001886f5f3d2c37af1b6  kauth-5.45.0.tar.xz"
+sha512sums="dd94d8923ea7caa1f420d4a906876e1082c1afc97130731f579e6c3e9b377ec9c1abfa1d489ed60c11fff248da455d87a8cde8a581156d61bf6410b8c19d3401  kauth-5.46.0.tar.xz"
diff --git a/aports/kde/kbookmarks/APKBUILD b/aports/kde/kbookmarks/APKBUILD
index ff2697f09afe28bcac6716eab08d15a7e59aa429..20e5eadec4b3173312819118716e9fc601728ce0 100644
--- a/aports/kde/kbookmarks/APKBUILD
+++ b/aports/kde/kbookmarks/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kbookmarks
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Support for bookmarks and the XBEL format'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="24d48e0407cb14d45ecadc1ccb6dcdf779e4bacfd824529a0b6789d05c8f62f027de75c3c8441ace916a7eb99cee5d86bbd4c8a64705cd966773499f81266d00  kbookmarks-5.45.0.tar.xz"
+sha512sums="8bc05aa4710c9a0148e28fb27fbc75984947a5c42c0c48befe78e510f48646bf2ca71098ea50d251aed888369d573451d6b3ba5afc58d6268fb14efe31df9a5d  kbookmarks-5.46.0.tar.xz"
diff --git a/aports/kde/kcmutils/APKBUILD b/aports/kde/kcmutils/APKBUILD
index 11336486c10d127a8a53d6bfa2e25e809d066a37..57b17c441e2f163c7d40070445968ddcbc1110f8 100644
--- a/aports/kde/kcmutils/APKBUILD
+++ b/aports/kde/kcmutils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcmutils
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Utilities for interacting with KCModules'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="c362df53bd6a6a73abda6c6dddef461bf5ef0dcf08f4b20d5df2afe3977d7181be623dcd800e02b9c2f66f5ad0d41af11835d1e45d0437fd8c97755773c2ddd7  kcmutils-5.45.0.tar.xz"
+sha512sums="322cbe7dc93320f468c20b683c4a10abb7b19b1250a124e8a16e440571d160f102b709a8ddbbef6087aceacc44ba473b1b348f0055c442b5131c3b46de4ae732  kcmutils-5.46.0.tar.xz"
diff --git a/aports/kde/kcodecs/APKBUILD b/aports/kde/kcodecs/APKBUILD
index 05ab69fac508d36321d4ec94715a560b83cb55d6..a3e9e59a3b321cb4dc86bf370461541a978d550c 100644
--- a/aports/kde/kcodecs/APKBUILD
+++ b/aports/kde/kcodecs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcodecs
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Provide a collection of methods to manipulate strings using various encodings'
 arch="all"
@@ -30,4 +30,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="5d41b4f05e93b9049fbccd8768759286c6cc605bd31bca61a9ef33877e85201642182bd2a4ecc0ed570d6b86e30026f9b3f7054c447a063f0a527204136f91fc  kcodecs-5.45.0.tar.xz"
+sha512sums="0d95829643c3cb27f408d409668a0336b05ac15046a30f9e067d4448671b3847712419bc7b807858e3be20229446f47923d5e59d0306243f49a0192e8a8f4412  kcodecs-5.46.0.tar.xz"
diff --git a/aports/kde/kcompletion/APKBUILD b/aports/kde/kcompletion/APKBUILD
index 622007a7304a0bb4d99a8868722e0e81e4c36ef4..6cfe5db1bc4dea34531c00e10cf6b948c0a25ad4 100644
--- a/aports/kde/kcompletion/APKBUILD
+++ b/aports/kde/kcompletion/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcompletion
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Text completion helpers and widgets'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="0db81bab697c702ce8186ed6fc3099c24f66da97050c2e7fd48f0ca6509bdf117ff04176e7039fb3d0b78772e93c23c5d4000aa0bb1282e659f3573f9a5babda  kcompletion-5.45.0.tar.xz"
+sha512sums="7c958ba845a89745472ae8c40c95f43f78fbab420c394b81014335f004d3b40f7c4f44263cd5b99c5a448fde99e3f9da607fe01f539eba18a68a28c88d4b0d27  kcompletion-5.46.0.tar.xz"
diff --git a/aports/kde/kconfig/APKBUILD b/aports/kde/kconfig/APKBUILD
index 941c97657a627eee3b848f0d578c76911ec44918..51bf972c8e2e441bd03d891180fd2397b4a7eb36 100644
--- a/aports/kde/kconfig/APKBUILD
+++ b/aports/kde/kconfig/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kconfig
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Configuration system'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="d248741546774554de13781735c0bf630ce7986d645ef77dc61842caeadbb4e8c4f581ba93e3d37ac5716c3548954e0120284a3cabc8f88c4122bfb668359085  kconfig-5.45.0.tar.xz"
+sha512sums="0dc5234482ca773a7dbabeff983013e4da17c9ea42805e32070c415a51fc878d0918f768315f9db6ee23bce16e445a6f3defe96be256a10568bdee444d8f1a5a  kconfig-5.46.0.tar.xz"
diff --git a/aports/kde/kconfigwidgets/APKBUILD b/aports/kde/kconfigwidgets/APKBUILD
index 2670899419cb6524239cb66542cf92213d433827..6a80b90142f7d2428dcf21ce47797f03b57c4cd5 100644
--- a/aports/kde/kconfigwidgets/APKBUILD
+++ b/aports/kde/kconfigwidgets/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kconfigwidgets
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Widgets for KConfig'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="6ac66acbce783fc6a5b588b0cd49af88aa8f4ca59948f8acda4e2682c8a8d3d52c1e0b2b022044a1553909440bc29d8d45ff02c47964aaab132a0d84fb746c43  kconfigwidgets-5.45.0.tar.xz"
+sha512sums="09dae334187ee8fbb3ec39d88ef5b92b7f00a43ce7d72a535d3a9a5556083b63990881c1b19c8e3616c786917a5d41cac8fe45eabbd531f8330a05c0e0ba7a85  kconfigwidgets-5.46.0.tar.xz"
diff --git a/aports/kde/kcoreaddons/APKBUILD b/aports/kde/kcoreaddons/APKBUILD
index 6285060cac85133818c04bee9e0df551a47f4d11..0ea7b87ce69e774f09e60066d7cd0f9bb6858bb3 100644
--- a/aports/kde/kcoreaddons/APKBUILD
+++ b/aports/kde/kcoreaddons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcoreaddons
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Addons to QtCore'
 arch="all"
@@ -31,4 +31,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="889afb03b655667c51f0a3da8ea56c570ea2a910373797966cd8204fa52d699d457b6ad1b24f68a8375031fe84e4cf3ff2ff0d0cc700f8688f58d55fe7da5acb  kcoreaddons-5.45.0.tar.xz"
+sha512sums="3c12462729a163fc7ab5a49ea9473b94d44ad4276243d65bcbe10a28fe6c1c4a9996bdf09c4f03b0083b4dff97e1719eb1aaf8b7d8dc882d4f66de61e7ef416a  kcoreaddons-5.46.0.tar.xz"
diff --git a/aports/kde/kcrash/APKBUILD b/aports/kde/kcrash/APKBUILD
index f6372b5746fd908b009b3e313e4eb2aa3b291d39..19c9a39250aa76065767b8d1d17417375bc3c0d0 100644
--- a/aports/kde/kcrash/APKBUILD
+++ b/aports/kde/kcrash/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcrash
-pkgver=5.45.0
-pkgrel=1
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Support for application crash analysis and bug report from apps'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="79a208702b8617ae0e9393b3ba1df80e984977b4612e61a93209009552766c0a7bbcb50f517ce9df8b6b6ae46cace68299767afcbb1fa79aac7372f164fc3af7  kcrash-5.45.0.tar.xz"
+sha512sums="b286e3d396d31c52deffd250d064795166a9ad6b19de63bca3eba1c37d8919bc0e31e2238c30f901403cac19dc956fb6515c8ee5a1a73287a14b79d674048b39  kcrash-5.46.0.tar.xz"
diff --git a/aports/kde/kdbusaddons/APKBUILD b/aports/kde/kdbusaddons/APKBUILD
index 79b409a54b33c5d894eeb51bc674db610d698470..7688ac91c0a87272d8153f97da8856ebb941fea7 100644
--- a/aports/kde/kdbusaddons/APKBUILD
+++ b/aports/kde/kdbusaddons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdbusaddons
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Addons to QtDBus'
 arch="all"
@@ -31,4 +31,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="931df2b67d60c6258c102639609d9e2bacfad22df9a0bfc88cf3ad4df2a7f84acc5eab28c7e296a1fda3bac97e0a06172d89fe3118727b99d01eff56235110d3  kdbusaddons-5.45.0.tar.xz"
+sha512sums="5362e2f58a7b210f2c3b95311b38aa8b7ce59a1415e7775bdd73f35a7e38389d08df5bac881d523c129c2b039df4d46fcd8b17693bed502034a57662c2a1e3f9  kdbusaddons-5.46.0.tar.xz"
diff --git a/aports/kde/kdeclarative/APKBUILD b/aports/kde/kdeclarative/APKBUILD
index cffb6f986a385f630e652054ee1c253748d78761..8183f4ed520e09a3933a3528e726c1de715baa41 100644
--- a/aports/kde/kdeclarative/APKBUILD
+++ b/aports/kde/kdeclarative/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdeclarative
-pkgver=5.45.0
-pkgrel=2
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Provides integration of QML and KDE Frameworks'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -35,4 +35,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="63bcfb2a718b4369c143ef20ea961e593af71350f0a43b7d3ffcd858b94b8212b1c138058a5a602f35902deb3309f8bf1409ae801e9ffdad1453c778bb9ced6d  kdeclarative-5.45.0.tar.xz"
+sha512sums="43db00d3ddb61be339a341e727f8e83001ffec7e9230f1a7ea9c4e80ae97e4b00621d7eb17efb703dae831fe61683995341881b9230b5850d4adc6e184b89e3c  kdeclarative-5.46.0.tar.xz"
diff --git a/aports/kde/kdecoration/APKBUILD b/aports/kde/kdecoration/APKBUILD
index 933f94de1409586cf74707c4f2f5b426bcf3cbb2..9b6dd5deafd61da22832751664f2abf7bd064b36 100644
--- a/aports/kde/kdecoration/APKBUILD
+++ b/aports/kde/kdecoration/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdecoration
-pkgver=5.12.3
+pkgver=5.12.5
 pkgrel=0
 pkgdesc='Plugin based library to create window decorations'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="912e1dafb7a8622a3f32dbf1bad12e154b7b643e01771ca06aef7a0e05f1c0e5b35b7ae121735831a7727a6a0367308f569b38c11469994c7c3edc134806e7c7  kdecoration-5.12.3.tar.xz"
+sha512sums="4e13f61c46f5fc825f9b759ee5406fbbad6eb040b737c7994e5c60d5daf5c035877df9cb84c53ab672dafd035c3e67c5b27b8107d0383bfdaf61f4d9388ccada  kdecoration-5.12.5.tar.xz"
diff --git a/aports/kde/kded/APKBUILD b/aports/kde/kded/APKBUILD
index 237b3c2256a3dd0ff03be7f71e8ccc8c9e3a49d2..9a557b4b12de18125908ce4ac142cef25d071eab 100644
--- a/aports/kde/kded/APKBUILD
+++ b/aports/kde/kded/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kded
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Extensible deamon for providing system level services'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="db15f6024825b09e6ee0f031ce4bfacfa5054bed6e0792c98daa7c1a7ba0eb6ad840a3a3aee6ef6b60e9403fb9529a228d9bca92876701265e0a83cf6146a7d4  kded-5.45.0.tar.xz"
+sha512sums="02c584ef4a0b6a295deafa6d6b92b5d9cf90be6bfbfbbb063c735a59b19fcdbf87b7c10735134426720d8fb5f06dde11a549469c313263037cc7babb128f62b8  kded-5.46.0.tar.xz"
diff --git a/aports/kde/kdelibs4support/APKBUILD b/aports/kde/kdelibs4support/APKBUILD
index 231b0072f3f2e270d16c5d3c46884f3270247629..2524e17314645d7697c7b0c6e3472b28be51f63e 100644
--- a/aports/kde/kdelibs4support/APKBUILD
+++ b/aports/kde/kdelibs4support/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdelibs4support
-pkgver=5.45.0
-pkgrel=1
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Porting aid from KDELibs4'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -42,4 +42,4 @@ package() {
 	rm -f "$pkgdir"/usr/share/kf5/kssl/ca-bundle.crt
 	ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/kf5/kssl/ca-bundle.crt
 }
-sha512sums="94ceeaef10e4808df5077224fb593f98d6b42d2087d90fd163841b67b97a6e14238f9a65ab8609f616122c4217bb8d494cbbc501373602827abdf7271ede0802  kdelibs4support-5.45.0.tar.xz"
+sha512sums="b07f89be77ec878d0e52af5d256339631cd1f125af6c8454a50064c50609346c8fe78ec2cd90047d8d5c4cbbdf2d331c38415e444eb91b6279e65d6a89c9d3d2  kdelibs4support-5.46.0.tar.xz"
diff --git a/aports/kde/kdesignerplugin/APKBUILD b/aports/kde/kdesignerplugin/APKBUILD
index dd1d2d9daac0ebd3fb2f2a79b07a6f415e8ef1ce..ca0394a2bbe7107b13b918a72bc1f23434eed7ef 100644
--- a/aports/kde/kdesignerplugin/APKBUILD
+++ b/aports/kde/kdesignerplugin/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdesignerplugin
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Integration of Frameworks widgets in Qt Designer/Creator'
 arch="all"
@@ -34,4 +34,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ecb9760b176e8f577727f86fe96f0106618783601b4fc0516fd471de0f3dfade5639c190b5dc7d2adc4334ca66d0d6b9f1715eda418564a24bbc4f861bfd1fc4  kdesignerplugin-5.45.0.tar.xz"
+sha512sums="58fb75f68c60604f8ccf6a69d899d7c8b48d5c01969149170e0627c8393d4db2377de8d0d0bbf35fd234e11ac86e4b649d917c2635848c071592326935a1ef36  kdesignerplugin-5.46.0.tar.xz"
diff --git a/aports/kde/kdesu/APKBUILD b/aports/kde/kdesu/APKBUILD
index 541e05a103cc44133c5797ecf311cfdd13d50d70..6017236545f4882daf4e0285560e65f27414f2ec 100644
--- a/aports/kde/kdesu/APKBUILD
+++ b/aports/kde/kdesu/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdesu
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Integration with su for elevated privileges'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="95f393d45b3bbf47316978221a536991255711cb792504000a8e84659162afa2f22ab702be0d19df5de8669570d544f8ae36aacbdd3c4d2f9e5baf25204ff8f2  kdesu-5.45.0.tar.xz"
+sha512sums="cf6c1dd50179e1285f2e37663e1e7c365bd171075dc3e249ba74d4109f669de19266af981be317ecdcff5ad4b28548d5f00e524f85960ad2f02e2bee302028b4  kdesu-5.46.0.tar.xz"
diff --git a/aports/kde/kdoctools/APKBUILD b/aports/kde/kdoctools/APKBUILD
index 26b6789cd3357176575d70b39d353572f12afecc..5fa2fb1bfe2e4d923b21cd76b984e90f75faf4ea 100644
--- a/aports/kde/kdoctools/APKBUILD
+++ b/aports/kde/kdoctools/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdoctools
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Documentation generation from docbook'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="b923003e130c6bb0b0590e38bdca73a87fec1555c813f87f716071836daade383670572f7ab98675ddad88cec87d14d0c842a29e477b8f22bc52e5ee41a19803  kdoctools-5.45.0.tar.xz"
+sha512sums="bbba5359bf2ad3c8e321c8142608dec57c577ee7f7418a600f7e15cac853f50b857a846dd1676a349d9b544ff60ab6162bd21819b4be34468a8e3d119a7c32d8  kdoctools-5.46.0.tar.xz"
diff --git a/aports/kde/kemoticons/APKBUILD b/aports/kde/kemoticons/APKBUILD
index 9c34a5272c3856098e22ff8ab0445a686c03126e..1b0f8c73e8d8bdb7b106f08a2c03a8b93ebddbf4 100644
--- a/aports/kde/kemoticons/APKBUILD
+++ b/aports/kde/kemoticons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kemoticons
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Support for emoticons and emoticons themes'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="90b838b2285e9dcfcadf9d9fff85a6b290bb05aeaafb6a4a522bf576ce904daa3cb38639d2f1ee629f07645fbfe719f0e0ba849aec9ee653c232370551207982  kemoticons-5.45.0.tar.xz"
+sha512sums="3ba95305efec79d71d06c363d75b42ea1833c3154dc5fadf37ed597af6bc07cbb15339675c385010d87316c08d43f8b632f66a0757d1b1aa24be85e4d429bc47  kemoticons-5.46.0.tar.xz"
diff --git a/aports/kde/kfilemetadata/APKBUILD b/aports/kde/kfilemetadata/APKBUILD
index 48d09a18a3d3b6ed67025b27cf2cee60827f12c7..3cdc2ff911744b62919f306f33130de871ba864a 100644
--- a/aports/kde/kfilemetadata/APKBUILD
+++ b/aports/kde/kfilemetadata/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kfilemetadata
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc="A library for extracting file metadata"
 arch="all"
@@ -35,4 +35,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="c3453c9a6ee629edf48d9cfb90ca00eeba38b332dc637a52c452d7324495459f62f73e0a02dd28d95f4d4e4dbf0e25d0f07bbfe439da6deee243e352c0d87284  kfilemetadata-5.45.0.tar.xz"
+sha512sums="c95bf901218ddd8eead9c5581d468884720e4c32a4e5320b24dd0fac4c898c477475a578ebe803e17213df3f0a4f07ed6501a653584547f86a441de793ef6a4e  kfilemetadata-5.46.0.tar.xz"
diff --git a/aports/kde/kglobalaccel/APKBUILD b/aports/kde/kglobalaccel/APKBUILD
index 098db509916298bdcec5f5d4c28359c9730acf68..9fcb8f525518df696801c187fd9b241d57e34aea 100644
--- a/aports/kde/kglobalaccel/APKBUILD
+++ b/aports/kde/kglobalaccel/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kglobalaccel
-pkgver=5.45.0
-pkgrel=1
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Add support for global workspace shortcuts'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="cbaf4a274d96da87081a11da7bc6d19b61b4d02c7c8584631c5518f3a388e25ea1226ff67eade13d88719f07189bff257a916373d974d1fe9176520c3caa3ae1  kglobalaccel-5.45.0.tar.xz"
+sha512sums="f35a150016d66539ea9b7d7d12fd6b7e64886ad4c6ed2372eadb045cf572209736f66f8c6372bdb9a4d7e422e365646bec8b850e4e74e93144fc947d0f0d1389  kglobalaccel-5.46.0.tar.xz"
diff --git a/aports/kde/kguiaddons/APKBUILD b/aports/kde/kguiaddons/APKBUILD
index d041c3c541f224ca93fa4e4dda8e75176dacf594..9add3a8aca7b278975510fadac84ffb43f2bda2e 100644
--- a/aports/kde/kguiaddons/APKBUILD
+++ b/aports/kde/kguiaddons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kguiaddons
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Addons to QtGui'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="117a8c8f1c2e551fe91a9db2e9db3ebeec9ca18256f1614c220d0f4b691edc574638bcaab1f15001bd04dcd60c3d0537525e7e81ae7a4087cf406229d6de8684  kguiaddons-5.45.0.tar.xz"
+sha512sums="58526523c26d2e2ef6c315cd4c805b3f5826664e3199d4d124ec19223a5a7d24c49febec073675ee00044bdc20c35eda986eb0df9a386f3c8673e956f060741f  kguiaddons-5.46.0.tar.xz"
diff --git a/aports/kde/khtml/APKBUILD b/aports/kde/khtml/APKBUILD
index b9051323a0c80cac26243b53153488ec34b8633e..1af4f4f723af31b87959555df0117ca860578186 100644
--- a/aports/kde/khtml/APKBUILD
+++ b/aports/kde/khtml/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=khtml
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=1
 pkgdesc='KHTML APIs'
 arch="all"
@@ -35,4 +35,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="a1763317e12dee629d54e900e63f13c18936e7d5374112c8a000910654103cdb1bfd46cf3254c0d30f0a067ec0524753bffa8142dc7c99ee33a45a5da0a0d603  khtml-5.45.0.tar.xz"
+sha512sums="c4daad56f9ec40f9ffb902e507e311f912744019a434588beb11bc197a3683845565ce6de6324030d169141ed0f09b96bc3e77001d8942f40a5ffa20809de886  khtml-5.46.0.tar.xz"
diff --git a/aports/kde/ki18n/APKBUILD b/aports/kde/ki18n/APKBUILD
index a457dffddd8aec25abc66e743f1400e8716a1d9e..3a5fa2bfe4165bb7deb6b5d795425c719e79319e 100644
--- a/aports/kde/ki18n/APKBUILD
+++ b/aports/kde/ki18n/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ki18n
-pkgver=5.45.0
-pkgrel=3
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Advanced internationalization framework'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -10,8 +10,7 @@ license="LGPL-2.1"
 depends=""
 depends_dev="qt5-qtdeclarative-dev qt5-qtscript-dev"
 makedepends="$depends_dev extra-cmake-modules doxygen qt5-qttools-dev"
-source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-	fix-plasma-workspace-build-hanging.patch"
+source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 options="!check"
 
@@ -34,5 +33,5 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="3fde0c71d7ea65064c7a926c02b55ebe082cde673e581acbb24e7f614324de401e8d48ddbca0b15a59de3a8de9be867528124a328465e099b7bf07717fbeaa71  ki18n-5.45.0.tar.xz
-29f6d8e62b7dac371cb2fe87f865304f14e38c330a46e61cabfbd1e7477f1d21c0fc0afadd6bc0892bbc798087fdf7b04239f2f3d9d1fc4508bc05424cdb714b  fix-plasma-workspace-build-hanging.patch"
+
+sha512sums="d4edabf5708311244ecc02541a0c6f9e90d118a4f0e784cf67d4be906fe890eb56225430ea78926e00da3c2fbf483fd0195f4929e579f1b9e21053696c2bcc17  ki18n-5.46.0.tar.xz"
diff --git a/aports/kde/ki18n/fix-plasma-workspace-build-hanging.patch b/aports/kde/ki18n/fix-plasma-workspace-build-hanging.patch
deleted file mode 100644
index 780249c86f7897e06ff02a6a9621c823062c5ba8..0000000000000000000000000000000000000000
--- a/aports/kde/ki18n/fix-plasma-workspace-build-hanging.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9c32bdab29b345976eee3b9c1c4bebd76cdcdde2 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Sun, 15 Apr 2018 01:39:58 +0200
-Subject: Don't need to run previous iterations commands again
-
-Summary: BUG: 393141
-
-Test Plan:
-Tested building plasma-workspace, it was clearly faster (although it
-would have finished eventually)
-
-Reviewers: #frameworks, arojas, sitter
-
-Reviewed By: sitter
-
-Subscribers: sitter, heikobecker
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D12216
----
- cmake/build-pofiles.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/build-pofiles.cmake b/cmake/build-pofiles.cmake
-index d0991ad..b39be31 100644
---- a/cmake/build-pofiles.cmake
-+++ b/cmake/build-pofiles.cmake
-@@ -62,6 +62,7 @@ foreach(pofile IN LISTS pofiles)
-     if(i EQUAL ${numberOfProcesses})
-         _processCommands()
-         set(i 0)
-+        set(commands)
-     endif()
- endforeach()
- 
diff --git a/aports/kde/kiconthemes/APKBUILD b/aports/kde/kiconthemes/APKBUILD
index c2871c3874451e99a8f0979d0bbbc030c200c5e5..99d51f77c0dd00b1abab935a09fe9ad753eddb0e 100644
--- a/aports/kde/kiconthemes/APKBUILD
+++ b/aports/kde/kiconthemes/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kiconthemes
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Support for icon themes'
 arch="all"
@@ -35,4 +35,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="e3af299c5e56fadbd8f8a62b23b9dbf0499202e0a40ce92885724a9636d72201fa31f98dbc2b429ab6d4a7aed0e1d40e712ff4dbe8d86ae94e5027856d3fc12e  kiconthemes-5.45.0.tar.xz"
+sha512sums="528d525f090cc2b83029bf68b2290a6b33ca9d69a0d74f234b775fcd23fb0558e34b3e270ab676d4acf24a4b0641d4e24b1f32bf9aaac4f70e2182387a4c2415  kiconthemes-5.46.0.tar.xz"
diff --git a/aports/kde/kidletime/APKBUILD b/aports/kde/kidletime/APKBUILD
index d152d1c0a422076f63a40d7cc8f9d1dc81a2464e..398bba941b2f15642593f5c3f7201acd6db93df2 100644
--- a/aports/kde/kidletime/APKBUILD
+++ b/aports/kde/kidletime/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kidletime
-pkgver=5.45.0
-pkgrel=1
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Monitoring user activity'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -31,4 +31,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="7da3183f24d41d1b6092c3e0b0a8aa3ffd242eaf26e28a61af156a3a4a8d669b0421dd0dc44f901dfc0b237469d5af318c3d869979d082555a31b2a118639fb2  kidletime-5.45.0.tar.xz"
+sha512sums="43994cf09ce659d7f5e2b0d77b4b97631e7c7e87a8ded21a626a5e16ba9c3101fd1c9ab120756fea170f7024e5fa5141e583e51f032f4def4674c209fc6b759f  kidletime-5.46.0.tar.xz"
diff --git a/aports/kde/kimageformats/APKBUILD b/aports/kde/kimageformats/APKBUILD
index 946d22017d424c6d5924fa58b277cfd0dcb50c32..3f2f0f94c3342d6c4ffbb7d7e79a039298c5fb06 100644
--- a/aports/kde/kimageformats/APKBUILD
+++ b/aports/kde/kimageformats/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kimageformats
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=2
 pkgdesc='Image format plugins for Qt5'
 arch="all"
@@ -30,4 +30,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="853a765d37c650834b22725264f7cfcb32bb6a45aac6131dd520c3e68371930557300a291adf31ecdd853a07009d31ac6700e810abaf41f1d3ac63ab8b999599  kimageformats-5.45.0.tar.xz"
+sha512sums="89d4463ec202aeb6fbcd36d62db54461e76f1492cc0410ea5f41163c9ddc5b33204ed06ab730a755b92c53d08ef2964d1bbf510a2231bb478e33b6671f61499e  kimageformats-5.46.0.tar.xz"
diff --git a/aports/kde/kinit/APKBUILD b/aports/kde/kinit/APKBUILD
index bf79ac4bce88709dee19fd1d591e4dc546d3e828..7da57382a6ffe913c2eaf2d89d18542683628481 100644
--- a/aports/kde/kinit/APKBUILD
+++ b/aports/kde/kinit/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kinit
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Process launcher to speed up launching KDE applications'
 arch="all"
@@ -36,4 +36,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="a93813957f9f1bbc1e3e25b551aa6cb93cd42e3d78288c1f21d56d124601e97d92afc9cb3d59444f05c6c70183e2fb6534bf39fa7bc960ac4c86aa559accdab3  kinit-5.45.0.tar.xz"
+sha512sums="49fae94921ef7492714201951eb18c37a01d53bd4e22a7ce265118f1a1f62fbd6a0768f5f9568e12e67f8d69198969843e93fc79fe406ab35eb91cf45a169832  kinit-5.46.0.tar.xz"
diff --git a/aports/kde/kio/APKBUILD b/aports/kde/kio/APKBUILD
index f3d17141773e255987facdeb4b5160c6df073e26..cbe1bd511363da9cef3978f69fb8d481c3c05395 100644
--- a/aports/kde/kio/APKBUILD
+++ b/aports/kde/kio/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kio
-pkgver=5.45.0
-pkgrel=1
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Resource and network access abstraction'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -36,4 +36,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="1c7fb03f210cf14bd849905582f081f88ac07ec0f290476b5c1edbbaf83e5e012e41f6b6b7f81e356073233911dd4b8988e03f27fa040f8183df1e5a4724eb2b  kio-5.45.0.tar.xz"
+sha512sums="64ea3c5cd27990a03f693eb6add5a9d148f16ef5c4b4e4e7118fe841258f2b8d4062697a9922cfabb3ac84d015e1fcc4e342bcce91fc80e55027cc7f8d8c78d9  kio-5.46.0.tar.xz"
diff --git a/aports/kde/kirigami2/APKBUILD b/aports/kde/kirigami2/APKBUILD
index 9dce4ebb5a02fed458d3edf29f3926e45188b574..26af00904bc0681be26fc31eb8bd065240a5b283 100644
--- a/aports/kde/kirigami2/APKBUILD
+++ b/aports/kde/kirigami2/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kirigami2
-pkgver=5.45.0
-pkgrel=1
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='A QtQuick based components set'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -39,4 +39,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="8518642a5bed89fbd53e8994bbaf3fa1ff46ad10c456d64e2bab86d279255516fbff4c14fc245b756a7c0f426c09835b357fec8aff564f64a8d047ca0605d725  kirigami2-5.45.0.tar.xz"
+sha512sums="06adddbe7db2c734707ba2d121b3fd9f5fb36a9fe38c9af926d051efb52158f7b970eebc06b1f23c8ff7af936a8f8c210b1beb5e384207a29915e872d4a2de8b  kirigami2-5.46.0.tar.xz"
diff --git a/aports/kde/kitemmodels/APKBUILD b/aports/kde/kitemmodels/APKBUILD
index 3efe45073bed81c29602ced4eaefeb217c0bc99c..7502195e2166f07b2965ba93976dbd852162f424 100644
--- a/aports/kde/kitemmodels/APKBUILD
+++ b/aports/kde/kitemmodels/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kitemmodels
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Models for Qt Model/View system'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="232ff2b2d0ce426677c185c30269055ea92e808e578e9655688cd4e431be408d0e709f010a845408a451993bcc038e42e0346aa62f72e13f3037c19496cecb74  kitemmodels-5.45.0.tar.xz"
+sha512sums="c6cd3b2a6289bae1599a05ce6fbc478903df1eac28dbac7424f25eb2cbec73d470a3384728279cdb83d0767e5a71122d1a897bdffd21037e67bc17cf368bd38e  kitemmodels-5.46.0.tar.xz"
diff --git a/aports/kde/kitemviews/APKBUILD b/aports/kde/kitemviews/APKBUILD
index 1291ada1811a01f4a95c380fdda2cd1db0e0d599..f29bd6aa3bf7d49e5c6800c09220cbb92dcc3fe9 100644
--- a/aports/kde/kitemviews/APKBUILD
+++ b/aports/kde/kitemviews/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kitemviews
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Widget addons for Qt Model/View'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="c57e440eddafae61440e7428624dd9931af3c0cd1c0dbb7d772b45b4168c78708569dc63706c41da9cac16d7c5edb0ad391dc6c0bc3d2d5de7e17c41b289d6ee  kitemviews-5.45.0.tar.xz"
+sha512sums="628a3e1c7b5c854a91fd23dc14130d5b430d79af0015181b74f104278c348b55a43622566a28d1bf83345de56c0684a06877211c3956281abec2254b42d03a92  kitemviews-5.46.0.tar.xz"
diff --git a/aports/kde/kjobwidgets/APKBUILD b/aports/kde/kjobwidgets/APKBUILD
index 02625dcef6d79ee56c85db5befac73063cfbbe96..c7aacbae6f41fa22f77f5a89e87548a004f64da9 100644
--- a/aports/kde/kjobwidgets/APKBUILD
+++ b/aports/kde/kjobwidgets/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kjobwidgets
-pkgver=5.45.0
-pkgrel=1
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Widgets for tracking KJob instances'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -31,4 +31,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="f3baa7db2ccff3c75f07cc73249852beb44925f2045d086302170ca321e49f2b08d88416a4abb28499295e95e75d6dfaf9eeb5bd25239eb0e7a488223100d6f3  kjobwidgets-5.45.0.tar.xz"
+sha512sums="3c9b7812e11daef2857cdd6d32d5db743f1c661261cbc1e5b7b14745c47931f5853a05cf0548df8b154dd07404fe69df40c60af92f9e699fd37ffc62fa5a9daa  kjobwidgets-5.46.0.tar.xz"
diff --git a/aports/kde/kjs/APKBUILD b/aports/kde/kjs/APKBUILD
index 92b590d22c93dacaf9e4746af299bdb03e71be0a..638a8ae0a3b967a4531f18e593adbd6f5f03b36f 100644
--- a/aports/kde/kjs/APKBUILD
+++ b/aports/kde/kjs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kjs
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Support for JS scripting in applications'
 arch="all"
@@ -30,4 +30,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="fdb209cf83dc089ef724d1643917156c6f513be9fb7f2813a5febc9ee06274e28ed9f2d028102b9af8f1151fc80d5d54d7e269e8cf95f8db67acbefa969679c9  kjs-5.45.0.tar.xz"
+sha512sums="d0b322d7195a67d8b04be47c5ac0354689f44b884cc0eb3df5c32f4ce9dae34bf47fb5681d8444de41de86716bc8b89a98ceb6d4a51438209b6e3e0550c6f78b  kjs-5.46.0.tar.xz"
diff --git a/aports/kde/kjsembed/APKBUILD b/aports/kde/kjsembed/APKBUILD
index dd1b70aace6c961b46ae33476560b52234606cc5..09ef50da519ce3593b0544792781885957ce9846 100644
--- a/aports/kde/kjsembed/APKBUILD
+++ b/aports/kde/kjsembed/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kjsembed
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Embedded JS'
 arch="all"
@@ -30,4 +30,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="60b01e1db24a501a5f79e7d56562c8de72f0bcecbf4d224fb9c32e31ee6a07c372fa20dfc9d330c63b9d5f73df00fb4b2c4ebcf7abb3961560c36c7164b4a0e2  kjsembed-5.45.0.tar.xz"
+sha512sums="f3667dda4d02082c4f4aa4ea47332699eb86a02b35da2599ab9b68f8aea5b9d8ab4262979103f7954dcf5fc76f847b3155d3fc18ea6df2cfd124ef833a554024  kjsembed-5.46.0.tar.xz"
diff --git a/aports/kde/knewstuff/APKBUILD b/aports/kde/knewstuff/APKBUILD
index 71e4f0ef08a392a9221ee91f30f7ce26ecb41c27..5d6b512dca8ce3955348a3aeefeca76093a0610f 100644
--- a/aports/kde/knewstuff/APKBUILD
+++ b/aports/kde/knewstuff/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=knewstuff
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Support for downloading application assets from the network'
 arch="all"
@@ -35,4 +35,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="00e9292c25514f3abaf3db2cb65b7a26e83809ab209dd59cef3c93f1be31d1c6090d1e0433035bcafa3103bd3a797d677dc5e3b00562479328be6d4155354b88  knewstuff-5.45.0.tar.xz"
+sha512sums="fd18011f28e9dabf66e02504c6756e79c16f47a5e840a3f75419a0d6c4610c3a9723a803d55c3b77a159be28d61d2c45d8673683c77c5053c330307b4a4a78d1  knewstuff-5.46.0.tar.xz"
diff --git a/aports/kde/knotifications/APKBUILD b/aports/kde/knotifications/APKBUILD
index ecd6e9a8c7c5f9f8e58dd93b5d812e187467562f..c54698446161b0b688c434b10fa6094e0f0ea7cd 100644
--- a/aports/kde/knotifications/APKBUILD
+++ b/aports/kde/knotifications/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=knotifications
-pkgver=5.45.0
-pkgrel=1
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Abstraction for system notifications'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="3c5fdce34398c5d9950fbb5ff161120272df3d207480872f4bb35a56164e894d6513406eaf5ca2c4e80cee07323f53c4a285e143db1f0be68ba5af8005544fe5  knotifications-5.45.0.tar.xz"
+sha512sums="d8caf9929e8dfd6889bd48721fdb8784737f4e4037e80885a817e89f63c0d165df137a2a5d44de399a586e754f70a19e235f1d58fdaa568c586f242e6755f2ec  knotifications-5.46.0.tar.xz"
diff --git a/aports/kde/knotifyconfig/APKBUILD b/aports/kde/knotifyconfig/APKBUILD
index 8bcefe17c98bcdf6452f27a4589cf542e150e55c..5628989e0040e043db627a76228dfbc697eeb48b 100644
--- a/aports/kde/knotifyconfig/APKBUILD
+++ b/aports/kde/knotifyconfig/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=knotifyconfig
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Configuration system for KNotify'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="f925876a1c94871f5efef3248d11fbb9420f240e851dc3ececccffaedcd0b42aa639b71373f188610054ee48ceb4191776c09f4140eda2c641b52cd359fa6bf9  knotifyconfig-5.45.0.tar.xz"
+sha512sums="c5909c3b252416d7d0df52b5d3db2715c899330cb74c6ae63d75bf47103c5f683cff5f86fa6133f9386c7abc3ea56d051b3372355c491b690ad2cfc3238d2093  knotifyconfig-5.46.0.tar.xz"
diff --git a/aports/kde/konsole/APKBUILD b/aports/kde/konsole/APKBUILD
index 189dff9da97217e3adc281000e20f2c0e964c582..88c55d54d4d4b447209a9b9ace8a2c1fe9794da8 100644
--- a/aports/kde/konsole/APKBUILD
+++ b/aports/kde/konsole/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=konsole
-pkgver=17.08.2
+pkgver=18.04.1
 pkgrel=1
 arch="all"
 url='https://kde.org/applications/system/konsole/'
@@ -12,7 +12,7 @@ makedepends="extra-cmake-modules qt5-qtbase-dev kdoctools-dev kcompletion-dev kc
 			kconfigwidgets-dev kcoreaddons-dev kcrash-dev kguiaddons-dev kdbusaddons-dev
 			ki18n-dev kiconthemes-dev kinit-dev kio-dev knotifications-dev knotifyconfig-dev
 			kparts-dev kpty-dev kservice-dev ktextwidgets-dev kwidgetsaddons-dev kwindowsystem-dev
-			kxmlgui-dev kdbusaddons-dev sonnet-dev"
+			kxmlgui-dev kdbusaddons-dev sonnet-dev knewstuff-dev"
 source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # Fails due to requiring running X11
@@ -35,4 +35,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="39e87e3aa31775b2999d05d719ffb506ff69adc958cb14a29fbe7edf056af179568b73ddb81fbc9bc75eabad50bb5c2fe2b7c025f3bf69f34b83607b7b5c6fe5  konsole-17.08.2.tar.xz"
+sha512sums="cc73eefe0c7fe4e9ef91f4085ae19f658a5ce31e0617f2cb06c7faee57feae33fee6071aed63b6a599d8d0cad6fa9877908d64eda8573edf406205bdf70f2570  konsole-18.04.1.tar.xz"
diff --git a/aports/kde/kpackage/APKBUILD b/aports/kde/kpackage/APKBUILD
index 82f83e9eca258e8123a2741ace6fe20521aa443c..0b300e31f02fcf2fd787df44790d1a4d785432f9 100644
--- a/aports/kde/kpackage/APKBUILD
+++ b/aports/kde/kpackage/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kpackage
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Framework that lets applications manage user installable packages of non-binary assets'
 arch="all"
@@ -34,4 +34,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="c83f159cd2dfe3d5dacc62d8fd7e1be97a3e8168dbf1b6af8ca8d6a47b54d4f8455117a5e929e0b59e72a7a4118211c9b2e8f0bad04935c2b76b25c7a74ee5a2  kpackage-5.45.0.tar.xz"
+sha512sums="ab02c36c951c1c961263689df84fd8d6e00ef1774e42457ebbbb759b9b4d87384663383208078d1856de52cd7a1bc007e02d8c970260359cb2b12605114fea77  kpackage-5.46.0.tar.xz"
diff --git a/aports/kde/kparts/APKBUILD b/aports/kde/kparts/APKBUILD
index b3b2cb418cebeec4dce1cc8a77e2c673a646ca6a..fc8cceb97638f9bdb7071d447aedbeb9becf1504 100644
--- a/aports/kde/kparts/APKBUILD
+++ b/aports/kde/kparts/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kparts
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Document centric plugin system'
 arch="all"
@@ -34,4 +34,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="0237ecea1a02e80d1b42c09354c5b12416748f453dee9ba77f0d1103c1e15d3ed833f0066e02e1170c0886b15cb583bf9ac419375f0deb1e9de963c3daeb8c26  kparts-5.45.0.tar.xz"
+sha512sums="a745c1222106af767fbc577dd876a50b47fb1053682f56a58a56279e66fcb7e4b2f3aaaccf1d77f7bd8aad0fb8c1c87dfb7ca53ef63bd5c719eb97811a015f6c  kparts-5.46.0.tar.xz"
diff --git a/aports/kde/kpeople/APKBUILD b/aports/kde/kpeople/APKBUILD
index 120465e8f003f8a932645a91b548953417bb49e4..9064a43752a3c9583bc15ac8c6068b5457dcc314 100644
--- a/aports/kde/kpeople/APKBUILD
+++ b/aports/kde/kpeople/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kpeople
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='A library that provides access to all contacts and the people who hold them'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="e0f0b45b41821e8561738eb2ce08ffecdf662affe3cb838bdd278b555031f78506ed1138203768a4effdc464814a70f078b440b656984375a8688fd8d819847f  kpeople-5.45.0.tar.xz"
+sha512sums="6fc4d57b3b339401b59c859a29d0e6e0fa8393281a0aae3362efeb30b497f9f7b29e4bc96900f253a6a9cd0888d2f4aa4ad17c848e35afde3948ad393cf48aa0  kpeople-5.46.0.tar.xz"
diff --git a/aports/kde/kplotting/APKBUILD b/aports/kde/kplotting/APKBUILD
index 7695379fccb154e5cc10d1e796b292ed070b073d..793459a480a6562be629c4833bfe3315fda9511b 100644
--- a/aports/kde/kplotting/APKBUILD
+++ b/aports/kde/kplotting/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kplotting
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Lightweight plotting framework'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="54e8149484b2bbdae6bb0d55ddb9837e9049015075c47645eac86408ec1268dde6433e1120d79704e9578781cca712bc188a0a8cf9907ef622136e20f7b50619  kplotting-5.45.0.tar.xz"
+sha512sums="8bfbeec22804d13d074612562a2ceaaab7f18504be1b0627153137fd2d8a5eeca696b07df243704c654af7f78dc8c33a5be27fa06f278d29650246314aa1aa18  kplotting-5.46.0.tar.xz"
diff --git a/aports/kde/kpty/APKBUILD b/aports/kde/kpty/APKBUILD
index b9f2aa03b9d443f5786394717a7cac8be89ba24d..181b79bf2be404f18f003382fed0f7088f121636 100644
--- a/aports/kde/kpty/APKBUILD
+++ b/aports/kde/kpty/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kpty
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Pty abstraction'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="7dedc9eedca4feefd01fdcbe1794aa8d136aed0966a4140413c51416e3b25da14d983671d95ceea8040c6f86774c5361905f1cd9c3673577199d3ceb8cd5009d  kpty-5.45.0.tar.xz"
+sha512sums="7e7aa6ac36feeb77a9b0c4423028c9a209949ddaace14fdab3bef0374a59b231ae9a0b9cb47a9aa74abfff921b0c3a6584f010ef84edbb18fa28450a1f1b0efe  kpty-5.46.0.tar.xz"
diff --git a/aports/kde/krunner/APKBUILD b/aports/kde/krunner/APKBUILD
index 02e179046d0926e8b610217c9d217bb34a5d37d8..d37594635ff4c32de2576c019c032f9e9a5b92a5 100644
--- a/aports/kde/krunner/APKBUILD
+++ b/aports/kde/krunner/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=krunner
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Framework for providing different actions given a string query'
 arch="all"
@@ -35,4 +35,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="e7c7dd4d2e6e68becfcee50c0ca6e371f67381cfde5d3dc68513ffe4711d3da8a2598c0dd14300194be26b1c1cdfe3eba440fda62cae17e7e592eea88cc3fc55  krunner-5.45.0.tar.xz"
+sha512sums="57a461fe3dc035fac5efa7f8ece11c4e9aa374b0838617883f51373f36f1c79910c228c07b8d0e88fea2bbbc147779ceeddddc7c9c00619cf78c5bcd5860abf0  krunner-5.46.0.tar.xz"
diff --git a/aports/kde/kscreen/APKBUILD b/aports/kde/kscreen/APKBUILD
index 32fffaa44f0221c2d90beba07e9b07a8e3014afe..b59cdb1a3b426256708c02663577d57f598aa932 100644
--- a/aports/kde/kscreen/APKBUILD
+++ b/aports/kde/kscreen/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kscreen
-pkgver=5.12.3
-pkgrel=1
+pkgver=5.12.5
+pkgrel=0
 pkgdesc="KDE's screen management software"
 arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -34,4 +34,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b3119eb3264ba357c8efd879e92ec0f5fe2dc785228a088434d8f8e9afe72d36edae79bf7cc944657b6fdbe43389df44edcc74704b65f393cf40a68db5c7ff1a  kscreen-5.12.3.tar.xz"
+sha512sums="d2f7bd25c93409e6198a1a3f65c3a85ae22e1031daf3115814e5f4f5252e1f6c6e0c7d94e3208840598a4ef2ec7bec31f8728f96eb735a887b00ce5e34c4466e  kscreen-5.12.5.tar.xz"
diff --git a/aports/kde/kscreenlocker/APKBUILD b/aports/kde/kscreenlocker/APKBUILD
index b01606cd3fab3c7c4e6714597ab6ff4bee6c4487..90985258a8b7aa531c0093c2517f132eeca48a38 100644
--- a/aports/kde/kscreenlocker/APKBUILD
+++ b/aports/kde/kscreenlocker/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kscreenlocker
-pkgver=5.12.3
-pkgrel=1
+pkgver=5.12.5
+pkgrel=0
 pkgdesc='Library and components for secure lock screen architecture'
 arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -43,6 +43,6 @@ package() {
 	install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np
 }
 
-sha512sums="f93e5a30dbde7bf7662ac57af4293f5b7117d4f63a85dc079607faf06e7e88f938936a0b0e3b5ac55877f9af1a06bbb666ee47397db2e2f7e55edeb70e5a3feb  kscreenlocker-5.12.3.tar.xz
+sha512sums="c07cae22cc4500aeb4d38388d2033a677171659a76d81ff55155a97aca439babcb912f47586697657c7944c80b0d250770ed3a080fad0ed9463058dc879f390a  kscreenlocker-5.12.5.tar.xz
 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3  kde.pam
 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd  kde-np.pam"
diff --git a/aports/kde/kservice/APKBUILD b/aports/kde/kservice/APKBUILD
index f7a65110a0516153964e9d50824e8500068b78d2..5bbd8a859c5ac983a2d904f99bef24339b08abcc 100644
--- a/aports/kde/kservice/APKBUILD
+++ b/aports/kde/kservice/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kservice
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Advanced plugin and service introspection'
 arch="all"
@@ -34,4 +34,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="2b626128ab6ac6c19e1e47e335c314bfa058b5769eef193724ee3ffb0077b5065facdfb3fa12766dd8ebe0482f4a40213227378cad4c03a1cd4d2230cad2e4e7  kservice-5.45.0.tar.xz"
+sha512sums="2f2b7ef09869b1fac47c52810ec8a70856a94909ac40649239a6d1291ab09cc8e7944d5cfef653215f245ac19fecdb4f6663f46b43acc97b607d4855b6aa063b  kservice-5.46.0.tar.xz"
diff --git a/aports/kde/ksysguard/APKBUILD b/aports/kde/ksysguard/APKBUILD
index e06efaddd24eab343f1aac694ccc770e62134322..1cc8bc5768fb308448a4fe02adc1c17f85aa9fbb 100644
--- a/aports/kde/ksysguard/APKBUILD
+++ b/aports/kde/ksysguard/APKBUILD
@@ -1,5 +1,7 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ksysguard
-pkgver=5.12.3
+pkgver=5.12.5
 pkgrel=0
 pkgdesc='Track and control the processes running in your system'
 arch="all"
@@ -33,4 +35,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="2d727136554242eca2428198f4b08b6ce6d062a4278a053502489303be6950a5efdf2f6852cb56105cd1d1dcb9ea1401c028c0654b2dda9eb898ba7cd8ed5f4e  ksysguard-5.12.3.tar.xz"
+sha512sums="02f5b64a39e395869479ab93ef683136b7017dfb51e55dc03206641bd46052e656547244fc2b6cd86902d5a4f08a5a8fd7d1d5ba0fed73c765a2cfbc39f4bd32  ksysguard-5.12.5.tar.xz"
diff --git a/aports/kde/ktexteditor/APKBUILD b/aports/kde/ktexteditor/APKBUILD
index 77f74a53908e8bbaf97becbe07b434bec758e9fb..94df8ee5afbdd2c7043a1e1de94922590840959d 100644
--- a/aports/kde/ktexteditor/APKBUILD
+++ b/aports/kde/ktexteditor/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ktexteditor
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Advanced embeddable text editor'
 arch="all"
@@ -36,4 +36,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="80d6287848f6bd6fa6460a6c3b87031fa204f52220af06bdfb51a8f315ac1828c1103a1e8a713e02272306a982ea3198e3ae248bb7f4ee50e40af13b2c58cee7  ktexteditor-5.45.0.tar.xz"
+sha512sums="b0197a82e9489c4093594c68a6c21dc9e204ec78cd17e5a0117d84e501710d90ad06214ed217332279f3b67ae84119d09d6eb19e33b37b7bde2ebb8a07b6a543  ktexteditor-5.46.0.tar.xz"
diff --git a/aports/kde/ktextwidgets/APKBUILD b/aports/kde/ktextwidgets/APKBUILD
index 117bf2884c21b33b42dbbc439eb0cd8b5ddf802e..3c2627baf867132ba315324b9936b622173d32be 100644
--- a/aports/kde/ktextwidgets/APKBUILD
+++ b/aports/kde/ktextwidgets/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ktextwidgets
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Advanced text editing widgets'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="53520b5c7a830e4e9393855a1c6134858cc5ae707d1e0814db6d7bcf1b579fffcd681071b57c9a4b1f656df907fe4fb2820901ae5dfccbcc9e12c5dc40fea0c0  ktextwidgets-5.45.0.tar.xz"
+sha512sums="1481e3ebaea1dd8c9917488fea52a26f033933b9a173be95243de9827a253086b9f40948f9879c1eec7366df8d74137c1549fd238bc63abbcc603fa8d3154d6c  ktextwidgets-5.46.0.tar.xz"
diff --git a/aports/kde/kunitconversion/APKBUILD b/aports/kde/kunitconversion/APKBUILD
index d0c31bb817299d401aa1215e2190e11a979a8c12..906b7050c81007b981b54ed0bbb50bc40ebfa321 100644
--- a/aports/kde/kunitconversion/APKBUILD
+++ b/aports/kde/kunitconversion/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kunitconversion
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Support for unit conversion'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="f0ef375aef134e450678edea196a49c8161562f2a3e5e045010c9af086c38f780846666f67a55ce9544975bd6c251c6640fd5af54e3a739ff395d36721df9e81  kunitconversion-5.45.0.tar.xz"
+sha512sums="eaad17632a19efb3776ecc81843f5d3a437fdbfeb6bdfef12bffa7fcb3c8b2f1dec8b192c29dfafa1d0de17f6ae9aee9350290eee417d915e180f89ff17d5cfa  kunitconversion-5.46.0.tar.xz"
diff --git a/aports/kde/kwallet/APKBUILD b/aports/kde/kwallet/APKBUILD
index 8d0ec34b5e7780367f2a635cd33c3914cb41a635..d3795790b1ebad8139303d43edca9f491684d1bf 100644
--- a/aports/kde/kwallet/APKBUILD
+++ b/aports/kde/kwallet/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwallet
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Secure and unified container for user passwords'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="6d612895676550fd278b0dc376b377fd38d2d3f4d8e4e529ea3224bf7f83633a2b62d86e0a338a347f7f163f97d76813ef54ad3bf2daa86c4560eba3fbaa5119  kwallet-5.45.0.tar.xz"
+sha512sums="244c386d5739752fdc27a3ef9b5a5a90a529ab842e7337b8ef9c539781f230bfd0dac487cda370a75bd9a6c0eda52549c9dda0fd6a27b1d243b373b05cd57d46  kwallet-5.46.0.tar.xz"
diff --git a/aports/kde/kwayland-integration/APKBUILD b/aports/kde/kwayland-integration/APKBUILD
index ce8139e532e6d02bd3b436ab973737ee59e37d82..14161615f3a1706a4e099039b46bccf3bdb0ec38 100644
--- a/aports/kde/kwayland-integration/APKBUILD
+++ b/aports/kde/kwayland-integration/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bhushan Shah <bshah@kde.org>
 # Maintainer: Bhushan Shah <bshah@kde.org>
 pkgname=kwayland-integration
-pkgver=5.12.3
+pkgver=5.12.5
 pkgrel=0
 pkgdesc="KWayland integration"
 url="https://www.kde.org/workspaces/plasmadesktop/"
@@ -27,4 +27,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f276747b7a3e26382756266687a99f89bd5585f4abd7cf09ad645f6fe98ed6e437ee58060f88486e061488ee443e8146c9f4125f21e64e2cb113a2e21937bfc1  kwayland-integration-5.12.3.tar.xz"
+sha512sums="6fab883acaf5bd7dc5d1cf4e5eda78240b358e3e4aec8c0ec53f9e5b20db613df04cb9547dc5a977811421a121a623a121dbeda183ce2f9a415a781275b98de0  kwayland-integration-5.12.5.tar.xz"
diff --git a/aports/kde/kwayland/APKBUILD b/aports/kde/kwayland/APKBUILD
index 958e92a51b4528c1b746c530028e78a53296e3aa..72027fada2da2fe7389b27f49fb145e29d9edfd7 100644
--- a/aports/kde/kwayland/APKBUILD
+++ b/aports/kde/kwayland/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwayland
-pkgver=5.45.0
-pkgrel=1
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Qt-style Client and Server library wrapper for the Wayland libraries'
 arch="all"
 url='https://www.kde.org'
@@ -34,4 +34,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ef5601b8e3ddbc53dcb62604151ee2b55b5ec0863c3c97dafff131f073e6e7fbf1f9972280a82d34a1fa615330c4a238c8e60ebac35415c68b4f86b5c34bcc00  kwayland-5.45.0.tar.xz"
+sha512sums="9713b94ae775abe30e65d6976bf978306640adaf1c3042f7a891e9baf648527ce8fa902a0fc13dcb7d247e7caac6bb645f234db8ec3d62fd7ec67c305772c19a  kwayland-5.46.0.tar.xz"
diff --git a/aports/kde/kwidgetsaddons/APKBUILD b/aports/kde/kwidgetsaddons/APKBUILD
index bba477398667a54b5283fd592f6cf363c021fc29..62773772517d20f5e0f7101d3d78a55c5f86e293 100644
--- a/aports/kde/kwidgetsaddons/APKBUILD
+++ b/aports/kde/kwidgetsaddons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwidgetsaddons
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Addons to QtWidgets'
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="0d8c5ba71c6aaf17e6fdc10be750ace3113589c4dbbdb4741ff1693a16ce4141295edec1942c144cd27250e509702fb81bbd28d186af19e1f1dfcadfa4b6808b  kwidgetsaddons-5.45.0.tar.xz"
+sha512sums="7b5f7ea2d2af4c5d16f4a826031bf452545d55c4041c34610e82ad2d65d28404d4f2bc928dc61ea4a181513d607c6268ea9d9fda93d284396e35f9caa502feaa  kwidgetsaddons-5.46.0.tar.xz"
diff --git a/aports/kde/kwin/APKBUILD b/aports/kde/kwin/APKBUILD
index d81145821d2579d28f0f59e02f0b7f8e42e0877d..889a202a9c0b13743c7be9dd1d90147fac066989 100644
--- a/aports/kde/kwin/APKBUILD
+++ b/aports/kde/kwin/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwin
-pkgver=5.12.3
-pkgrel=2
+pkgver=5.12.5
+pkgrel=0
 pkgdesc='An easy to use, but flexible, composited Window Manager'
 arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -42,5 +42,5 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="5c5162152fb4bb9827e540be0f2cc9a93fd9b4c850d04e7237b1de253958c7dd15e440103a35d7ecd0fd157ae90a94a48286a803f7a3bfbad8d5670889357277  kwin-5.12.3.tar.xz
+sha512sums="9a99645455f17b14ede45d656a83eb753fcd02c2ed4cca10045db84a75c610ba0732ffacca780805b3f990ab1ada6861f9036588d45c1bf487dbf1ff5bf9ba22  kwin-5.12.5.tar.xz
 5c35ff9526eb5a239e384025d20840ef159ad1f82922a49bb92ebd251c61410361495da9b03a5e185a26c6ad587ece68a20bd7973cad05cbb4f6cd490a4cbf37  0001-fbdev-support-RGB32-framebuffer-with-BGR-order.patch"
diff --git a/aports/kde/kwindowsystem/APKBUILD b/aports/kde/kwindowsystem/APKBUILD
index 0975ada35a604d41758d533645d19a0b5ff66360..f06000d336e9f4633337fe630ab83d1b576cc66a 100644
--- a/aports/kde/kwindowsystem/APKBUILD
+++ b/aports/kde/kwindowsystem/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwindowsystem
-pkgver=5.45.0
-pkgrel=1
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Access to the windowing system'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -33,4 +33,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="1829a8dd2cdf3ab6a9bd48ceceef42efc8379db0420c072059de31577677bcdf2ea09dc1f527f41e4578e6a7bef0771e13b37735ad61c3e640dd3f9e69d81617  kwindowsystem-5.45.0.tar.xz"
+sha512sums="a7d0b05445c1d5fba74d8e1f9330711c402cfab630d219f3556848020e5ef18517a5e4599c67f761cbf92635a7f30c705234142b94967803e288e49f8036d10c  kwindowsystem-5.46.0.tar.xz"
diff --git a/aports/kde/kxmlgui/APKBUILD b/aports/kde/kxmlgui/APKBUILD
index d91fbea9216f5eca5575e6dd935b44b87b01eb83..133f80a0e6c234a81acd5e97b81541917b8b720f 100644
--- a/aports/kde/kxmlgui/APKBUILD
+++ b/aports/kde/kxmlgui/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kxmlgui
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='User configurable main windows'
 arch="all"
@@ -35,4 +35,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="fbf3b58e5d12edd4295fccd54b8700f2e5cd49fd8564aee2a070b9d797adae04a7baba5f043d3107ee0a0464ba7a44bffb7eefa555dde35b6a4e5becc7636201  kxmlgui-5.45.0.tar.xz"
+sha512sums="2b1595a83957fa2a9c974ba991fb17a83032e52c06bbb76c7aa0331af0d27efb1509fbbeba66e6c2292f674903b20b82b570aa32ee524b2c3f5d8e76c7d25848  kxmlgui-5.46.0.tar.xz"
diff --git a/aports/kde/kxmlrpcclient/APKBUILD b/aports/kde/kxmlrpcclient/APKBUILD
index a497f47c53394f22ca18e8b94e706ccb813e4c77..a8bd81965ca45930f92ea802666fea9c3770a9ea 100644
--- a/aports/kde/kxmlrpcclient/APKBUILD
+++ b/aports/kde/kxmlrpcclient/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kxmlrpcclient
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc="XML-RPC client library for KDE"
 arch="all"
@@ -33,4 +33,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="6f57a9006666426b152d48435bebaee1aaa3a2984ca1b48692b24117d0aaa6c3bd57374f71098ffabf7f9337a30233bddb3646d0ebdda904bf6895b8f36c71bd  kxmlrpcclient-5.45.0.tar.xz"
+sha512sums="7eb714b34131f1f88fda26f0849fc3a420c7e17c3b2a0b04ebebf76e2f509ac68467e3552426adaeb8e2aefe007c8a24d43280ddc707793a9ea29bfd31551904  kxmlrpcclient-5.46.0.tar.xz"
diff --git a/aports/kde/libkscreen/APKBUILD b/aports/kde/libkscreen/APKBUILD
index e33d8ee41a669cdee221404b31cf2229f41426ce..3e0fd2140cf09c36c2ee1b33d4d567526c738ec1 100644
--- a/aports/kde/libkscreen/APKBUILD
+++ b/aports/kde/libkscreen/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkscreen
-pkgver=5.12.3
-pkgrel=2
+pkgver=5.12.5
+pkgrel=1
 pkgdesc='KDE screen management software'
 arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="e9cffc96e5249f3ebfe895b005ec570d15dc0ae2b4ea79e1e82fe48bf34b9d4d3639aa3fb6a7ec477e26f71a16f64928e39b7e4358915d7082e3f42eebf6fb3f  libkscreen-5.12.3.tar.xz"
+sha512sums="67d74a8b422559099bbaa55b547bc4de05952512dfb76ad73cfe209b8f3e13ba09e23b64f4fc4f2a992dd04e47d99f8dced9a24583349067fde8d9949dfb1ad3  libkscreen-5.12.5.tar.xz"
diff --git a/aports/kde/libksysguard/APKBUILD b/aports/kde/libksysguard/APKBUILD
index 8949a5ef27d788ab08c382e866046fc313b47567..3af4643f8bcb259d7cc940d83ef7b717df072dd2 100644
--- a/aports/kde/libksysguard/APKBUILD
+++ b/aports/kde/libksysguard/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libksysguard
-pkgver=5.12.3
-pkgrel=1
+pkgver=5.12.5
+pkgrel=0
 pkgdesc='Libksysguard'
 arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -34,4 +34,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="fbbac93f01d511af1a9b48c0dc4f27a2dee76c6bbf6ccc571ee95aab66d10236e8d0d4ae74c58add6e1e52b8b24d1373672881fe0eaaa7fd30bb629c971add40  libksysguard-5.12.3.tar.xz"
+sha512sums="61d3d42d5cebc06f775bd2737a4195ea790392906d007e2f08ed3455f63526bdb9fbfb40add63e97b107ece7aabfed056e56bb3f4dfee34e3514a391428633f7  libksysguard-5.12.5.tar.xz"
diff --git a/aports/kde/milou/APKBUILD b/aports/kde/milou/APKBUILD
index 86c295eee335aa0ea46dc69bc582f9092c1bbf57..f939a1582539622860c7678524d0d17da6e15cc5 100644
--- a/aports/kde/milou/APKBUILD
+++ b/aports/kde/milou/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=milou
-pkgver=5.12.3
+pkgver=5.12.5
 pkgrel=0
 pkgdesc="A dedicated search application built on top of Baloo"
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="78f2fa8545977468d875348385f4c08f02fe187f14fad4db693a36dc98fb5ac72473d9b6f48cf478681e6a91be4b39c56fb74c92815efb109ad04b23017a8a21  milou-5.12.3.tar.xz"
+sha512sums="7c96c7dbe8b4c45362a0e5a2152892776c2cfa52c748811459c280737f8695f4ee63332a38ce6618b2c4eb7773e2f5e21d9e4d366a22b89f749b42195828774d  milou-5.12.5.tar.xz"
diff --git a/aports/kde/modemmanager-qt/APKBUILD b/aports/kde/modemmanager-qt/APKBUILD
index d7f444ba735b04cec3e8641c284e6d5c09e0cccc..17a05a388d9f770627ccede98a8acc7a83f5b9c4 100644
--- a/aports/kde/modemmanager-qt/APKBUILD
+++ b/aports/kde/modemmanager-qt/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=modemmanager-qt
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Qt wrapper for ModemManager DBus API'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="fe08e74dc94acb93ca965dd59b85a51a3df9e9a62b8654bb20260b17b00b180ca2f20804ae95d830096ce59696d40c1a4e9c0432bc83bc15e0517f46f353e77a  modemmanager-qt-5.45.0.tar.xz"
+sha512sums="01492c143c7521a04840c43425e5f3d4a02023fe59b5cd280313c1f3711f06505be3cba68e9e3c9d5d4386799dcf97a94b9249c43aeb871f9f17e6c507fffe84  modemmanager-qt-5.46.0.tar.xz"
diff --git a/aports/kde/networkmanager-qt/APKBUILD b/aports/kde/networkmanager-qt/APKBUILD
index ac2c059bf2d82137aab610955697afe18b8db3bc..826fe91b993e4386925345351bfe84c4c2e1a1ac 100644
--- a/aports/kde/networkmanager-qt/APKBUILD
+++ b/aports/kde/networkmanager-qt/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=networkmanager-qt
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Qt wrapper for NetworkManager API'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="287333633aee73d35862634b4eddc304b260552019158ebda503f0d1546697670ecb32b8253d30d6f1239340d1c3346bb2e57d5c1a0cd92386f76927f4942a8a  networkmanager-qt-5.45.0.tar.xz"
+sha512sums="6ea85f44a014fb11f7274d7d81b22bea81d7025d691d56393d6c67732ecc081fb78c5a7b26be8ce6c7edcde23078a4f2e52c68f5ff04fca512b2225a509b63a7  networkmanager-qt-5.46.0.tar.xz"
diff --git a/aports/kde/plasma-framework/APKBUILD b/aports/kde/plasma-framework/APKBUILD
index f177e1a4816522febcf5941e4d9db5381c8b32f3..ee36d351ab2f54589d50b67bd9c569e31719f71f 100644
--- a/aports/kde/plasma-framework/APKBUILD
+++ b/aports/kde/plasma-framework/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=plasma-framework
-pkgver=5.45.0
-pkgrel=2
+pkgver=5.46.0
+pkgrel=0
 pkgdesc='Plasma library and runtime components based upon KF5 and Qt5'
 arch="all"
 url='https://community.kde.org/Frameworks'
@@ -37,4 +37,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="2158281ac206352c60d7dec0db7e98ecd121cf4e9cbf03d765eb6b4b0e419c94849d2392bb0671fcd5825ee6adb6aab4a69c4af76052d803c7a32a33d0e6f096  plasma-framework-5.45.0.tar.xz"
+sha512sums="1e6f9c28f7c9a4e2e8004df3cad5d78bbb5234e1dac2e29dccbbe22b4e9c6d8a1d192f7ee2657c9f47ae8c84acb412901c55d806d838fe0378eaef4827dde762  plasma-framework-5.46.0.tar.xz"
diff --git a/aports/kde/plasma-nm/APKBUILD b/aports/kde/plasma-nm/APKBUILD
index 7704e59ae7a5c114918afa951cf49b2a0de8a88d..696654cf0522e32a69b9ee1aacf12ba1c9f95b32 100644
--- a/aports/kde/plasma-nm/APKBUILD
+++ b/aports/kde/plasma-nm/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=plasma-nm
-pkgver=5.12.3
+pkgver=5.12.5
 pkgrel=1
 pkgdesc='Plasma applet written in QML for managing network connections'
 arch="all"
@@ -35,4 +35,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="30d9f9661df1b1f51502825e5a584126c4b6bca04f39cd24870b21dc92c46e3a60f218e03ce33365b7486067eaa6b1040a034d13a0e65de2095bc6463c82be9d  plasma-nm-5.12.3.tar.xz"
+sha512sums="7c61743d028d27ead7b7c373757f5ea82703808702d31546477558a631607c15d867140624391b803a72f5675c96853e1eea07c7af3001718a96c36d6c3191c6  plasma-nm-5.12.5.tar.xz"
diff --git a/aports/kde/plasma-pa/APKBUILD b/aports/kde/plasma-pa/APKBUILD
index e10bebf945fe0f5efc532c043eb8828118f5eabe..b9e10030d248303b75dfe17c8f53c296c6e510b3 100644
--- a/aports/kde/plasma-pa/APKBUILD
+++ b/aports/kde/plasma-pa/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=plasma-pa
-pkgver=5.12.3
+pkgver=5.12.5
 pkgrel=0
 pkgdesc='Plasma applet for audio volume management using PulseAudio'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="0455b77051b5b7dbc505990ff26b91a96adf42ee1e3ab59ab88d05ff396ff80019120ed11749bc13bd700786472ddaa3df79b57d9d4396c0ab1ec2b34d7f48d0  plasma-pa-5.12.3.tar.xz"
+sha512sums="7fedeaaeafaba7e2d7568fddcaff1793640979090aaf8ab7131c462b2bc0c2766f76d37cd0133c02c05a23efeb9e11b11350848d59b9869bf7bfcbd55924163e  plasma-pa-5.12.5.tar.xz"
diff --git a/aports/kde/plasma-phone-components/APKBUILD b/aports/kde/plasma-phone-components/APKBUILD
index 33a5df1613615449708711af8560f38f2c73b6d7..e14b8afb0ff1bf3486277555a4efc50b783e1bd4 100644
--- a/aports/kde/plasma-phone-components/APKBUILD
+++ b/aports/kde/plasma-phone-components/APKBUILD
@@ -1,13 +1,15 @@
+# Contributor Bart Ribbers <bribbers@disroot.org>
+# Maintainer Bart Ribbers <bribbers@disroot.org>
 pkgname=plasma-phone-components
 pkgver=0_git20180221
-pkgrel=1
+pkgrel=3
 _commit="9222d501fa6b86b93382e0dd1a7c965668960cee"
 pkgdesc="Modules providing phone functionality for Plasma"
 arch="all"
 url="https://community.kde.org/Plasma/Mobile"
 license="GPL3"
 depends="desktop-file-utils qt5-qtgraphicaleffects kactivities qt5-qtquickcontrols2 qt5-qtquickcontrols
-		plasma-pa plasma-nm upower"
+		plasma-pa plasma-nm upower libqofono"
 makedepends="extra-cmake-modules kpeople-dev qt5-qtdeclarative-dev kactivities-dev
 			 plasma-framework-dev kservice-dev kdeclarative-dev ki18n-dev kio-dev kcoreaddons-dev
 			 kconfig-dev kbookmarks-dev kwidgetsaddons-dev kcompletion-dev kitemviews-dev
diff --git a/aports/kde/plasma-workspace/APKBUILD b/aports/kde/plasma-workspace/APKBUILD
index d643c761cd04c76e98958e7060f0dbf320a01dad..851975d7c150bbf7a331ad05b597a9b0b1414245 100644
--- a/aports/kde/plasma-workspace/APKBUILD
+++ b/aports/kde/plasma-workspace/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=plasma-workspace
-pkgver=5.12.3
-pkgrel=2
+pkgver=5.12.5
+pkgrel=1
 pkgdesc='KDE Plasma Workspace'
 arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -47,4 +47,4 @@ package() {
 
 	install -Dm644 plasmawayland.desktop "$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop
 }
-sha512sums="0f00b1e14d5dc5b5763dbfa5aff4de74a2bbf3a44e2932f1916de525c3caf60d0a11e611cb2b0bcc31ff502991595808ff2728772dec787e91974700da234f53  plasma-workspace-5.12.3.tar.xz"
+sha512sums="c086b13893ab422b701e31652015618d8e3752e4ee5a8b9721eee7085307d251ea716e72bab52f458655cbf49d9a1a94deb47482fd6ecb030b20d7ea1bb52deb  plasma-workspace-5.12.5.tar.xz"
diff --git a/aports/kde/polkit-kde-agent/APKBUILD b/aports/kde/polkit-kde-agent/APKBUILD
index afbf179e18172b4d31308e530d69f19b6e2ae78b..f37512deb07aa816fd6fea641206078500c70794 100644
--- a/aports/kde/polkit-kde-agent/APKBUILD
+++ b/aports/kde/polkit-kde-agent/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=polkit-kde-agent
-pkgver=5.12.3
+pkgver=5.12.5
 pkgrel=0
 pkgdesc='Daemon providing a polkit authentication UI for KDE'
 arch="all"
@@ -34,4 +34,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="870859afab2cc332dd74b87fe9217a6c1140c65647c36e3c62ebe264a17a5194e784840393c993fc3d2f90d94d3bc6155368d676b20ff94cfa71e9b8d53c0ba4  polkit-kde-agent-1-5.12.3.tar.xz"
+sha512sums="fba769258b3c461bef83d8f978e6033119bbe5479b8efc349d2fd48955e5d9fa73fa928867fa08110941f01e27ada438b375005083b84a2be9bda6589b999562  polkit-kde-agent-1-5.12.5.tar.xz"
diff --git a/aports/kde/powerdevil/APKBUILD b/aports/kde/powerdevil/APKBUILD
index 115dd0874c47e989e0d9858ed84b4f9557fdeaa0..652aa3480ae03f29def1118236cf4bbc6e6b7469 100644
--- a/aports/kde/powerdevil/APKBUILD
+++ b/aports/kde/powerdevil/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=powerdevil
-pkgver=5.12.3
-pkgrel=1
+pkgver=5.12.5
+pkgrel=0
 pkgdesc='Manages the power consumption settings of a Plasma Shell'
 arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -40,4 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="715ae2c3018a771088efb3db9e69f57167700666267f50ff8bd5f858d9e4cde29768236f3f3041c3d395a147f004153ece89b014fd18d38ab726838d74c908d6  powerdevil-5.12.3.tar.xz"
+sha512sums="e40342c5565276671c9752b071c84b1c5d648c8c8c56dd127bc57d690be28518cd5782809ffe0253bbb1241034c14652ea29880c1ba0266e1df300e771a4d117  powerdevil-5.12.5.tar.xz"
diff --git a/aports/kde/prison/APKBUILD b/aports/kde/prison/APKBUILD
index 6971a61a7ca588688a2fff5014a0e289e2c88235..8c882e7c4ddf0545558398b8b3bd1e92824e65dd 100644
--- a/aports/kde/prison/APKBUILD
+++ b/aports/kde/prison/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=prison
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes"
 arch="all"
@@ -31,4 +31,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="15d4fabde12e5af3121cb4a583932da3d162cfeacd6db012f651ee1db01f78edea503cb58307d6c5d73e514c92d4d5391278a4183f2092ad32a3818fda8cf9d0  prison-5.45.0.tar.xz"
+sha512sums="5c801993c5f939adf97c0c6ccd7430ccebebbbe1ff1723da1748a215b85a7ddf43bf969f6463f911b361789dd4b0fde1becdaf960a0c39c243a96ac3f5666d42  prison-5.46.0.tar.xz"
diff --git a/aports/kde/solid/APKBUILD b/aports/kde/solid/APKBUILD
index ab8f7d4ecfeb21417c2aa38058b705d6d7c52c6a..bec7391034b10d0ab3777cebb40d08bb874f58b7 100644
--- a/aports/kde/solid/APKBUILD
+++ b/aports/kde/solid/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=solid
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Hardware integration and detection'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="3b650269b6552e6466ad8edb455c20f930cc777dce64187b535e0889611a69b76044e1ff0f8d33926900aa30764ec17f5637fd5b9fab129e48c106cd3a06ec49  solid-5.45.0.tar.xz"
+sha512sums="3b5a62f9723cd164a0ee2504e27a650bfae4a9d6b063db08e95d4a2735242092b39cb5b509d28408ca435adce18bf780c22a0acb4c8bf47749c5273edf6ed46c  solid-5.46.0.tar.xz"
diff --git a/aports/kde/sonnet/APKBUILD b/aports/kde/sonnet/APKBUILD
index efbd50e75afbf3bc35ba406a53def48800f913e3..29bda925ba8d890f09325960b142a13361f8d5e7 100644
--- a/aports/kde/sonnet/APKBUILD
+++ b/aports/kde/sonnet/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=sonnet
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Spelling framework for Qt5'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
-sha512sums="df35de0761c317c49ef0c8b74a7e67b4c1f1d23dedd67e6e5c05bd77c976b7909ab788f13dfcd670bea04368f2c733737701beacd42785d13c3e4a5a1cd57cf4  sonnet-5.45.0.tar.xz"
+sha512sums="537a103ae6a15b9f94e317f396bcd3dd791715e596ac094dfaf88fb48e7eca682481fc8b040cc405c0db740d2c1c3edc9b73e96a0ad47925a4a8b6dbf9682880  sonnet-5.46.0.tar.xz"
diff --git a/aports/kde/syntax-highlighting/APKBUILD b/aports/kde/syntax-highlighting/APKBUILD
index 21578346e8c1d32e013712699e4d9b42c1a46a93..5c3363bfa8acbf67f23cc70166bd4c33fa1b7671 100644
--- a/aports/kde/syntax-highlighting/APKBUILD
+++ b/aports/kde/syntax-highlighting/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=syntax-highlighting
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='Syntax highlighting engine for structured text and code'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="5761aae600cc3a6c15309fceae4b1e498f411510f4b34a212c5b09ea3c9ffcd90279ac9185d96528415c532b572d8d542d240caf5eb907539bd9a8c086acd2f3  syntax-highlighting-5.45.0.tar.xz"
+sha512sums="13f7f06ac74a2469620a62a28c325dc8d4997428b0842b506cb9ef287c7e2dc1446b7482ad5f0bef2d743b7bd84794ec28268de30c99515dfac4fecc66c4c41c  syntax-highlighting-5.46.0.tar.xz"
diff --git a/aports/kde/threadweaver/APKBUILD b/aports/kde/threadweaver/APKBUILD
index dde004d8a003fd777e6ebe1195436ae0d32b16c8..f1b32122c94bd2b0c75f4fbdbe5ac0e43aeb61ea 100644
--- a/aports/kde/threadweaver/APKBUILD
+++ b/aports/kde/threadweaver/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=threadweaver
-pkgver=5.45.0
+pkgver=5.46.0
 pkgrel=0
 pkgdesc='High-level multithreading framework'
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="2dac7210b4a8db28a669a7f903f3cec0c28a6d2e061c3f5516c20625ab9814411ab2a8816d84eca878bcdbb248e1d1994a5058ec35069c409a41c04bcf164874  threadweaver-5.45.0.tar.xz"
+sha512sums="b07cdf4c8ac955564d6a8e4343b84cc552ab0c9772dd5fc671eb38b55e9a719dfdea99917e71fcc0d7cc127a8e39a25707ed437e3d3231a266effa807f77e4c7  threadweaver-5.46.0.tar.xz"
diff --git a/aports/main/libqofono/APKBUILD b/aports/main/libqofono/APKBUILD
new file mode 100644
index 0000000000000000000000000000000000000000..776748137534bf2175b4ffa1fe1bea4d8e076eea
--- /dev/null
+++ b/aports/main/libqofono/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Bhushan Shah <bshah@kde.org>
+# Maintainer: Bhushan Shah <bshah@kde.org>
+pkgname=libqofono
+pkgver=0.92
+pkgrel=0
+pkgdesc="A library for accessing the ofono daemon, and a Qt declarative plugin for it."
+url="https://git.merproject.org/mer-core/libqofono/"
+arch="all"
+license="LGPL-2.0"
+depends=""
+depends_dev="qt5-qtbase-dev qt5-qtxmlpatterns-dev qt5-qtdeclarative-dev"
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev"
+source="https://git.merproject.org/mer-core/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$pkgver"
+# the tests are marked as autotest but they require ofono running
+# along with ofono-phonesim, which is overall complext setup
+options="!check"
+
+build() {
+	cd "$builddir"
+	qmake-qt5
+	make
+}
+
+package() {
+	cd "$builddir"
+	make INSTALL_ROOT="$pkgdir" install
+	# remove the installed tests xml file
+	rm -r "$pkgdir"/opt
+	rm -r "$pkgdir"/usr/lib/libqofono-qt5/tests/
+}
+
+sha512sums="955a044b15d9f09087c6d0a60395b40fc3a1b1ed203912db414f9faae8dc26488ded535fd1daf1a0d0579a36511127eb5a925ee214f4df4fc631cee7ba255102  libqofono-0.92.tar.gz"
diff --git a/aports/main/linux-postmarketos-qcom/APKBUILD b/aports/main/linux-postmarketos-qcom/APKBUILD
index 31717120373ea7f99d47da8f96a9a4a910f7ee16..fadd68a452f287cbcb3a59fddbd870446109a309 100644
--- a/aports/main/linux-postmarketos-qcom/APKBUILD
+++ b/aports/main/linux-postmarketos-qcom/APKBUILD
@@ -4,7 +4,7 @@ _config="config-${_flavor}.${CARCH}"
 pkgname=linux-${_flavor}
 
 pkgver=4.17_rc3
-pkgrel=2
+pkgrel=4
 
 arch="armhf"
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm devices"
@@ -13,7 +13,7 @@ depends=""
 makedepends="dtbtool perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev libressl-dev file bison flex"
 options="!strip !check !tracedeps"
 install=
-_commit="5f53b10c2e8bb79dccccb0e849be6fe5f2d32822"
+_commit="09efb4857f1a4119eced855912043817bd96e064"
 source="
 	linux-${_commit}.tar.gz::https://github.com/postmarketOS/linux/archive/${_commit}.tar.gz
 	config-${_flavor}.armhf
@@ -183,5 +183,5 @@ dev() {
 		done
 	fi
 }
-sha512sums="8c46beb8cf984a582e628cad77021f199e87bdf9d96bb9ef7aaf39e1c430ec58b59f60f590a3cf446dd0f337cc0838699d5a98786c0dd6b8f53f1a13950c92e2  linux-5f53b10c2e8bb79dccccb0e849be6fe5f2d32822.tar.gz
-7a57f8599be1cb99b4107e02747e21959cd6ba2bb81e5c0ce7554d642b7242bfd696674c13016a22383b80ccb8b96e00556d89cdab2341e2ae4734e5db4f15b8  config-postmarketos-qcom.armhf"
+sha512sums="02fd136d24914e30decd207c3b2e0168cc9d6e4a0fc981abf8d537cd95c70583f5239d0dc7f2ae94a2ddd2ba82d822933159167801a035731a24aa1300c5ceec  linux-09efb4857f1a4119eced855912043817bd96e064.tar.gz
+1961f051e2f4c3fad3fde69b08b277e3784a256115a8f30604e6b1973fd323e17ed9e5e55a3daf1a2d72770168d164ed060ff2a330d45d6cd6e3c59d4530d092  config-postmarketos-qcom.armhf"
diff --git a/aports/main/linux-postmarketos-qcom/config-postmarketos-qcom.armhf b/aports/main/linux-postmarketos-qcom/config-postmarketos-qcom.armhf
index e05dac54f793b58665f472db55a8b2f469c834eb..d037288a1cd133c498150961ac27a01643eca177 100644
--- a/aports/main/linux-postmarketos-qcom/config-postmarketos-qcom.armhf
+++ b/aports/main/linux-postmarketos-qcom/config-postmarketos-qcom.armhf
@@ -3023,10 +3023,10 @@ CONFIG_QCOM_IOMMU=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=y
-CONFIG_QCOM_ADSP_PIL=y
-CONFIG_QCOM_RPROC_COMMON=y
-CONFIG_QCOM_Q6V5_PIL=y
-CONFIG_QCOM_SYSMON=y
+CONFIG_QCOM_ADSP_PIL=m
+CONFIG_QCOM_RPROC_COMMON=m
+CONFIG_QCOM_Q6V5_PIL=m
+CONFIG_QCOM_SYSMON=m
 # CONFIG_QCOM_WCNSS_PIL is not set
 
 #
@@ -3066,7 +3066,7 @@ CONFIG_RPMSG_QCOM_SMD=y
 CONFIG_QCOM_MDT_LOADER=y
 CONFIG_QCOM_OCMEM=y
 CONFIG_QCOM_PM=y
-CONFIG_QCOM_QMI_HELPERS=y
+CONFIG_QCOM_QMI_HELPERS=m
 CONFIG_QCOM_RMTFS_MEM=y
 CONFIG_QCOM_SMEM=y
 CONFIG_QCOM_SMD_RPM=y
@@ -3762,12 +3762,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_RUNTIME_TESTING_MENU is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
-CONFIG_SAMPLES=y
-# CONFIG_SAMPLE_KOBJECT is not set
-# CONFIG_SAMPLE_KFIFO is not set
-CONFIG_SAMPLE_QMI_CLIENT=m
-CONFIG_SAMPLE_RPMSG_CLIENT=m
-# CONFIG_SAMPLE_CONFIGFS is not set
+# CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 # CONFIG_UBSAN is not set
diff --git a/aports/main/weston/APKBUILD b/aports/main/weston/APKBUILD
index dfd3d9b551cecab00c7dc05557aec3e4ade476bb..ea3f607afbc750457fe4096e322b15bce3f5a13d 100644
--- a/aports/main/weston/APKBUILD
+++ b/aports/main/weston/APKBUILD
@@ -1,9 +1,11 @@
 # Forked from Alpine to add patches that make it work with weird framebuffer drivers
 # from downstream kernels
+# "backend-rdp" temporarily disabled, because Alpine's freerdp package doesn't exist
+# for armhf yet and we can't build freerdp with pmbootstrap (#1489)
 pkgname=weston
 pkgver=9999
 _pkgver=3.0.0
-pkgrel=14
+pkgrel=15
 _libname=lib$pkgname
 _libdir=$_libname-${_pkgver%%.*}
 pkgdesc="The reference Wayland server"
@@ -13,12 +15,12 @@ license="MIT"
 depends=""
 makedepends="wayland-protocols libxkbcommon-dev xkeyboard-config
 	libinput-dev libunwind-dev mtdev-dev libxcursor-dev glu-dev
-	pango-dev colord-dev freerdp-dev libwebp-dev libva-dev dbus-dev
+	pango-dev colord-dev libwebp-dev libva-dev dbus-dev
 	linux-pam-dev wayland-dev"
 _cms="cms-colord cms-static"
 _shell="shell-desktop shell-fullscreen shell-ivi"
 _client="info terminal wcap-decode"
-_backend="backend-drm backend-fbdev backend-headless backend-rdp backend-x11 backend-wayland"
+_backend="backend-drm backend-fbdev backend-headless backend-x11 backend-wayland"
 options="!check suid"
 
 for _sub in $_cms $_shell $_client $_backend; do
@@ -50,7 +52,6 @@ build() {
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
 		--libexecdir=/usr/lib/$pkgname \
-		--enable-rdp-compositor \
 		--enable-screen-sharing \
 		--enable-vaapi-recorder \
 		--enable-clients \
diff --git a/aports/modem/modem-qcom-msm-mainline-common/APKBUILD b/aports/modem/modem-qcom-msm-mainline-common/APKBUILD
index 35d31c2cb9747008fe4d67cda76b537535a35f49..59f0f1ccf36e9acca21f5e2d94e9e0a546981e48 100644
--- a/aports/modem/modem-qcom-msm-mainline-common/APKBUILD
+++ b/aports/modem/modem-qcom-msm-mainline-common/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=modem-qcom-msm-mainline-common
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Common support for Qualcomm MSM modems on the mainline kernel"
 url="https://postmarketos.org/"
 arch="armhf"
@@ -15,4 +15,4 @@ package() {
 	install -Dm644 "$srcdir/udev.rules" "$pkgdir/usr/lib/udev/rules.d/55-$pkgname.rules"
 }
 
-sha512sums="a68d91d2747ee2c8ff3940ae02d7c6874b151ecbee6798d2b0215625b1d1e336c6d7c9ee9bebefa70c79c594bd00c9b8d059d958e875234d3bc348cfb1051147  udev.rules"
+sha512sums="f1807844c2f685d99d71a02c0b793cea04b242db27f43259a7d9156b9bec27328e34f323a91afaee0a14a6df6232f678009e6499f3b0ede43cad3351ccadb77d  udev.rules"
diff --git a/aports/modem/modem-qcom-msm-mainline-common/udev.rules b/aports/modem/modem-qcom-msm-mainline-common/udev.rules
index b8b153d7c888da26f4dd2846815d2611fc1f3673..023320e635f7a3bbb49c4a28c284983ae576e435 100644
--- a/aports/modem/modem-qcom-msm-mainline-common/udev.rules
+++ b/aports/modem/modem-qcom-msm-mainline-common/udev.rules
@@ -1,7 +1,7 @@
 SUBSYSTEM!="rpmsg", GOTO="qcom_rpmsg_end"
 
 # symlink rpmsg endpoints under useful names
-ATTR{rpmsg_name}=="DATA5_CNTL", SYMLINK+="modem"
+ATTR{name}=="DATA5_CNTL", SYMLINK+="modem"
 
 # open SMD channels when the remoteproc comes up
 KERNEL!="rpmsg_ctrl[0-9]*", GOTO="qcom_rpmsg_end"
diff --git a/aports/modem/ofono/APKBUILD b/aports/modem/ofono/APKBUILD
index 5f5d92aafb9faec4029a7b3955b68e6ba212c52c..cc2103b5d8fdf361e31b7ffb50272c237de2c6ec 100644
--- a/aports/modem/ofono/APKBUILD
+++ b/aports/modem/ofono/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=ofono
 _upstreamver=1.21
 pkgver=1.21_p20180307
-pkgrel=1
+pkgrel=2
 pkgdesc="Infrastructure for building mobile telephony (GSM/UMTS) applications"
 url="https://01.org/ofono"
 arch="all"
@@ -28,6 +28,7 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
+		--enable-test \
 		--sbindir=/usr/sbin
 	make
 }
diff --git a/aports/modem/qcom_rmtfs/APKBUILD b/aports/modem/qcom_rmtfs/APKBUILD
index 396d398e6994e2038a379814d4126328950e124f..dc2889cc0c7191aeb501b19b96308b8c84028a12 100644
--- a/aports/modem/qcom_rmtfs/APKBUILD
+++ b/aports/modem/qcom_rmtfs/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=qcom_rmtfs
 pkgver=0.0_git20180131
-pkgrel=1
+pkgrel=2
 pkgdesc="Qualcomm Remote Filesystem Service Implementation"
 url="https://github.com/andersson/rmtfs"
 arch="all"
@@ -36,5 +36,5 @@ package() {
 sha512sums="4b49cdf9d778bf6ae5e838c1da48e76b1004786a0dafefb0097fe3a73e4652c13ed1b011c051a712017f10b43ffc96b2fa133809715577b65fa4ca30cbdc191b  rmtfs.tgz
 a216dc36a7f12bbc125120ac7cc3e3030f3718f7d894c9e6d5e586375cbd76eae897160fdf780da8e3089dbfc0a31f1631dca4a2e850e193135ab825aa8d05cf  support-uio.patch
 877bdc84fdb4a851d94f29e2c6dd391afdb7812d19d0b10dc4449a6a7d0ed86fb3c01fd315bef7bfe24a644b3af102fc1e24194cb76c4e8966b8044a110ed639  update-storage-paths.patch
-21f5ba8b30d4e39046056e131b8eeb4d3bc7b11897b59b800d2d5162acc1629102fdc00b5df1df1ae7497c0cb6bbb0a40fa983c20733210ac01b76f6eaa848ee  qcom_rmtfs.initd
+5ca3428b540c14a921a6a158833c39c2ac6bea33fd82172fb014cb8aa96684f31cc853b4a3b4359a764583f8da21a56aee617bd36fa1d6ca90a2827204c1ef9a  qcom_rmtfs.initd
 2c889f1161fb27cb0a57079e7f7fce78cf3c6a5c33a9e839164d02a23fd6a6910d5f22c955c22608b69bd4515c61733089db0f8e9c46d1fc330e89f8707bd57d  udev.rules"
diff --git a/aports/modem/qcom_rmtfs/qcom_rmtfs.initd b/aports/modem/qcom_rmtfs/qcom_rmtfs.initd
index 84079c0a85f3740d0185e83e317f301b346c8793..6be669d1bbe7cf469fc3daa296b47dbe2da8aa95 100644
--- a/aports/modem/qcom_rmtfs/qcom_rmtfs.initd
+++ b/aports/modem/qcom_rmtfs/qcom_rmtfs.initd
@@ -1,10 +1,14 @@
 #!/sbin/openrc-run
 
+depend() {
+	after udev-settle
+}
+
 # libqipcrtr4msmipc.so may not be present, on devices that don't need it
 export LD_PRELOAD=/usr/lib/preload/libqipcrtr4msmipc.so
 
 command="/bin/sh"
-command_args="-c 'exec /usr/sbin/qcom_rmtfs 2>&1 | logger -t qcom_rmtfs'"
+command_args="-c 'exec /usr/sbin/qcom_rmtfs -v 2>&1 | logger -t qcom_rmtfs'"
 command_background="yes"
 
 pidfile="/var/run/${SVCNAME}.pid"
diff --git a/aports/modem/qrtr/APKBUILD b/aports/modem/qrtr/APKBUILD
index f649c609d8c34ee09ff7c63624e03ecb42684c08..1e06bb516cca7a836a77f0476c999ee72d06f800 100644
--- a/aports/modem/qrtr/APKBUILD
+++ b/aports/modem/qrtr/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=qrtr
 pkgver=1.0_git20180131
-pkgrel=0
+pkgrel=1
 pkgdesc="Userspace reference for net/qrtr in the Linux kernel"
 url="https://github.com/andersson/qrtr"
 arch="all"
@@ -11,20 +11,24 @@ _commit="dbffdd0193996723fdc9456e09736a30a32daf25"
 source="
 	qrtr.tgz::https://github.com/andersson/qrtr/archive/"$_commit".tar.gz
 	fix-cfg-include.patch
+	qrtr.initd
 	"
 builddir="$srcdir""/qrtr-"$_commit
 options="!check"
+install="$pkgname.post-install"
 
 build() {
 	cd "$builddir"
-	make C_INCLUDE_PATH=/usr/src/msmipc-dev/include libqrtr.so
+	make prefix=/usr libdir=/usr/lib/ C_INCLUDE_PATH=/usr/src/msmipc-dev/include all
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" prefix=/usr "$pkgdir"/usr/lib/libqrtr.so.1.0 "$pkgdir"/usr/include/libqrtr.h
+	make prefix=/usr DESTDIR="$pkgdir" install
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+	install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
 }
 
 sha512sums="4fbf9bcb26794a54e9784bafd0ee46a0c628327d6b31a438ca6d907185260cf590fc90a2e22139ebf3b939750277f434d67096396192d1ee3b0542c2feb39075  qrtr.tgz
-fca4a8b886b7bb6a53a83f3a69e3ae03b8fc462f6f6bf6c812af1a1036aa5a8c1f40b6cabf921e91c55423c37309d4e56ac8ccf0d4c5f7db41c1005afaf19382  fix-cfg-include.patch"
+fca4a8b886b7bb6a53a83f3a69e3ae03b8fc462f6f6bf6c812af1a1036aa5a8c1f40b6cabf921e91c55423c37309d4e56ac8ccf0d4c5f7db41c1005afaf19382  fix-cfg-include.patch
+fcd9b8e4c4df9236ec778f1ffb231e547e0d65c718e0caf351bee821b1549aecafbfdb21b4c1d1e3d049d541d87b6bf98746414e88e5d70d05131e0496e1ef37  qrtr.initd"
diff --git a/aports/modem/qrtr/qrtr.initd b/aports/modem/qrtr/qrtr.initd
new file mode 100644
index 0000000000000000000000000000000000000000..48c038b6507990615feef608ef9737b7ff8fa226
--- /dev/null
+++ b/aports/modem/qrtr/qrtr.initd
@@ -0,0 +1,11 @@
+#!/sbin/runscript
+
+depend() {
+	before qcom_rmtfs
+}
+
+start() {
+	ebegin "Starting QRTR service"
+	/usr/bin/qrtr-cfg 1 && /usr/bin/qrtr-ns
+	eend $?
+}
diff --git a/aports/modem/qrtr/qrtr.post-install b/aports/modem/qrtr/qrtr.post-install
new file mode 100644
index 0000000000000000000000000000000000000000..6f2a5cac1aec8f60ee8d79b6ffc8e623f2a9fe4a
--- /dev/null
+++ b/aports/modem/qrtr/qrtr.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rc-update -q add qrtr boot
diff --git a/aports/temp/mesa/APKBUILD b/aports/temp/mesa/APKBUILD
new file mode 100644
index 0000000000000000000000000000000000000000..1108f59cafea48f73c6dcbc9f0b4e18e3f0667b1
--- /dev/null
+++ b/aports/temp/mesa/APKBUILD
@@ -0,0 +1,271 @@
+# Copied from Alpine because their build-edge-armhf is stuck
+pkgname=mesa
+pkgver=18.0.2
+pkgrel=1
+pkgdesc="Mesa DRI OpenGL library"
+url="http://www.mesa3d.org"
+arch="all"
+license="MIT SGI-B-2.0 BSL-1.0"
+subpackages="$pkgname-dev
+	$pkgname-dri-ati:_dri
+	$pkgname-dri-nouveau:_dri
+	$pkgname-dri-freedreno:_dri
+	$pkgname-dri-swrast:_dri
+	$pkgname-dri-virtio:_dri
+	$pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles
+	$pkgname-xatracker $pkgname-osmesa $pkgname-gbm
+	$pkgname-vulkan-ati:_vulkan
+	"
+_llvmver=5
+depends_dev="libdrm-dev dri2proto libxext-dev libxdamage-dev libxcb-dev glproto
+	dri3proto presentproto libxshmfence-dev"
+makedepends="$depends_dev expat-dev xextproto python3 libxt-dev makedepend
+	talloc-dev py3-libxml2 flex bison llvm$_llvmver-dev eudev-dev libvdpau-dev
+	libxvmc-dev gettext zlib-dev libelf-dev py-mako libva-dev
+	autoconf automake libtool libxxf86vm-dev libx11-dev libxfixes-dev
+	wayland-dev wayland-protocols"
+source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
+	glx_ro_text_segm.patch
+	musl-fix-includes.patch
+	drmdeps.patch
+	"
+replaces="mesa-dricore"
+
+_dri_driverdir=/usr/lib/xorg/modules/dri
+_dri_drivers="r200,radeon,nouveau,swrast"
+_gallium_drivers="r300,r600,radeonsi,nouveau,freedreno,swrast,virgl"
+_vulkan_drivers="radeon"
+
+_arch_opts=
+
+case "$CARCH" in
+x86*)
+	_dri_drivers="${_dri_drivers},i915,i965"
+	_gallium_drivers="${_gallium_drivers},svga"
+	_vulkan_drivers="$_vulkan_drivers,intel"
+	subpackages="$subpackages $pkgname-dri-intel:_dri $pkgname-dri-vmwgfx:_dri $pkgname-vulkan-intel:_vulkan"
+	_arch_opts="--enable-dri3"
+	case "$CARCH" in
+	x86) _arch_opts="$_arch_opts --enable-glx-rts --disable-asm";;
+	esac
+	;;
+armhf|aarch64)
+	_gallium_drivers="${_gallium_drivers},vc4"
+	subpackages="$subpackages $pkgname-dri-vc4:_dri"
+	case "$CARCH" in
+	armhf) CFLAGS="$CFLAGS -mfpu=neon";;
+	esac
+	;;
+esac
+
+prepare() {
+	cd "$builddir"
+	default_prepare
+	libtoolize --force \
+		&& aclocal \
+		&& automake --add-missing \
+		&& autoreconf
+}
+
+build() {
+	cd "$builddir"
+
+	export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-dri-driverdir=$_dri_driverdir \
+		--with-gallium-drivers=${_gallium_drivers} \
+		--with-dri-drivers=${_dri_drivers} \
+		--with-vulkan-drivers=${_vulkan_drivers} \
+		--with-llvm-prefix=/usr/lib/llvm$_llvmver \
+		--with-platforms=x11,drm,wayland \
+		--enable-llvm \
+		--enable-llvm-shared-libs \
+		--enable-shared-glapi \
+		--enable-gbm \
+		--enable-dri \
+		--enable-glx \
+		--enable-gallium-osmesa \
+		--enable-gles1 \
+		--enable-gles2 \
+		--enable-egl \
+		--enable-texture-float \
+		--enable-xa \
+		--enable-vdpau \
+		--enable-va \
+		--disable-xvmc \
+		--disable-glx-tls \
+		--disable-nine \
+		$_arch_opts
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+
+	# provided by wayland
+	rm -v "$pkgdir"/usr/lib/libwayland-egl.so*
+	rm -v "$pkgdir"/usr/lib/pkgconfig/wayland-egl.pc
+}
+
+egl() {
+	pkgdesc="Mesa libEGL runtime libraries"
+	replaces="mesa"
+
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libEGL.so* "$subpkgdir"/usr/lib/
+}
+
+gl() {
+	pkgdesc="Mesa libGL runtime libraries"
+	replaces="mesa"
+
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libGL.so* "$subpkgdir"/usr/lib/
+}
+
+glapi() {
+	pkgdesc="Mesa shared glapi"
+	replaces="$pkgname-gles"
+
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libglapi.so.* "$subpkgdir"/usr/lib/
+}
+
+gles() {
+	pkgdesc="Mesa libGLESv2 runtime libraries"
+	replaces="mesa"
+
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libGLES*.so* "$subpkgdir"/usr/lib/
+}
+
+xatracker() {
+	pkgdesc="Mesa XA state tracker for vmware"
+
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libxatracker*.so.* "$subpkgdir"/usr/lib/
+}
+
+osmesa() {
+	pkgdesc="Mesa offscreen rendering libraries"
+
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libOSMesa.so.* "$subpkgdir"/usr/lib/
+}
+
+gbm() {
+	pkgdesc="Mesa gbm library"
+	replaces="mesa"
+
+	install -d "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgbm.so.* "$subpkgdir"/usr/lib/
+}
+
+_mv_dri() {
+	install -d "$subpkgdir"/$_dri_driverdir
+
+	while [ $# -gt 0 ]; do
+		mv "$pkgdir"/$_dri_driverdir/${1}.so \
+			"$subpkgdir"/$_dri_driverdir/
+		shift
+	done
+}
+
+_mv_vdpau() {
+	local i
+	install -d "$subpkgdir"/usr/lib/vdpau
+	for i in "$@"; do
+		mv "$pkgdir"/usr/lib/vdpau/libvdpau_$i.* \
+			"$subpkgdir"/usr/lib/vdpau/
+	done
+}
+
+_mv_gpipe() {
+	return 0
+	# http://cgit.freedesktop.org/mesa/mesa/commit/?id=44ec468e8033553c26a112cebba41c343db00eb1
+	# https://code.google.com/p/chromium/issues/detail?id=412089
+#	local i
+#	install -d "$subpkgdir"/usr/lib/gallium-pipe
+#	for i in "$@"; do
+#		mv "$pkgdir"/usr/lib/gallium-pipe/pipe_$i.* \
+#			"$subpkgdir"/usr/lib/gallium-pipe/
+#	done
+}
+
+_mv_vulkan() {
+	local i
+	install -d "$subpkgdir"/usr/lib
+	install -d "$subpkgdir"/usr/share/vulkan/icd.d
+	for i in "$@"; do
+		mv "$pkgdir"/usr/lib/libvulkan_${i}.so "$subpkgdir"/usr/lib/
+		mv "$pkgdir"/usr/share/vulkan/icd.d/${i}* "$subpkgdir"/usr/share/vulkan/icd.d/
+	done
+}
+
+_mv_va() {
+	local i
+	install -d "$subpkgdir"/usr/lib/dri
+	for i in "$@"; do
+		mv "$pkgdir"/usr/lib/dri/${i}_drv_video.so \
+			"$subpkgdir"/usr/lib/dri/
+	done
+}
+
+_dri() {
+	local n=${subpkgname##*-dri-}
+	pkgdesc="Mesa DRI driver for $n"
+
+	case $n in
+	ati)
+		_mv_dri radeon_dri r200_dri r300_dri r600_dri radeonsi_dri \
+			&& _mv_vdpau r300 r600 radeonsi \
+			&& _mv_gpipe r300 r600 \
+			&& _mv_va r600 radeonsi
+		;;
+	intel)
+		_mv_dri i915_dri i965_dri
+		;;
+	nouveau)
+		_mv_dri nouveau_dri nouveau_vieux_dri \
+			&& _mv_vdpau nouveau \
+			&& _mv_gpipe nouveau \
+			&& _mv_va nouveau
+		;;
+	freedreno)
+		_mv_dri msm_dri kgsl_dri
+		;;
+	swrast)
+		_mv_dri swrast_dri kms_swrast_dri && _mv_gpipe swrast
+		;;
+	vc4)
+		_mv_dri vc4_dri
+		;;
+	vmwgfx)
+		_mv_dri vmwgfx_dri && _mv_gpipe vmwgfx
+		;;
+	virtio)
+		_mv_dri virtio_gpu_dri
+		;;
+	esac
+}
+
+_vulkan() {
+	local n=${subpkgname##*-vulkan-}
+	pkgdesc="Mesa Vulkan API driver for $n"
+
+	case $n in
+	ati)
+		_mv_vulkan radeon ;;
+	intel)
+		_mv_vulkan intel ;;
+	esac
+}
+sha512sums="77d24d01c4c22596d28421aeb74932ff232730a4f556ae1a2e8777ece2876e4e352679575385c065505df4a2a83d2c1cf30db92dcf88038417e36a2768332d7e  mesa-18.0.2.tar.xz
+c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a  glx_ro_text_segm.patch
+910dd69c29b9b51b3b66e975baefbd8a6458500ef3164837036a4ac923c33254d558d678a100025ba2a69fd1111aa6b3ec83f332a66cae4207431e5e1c8ec567  musl-fix-includes.patch
+3409483217dbec732286e628e268e1e8cd392b7e8efb13c7651b38e6563aa5a4988279efb029096dcd092ebe7a92eece103014ed420d2b242eab8d0237f056fd  drmdeps.patch"
diff --git a/aports/temp/mesa/drmdeps.patch b/aports/temp/mesa/drmdeps.patch
new file mode 100644
index 0000000000000000000000000000000000000000..36b6889b3bf24565cce490b4511231db53591a35
--- /dev/null
+++ b/aports/temp/mesa/drmdeps.patch
@@ -0,0 +1,41 @@
+--- a/src/gallium/winsys/radeon/drm/Makefile.am
++++ b/src/gallium/winsys/radeon/drm/Makefile.am
+@@ -7,4 +7,6 @@
+ 
+ noinst_LTLIBRARIES = libradeonwinsys.la
+ 
++libradeonwinsys_la_LIBADD = -ldrm_radeon
++
+ libradeonwinsys_la_SOURCES = $(C_SOURCES)
+--- a/src/gallium/winsys/radeon/drm/Makefile.in
++++ b/src/gallium/winsys/radeon/drm/Makefile.in
+@@ -119,7 +119,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libradeonwinsys_la_LIBADD =
++libradeonwinsys_la_LIBADD = -ldrm_radeon
+ am__objects_1 = radeon_drm_bo.lo radeon_drm_cs.lo \
+ 	radeon_drm_surface.lo radeon_drm_winsys.lo
+ am_libradeonwinsys_la_OBJECTS = $(am__objects_1)
+--- a/src/gallium/winsys/amdgpu/drm/Makefile.am
++++ b/src/gallium/winsys/amdgpu/drm/Makefile.am
+@@ -11,6 +11,6 @@
+ noinst_LTLIBRARIES = libamdgpuwinsys.la
+ 
+ libamdgpuwinsys_la_LIBADD = \
+-   $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
++   $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -ldrm_amdgpu
+ 
+ libamdgpuwinsys_la_SOURCES = $(C_SOURCES)
+--- a/src/gallium/winsys/amdgpu/drm/Makefile.in
++++ b/src/gallium/winsys/amdgpu/drm/Makefile.in
+@@ -572,7 +572,7 @@
+ AM_CXXFLAGS = $(AM_CFLAGS)
+ noinst_LTLIBRARIES = libamdgpuwinsys.la
+ libamdgpuwinsys_la_LIBADD = \
+-   $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
++   $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -ldrm_amdgpu
+ 
+ libamdgpuwinsys_la_SOURCES = $(C_SOURCES)
+ all: all-am
diff --git a/aports/temp/mesa/glx_ro_text_segm.patch b/aports/temp/mesa/glx_ro_text_segm.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8cad4876b02bd32d81405de753598ac9f1f94fd3
--- /dev/null
+++ b/aports/temp/mesa/glx_ro_text_segm.patch
@@ -0,0 +1,28 @@
+2011-02-09	Jeremy Huddleston <jeremyhu@freedesktop.org
+
+	#240956
+	* configure.ac	add support to enable readonly test segment on x86
+
+--- ./configure.ac.orig	2008-11-17 23:19:38.000000000 +0100
++++ ./configure.ac	2008-11-17 23:20:17.000000000 +0100
+@@ -499,6 +499,20 @@
+     enable_xcb=no
+ fi
+ 
++
++dnl readonly text segment on x86 hardened platforms
++AC_ARG_ENABLE([glx_rts],
++    [AS_HELP_STRING([--enable-glx-rts],
++        [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])],
++    [enable_glx_rts="$enableval"],
++    [enable_glx_rts=no])
++if test "x$enable_glx_rts" = xyes; then
++    DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT"
++else
++    enable_glx_rts=no
++fi
++
++
+ dnl
+ dnl libGL configuration per driver
+ dnl
diff --git a/aports/temp/mesa/musl-fix-includes.patch b/aports/temp/mesa/musl-fix-includes.patch
new file mode 100644
index 0000000000000000000000000000000000000000..556aa9cd9a6aa6bf417acffa74ae1c5529ec5d6e
--- /dev/null
+++ b/aports/temp/mesa/musl-fix-includes.patch
@@ -0,0 +1,22 @@
+--- a/src/util/rand_xor.c
++++ b/src/util/rand_xor.c
+@@ -24,6 +24,8 @@
+ 
+ #if defined(__linux__)
+ #include <sys/file.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #else
+--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
++++ ./src/gallium/winsys/svga/drm/vmw_screen.h
+@@ -34,7 +34,7 @@
+ #ifndef VMW_SCREEN_H_
+ #define VMW_SCREEN_H_
+ 
+-
++#include <sys/stat.h>
+ #include "pipe/p_compiler.h"
+ #include "pipe/p_state.h"
+ 
diff --git a/aports/temp/qt5-qtwebsockets/APKBUILD b/aports/temp/qt5-qtwebsockets/APKBUILD
deleted file mode 100644
index fd341f9a2cae9ffb19be0e4a2610ae4dc66abca5..0000000000000000000000000000000000000000
--- a/aports/temp/qt5-qtwebsockets/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copied from Alpine because their build-edge-aarch64 is stuck
-pkgname=qt5-qtwebsockets
-_pkgname=qtwebsockets-everywhere-src
-pkgver=5.10.1
-_ver=${pkgver/_p/-}
-_ver=${_ver/_/-}
-_ver=${_ver/beta0/beta}
-_ver=${_ver/rc0/rc}
-_V=${_ver/rc/RC}
-pkgrel=1
-pkgdesc="Provides WebSocket communication compliant with RFC 6455"
-url="http://qt-project.org/"
-arch="all"
-license="GPL-3.0"
-makedepends="qt5-qtbase-dev"
-subpackages="$pkgname-dev"
-replaces="qt5-websockets"
-
-case $pkgver in
-*_beta*|*_rc*) _rel=development_releases;;
-*) _rel=official_releases;;
-esac
-options="!check"
-source="http://download.qt.io/official_releases/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_ver.tar.xz"
-
-builddir="$srcdir"/$_pkgname-${_V%-*}
-
-prepare() {
-	default_prepare
-	cd "$builddir"
-	mkdir -p build
-}
-
-build() {
-	cd "$builddir"/build
-	qmake-qt5 ..
-	make
-}
-
-package() {
-	cd "$builddir"/build
-	make INSTALL_ROOT="$pkgdir" install
-}
-
-sha512sums="c5ab093ec4e93a94f646adff1ff6ef3eeb70fe302be04ddb694a5f7781c5d68777d75a3e831128a23d852522a6a0ca4e54a6bc67d10fb6e395632df4e7e71596  qtwebsockets-everywhere-src-5.10.1.tar.xz"
diff --git a/aports/temp/qt5-qtx11extras/APKBUILD b/aports/temp/qt5-qtx11extras/APKBUILD
deleted file mode 100644
index c0c7a9edf2f132a99f4390d23cf507a988f8ea4c..0000000000000000000000000000000000000000
--- a/aports/temp/qt5-qtx11extras/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copied from Alpine because their build-edge-aarch64 is stuck
-pkgname=qt5-qtx11extras
-_pkgname=qtx11extras-everywhere-src
-pkgver=5.10.1
-_ver=${pkgver/_p/-}
-_ver=${_ver/_/-}
-_ver=${_ver/beta0/beta}
-_ver=${_ver/rc0/rc}
-_V=${_ver/rc/RC}
-pkgrel=1
-pkgdesc="Provides platform-specific APIs for X11"
-url="http://qt-project.org/"
-arch="all"
-license="GPL-3.0"
-makedepends="qt5-qtbase-dev"
-subpackages="$pkgname-dev"
-replaces="qt5-x11extras"
-
-case $pkgver in
-*_beta*|*_rc*) _rel=development_releases;;
-*) _rel=official_releases;;
-esac
-source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz"
-
-builddir="$srcdir"/$_pkgname-${_V%-*}
-
-prepare() {
-	default_prepare
-	cd "$builddir"
-	mkdir -p build
-}
-
-build() {
-	cd "$builddir"/build
-	qmake-qt5 ..
-	make
-}
-
-check() {
-	cd "$builddir"/build
-	make check
-}
-
-package() {
-	cd "$builddir"/build
-	make INSTALL_ROOT="$pkgdir" install
-}
-
-sha512sums="b429aa066c49d0f58f88fb774b49643eea21e41aa5ebfb03c2b4ba53c42a07bddc793a228b3a7cbf3bc57bd02879659a3ce7aeff260b77f4b8adc75a0b556778  qtx11extras-everywhere-src-5.10.1.tar.xz"
diff --git a/pmb/aportgen/core.py b/pmb/aportgen/core.py
index 912703ebb4d2722e51a773cb338016207bcb807f..63e7a1ff5ca97e428986f083751c086d8bdcabcd 100644
--- a/pmb/aportgen/core.py
+++ b/pmb/aportgen/core.py
@@ -105,7 +105,7 @@ def rewrite(args, pkgname, path_original, fields={}, replace_pkgname=None,
 
             # Replace simple
             for pattern, replacement in replace_simple.items():
-                if fnmatch.fnmatch(line, pattern):
+                if fnmatch.fnmatch(line, pattern + "\n"):
                     line = replacement
                     if replacement:
                         line += "\n"
diff --git a/pmb/aportgen/gcc.py b/pmb/aportgen/gcc.py
index f3e2f7f51ec6cb4dc511bf2571f0741c2c33ce33..ca1c4da526aebdcbbc11d6b4c2e726fef260908c 100644
--- a/pmb/aportgen/gcc.py
+++ b/pmb/aportgen/gcc.py
@@ -49,7 +49,6 @@ def generate(args, pkgname):
 
     below_header = "CTARGET_ARCH=" + arch + """
         CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
-        CBUILDROOT="/usr/$CTARGET"
         LANG_OBJC=false
         LANG_JAVA=false
         LANG_GO=false
@@ -57,40 +56,16 @@ def generate(args, pkgname):
         LANG_ADA=false
         options="!strip !tracedeps"
 
-        # Wrap the package function, to make the resulting package
-        # lazy-reproducible
-        package() {
-            # Repack the *.a files to be reproducible (see #64)
-            _temp="$_builddir"/_reproducible-patch
-            cd "$_builddir"
-            for f in $(find -name '*.a'); do
-                # Copy to a temporary folder
-                echo "Repack $f to be reproducible"
-                mkdir -p "$_temp"
-                cd "$_temp"
-                cp "$_builddir"/"$f" .
-
-                # Repack with a sorted file order
-                ar x *.a
-                rm *.a
-                ar r sorted.a $(find -name '*.o' | sort)
-
-                # Copy back and clean up
-                cp -v sorted.a "$_builddir"/"$f"
-                cd ..
-                rm -r "$_temp"
-            done
-
-            # Unmodified package function from the gcc APKBUILD
-            _package
-
-            # Workaround for: postmarketOS/binary-package-repo#1
-            echo "Replacing hardlinks with symlinks"
-            rm -v "$pkgdir"/usr/bin/"$CTARGET"-c++
-            ln -s -v /usr/bin/"$CTARGET"-g++ "$pkgdir"/usr/bin/"$CTARGET"-c++
-            rm -v "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
-            ln -s -v /usr/bin/"$CTARGET"-gcc "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
-        }
+        # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH"
+        # when this variable matches "no*"
+        BOOTSTRAP="nobuildbase"
+
+        # abuild will only cross compile when this variable is set, but it
+        # needs to find a valid package database in there for dependency
+        # resolving, so we set it to /.
+        CBUILDROOT="/"
+
+        _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
     """
 
     replace_simple = {
@@ -99,8 +74,10 @@ def generate(args, pkgname):
         # pmbootstrap picks it up properly).
         '*subpackages="$subpackages libstdc++:libcxx:*': None,
 
-        # Rename package to _package, so we can wrap it (see above)
-        '*package() {*': "_package() {"
+        # We set the cross_configure variable at the beginning, so it does not
+        # use CBUILDROOT as sysroot. In the original APKBUILD this is a local
+        # variable, but we make it a global one.
+        '*_cross_configure=*': None,
     }
 
     pmb.aportgen.core.rewrite(args, pkgname, "main/gcc", fields,