7 files changed, 58 insertions, 61 deletions
diff --git a/user/audacious/APKBUILD b/user/audacious/APKBUILD
index f37ff9b60..d671e395d 100644
--- a/user/audacious/APKBUILD
+++ b/user/audacious/APKBUILD
@@ -12,9 +12,7 @@ license="ISC"
 depends_dev="qt5-qtbase-dev dbus-glib-dev"
 makedepends="$depends_dev libguess-dev>=1.2 libxml2-dev autoconf automake"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2
-	qt-crash.patch
-	"
+source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
 	default_prepare
@@ -38,5 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43  audacious-3.10.1.tar.bz2
-debc016b8a2a1313bdd4a840c103755a52a7e4a5e21970ca82031bac101253f04ade3e81aa648cf5f44b8225da6e1b245f995df6ea43f2ed1f2e757d774205d4  qt-crash.patch"
+sha512sums="e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43  audacious-3.10.1.tar.bz2"
diff --git a/user/audacious/qt-crash.patch b/user/audacious/qt-crash.patch
deleted file mode 100644
index 4b7d42d3b..000000000
--- a/user/audacious/qt-crash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 61471d51503736d868f5978f5b9a1471f3d2c9ce Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Thu, 20 Sep 2018 12:36:16 -0500
-Subject: [PATCH] libaudqt: Fix crash when infopopup is being hidden
-
-Hovering over the track I wanted to listen to showed a tool tip (the
-InfoPopup widget); if I moved the mouse in any way after the widget was
-displayed, it would immediately crash with a segmentation fault.
-
-Valgrind showed that this was due to s_infopopup being deleted from an
-event that involved it.  By switching both `delete` to `deleteLater`,
-the crash no longer occurs.
-
-Closes: #828.
----
- src/libaudqt/infopopup-qt.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libaudqt/infopopup-qt.cc b/src/libaudqt/infopopup-qt.cc
-index fdbba41d2..cad4d16d5 100644
---- a/src/libaudqt/infopopup-qt.cc
-+++ b/src/libaudqt/infopopup-qt.cc
-@@ -176,7 +176,7 @@ static InfoPopup * s_infopopup;
- 
- static void infopopup_show (const String & filename, const Tuple & tuple)
- {
--    delete s_infopopup;
-+    if(s_infopopup) s_infopopup->deleteLater();
-     s_infopopup = new InfoPopup (filename, tuple);
- 
-     QObject::connect (s_infopopup, & QObject::destroyed, [] () {
-@@ -206,7 +206,7 @@ EXPORT void infopopup_show_current ()
- 
- EXPORT void infopopup_hide ()
- {
--    delete s_infopopup;
-+    s_infopopup->deleteLater();
- }
- 
- } // namespace audqt
--- 
-2.18.0
-
diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD
index e36e44a62..17e5d241e 100644
--- a/user/breeze/APKBUILD
+++ b/user/breeze/APKBUILD
@@ -11,7 +11,7 @@ depends=""
 depends_dev="extra-cmake-modules"
 makedepends="$depends_dev cmake extra-cmake-modules python3 kcmutils-dev
 	kconfigwidgets-dev kcoreaddons-dev kdecoration-dev kguiaddons-dev
-	ki18n-dev kpackage-dev kwayland-dev kwindowsystem-dev"
+	ki18n-dev kpackage-dev frameworkintegration-dev kwindowsystem-dev"
 subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.kde.org/stable/plasma/$pkgver/breeze-$pkgver.tar.xz"
 
diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD
index f5d322a6f..c241f9e62 100644
--- a/user/libkscreen/APKBUILD
+++ b/user/libkscreen/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libkscreen
 pkgver=5.12.7
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE Plasma screen management software"
 url="https://www.kde.org/"
 arch="all"
@@ -12,7 +12,7 @@ depends=""
 depends_dev="qt5-qtbase-dev"
 makedepends="$depends_dev cmake extra-cmake-modules qt5-qtx11extras-dev
 	kwayland-dev"
-subpackages="$pkgname-dev"
+subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-wayland"
 source="https://download.kde.org/stable/plasma/$pkgver/libkscreen-$pkgver.tar.xz"
 
 build() {
@@ -41,4 +41,18 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
+doctor() {
+	pkgdesc="KDE Plasma screen debugging and management tool"
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+}
+
+wayland() {
+	pkgdesc="$pkgdesc (Wayland support)"
+	install_if="$pkgname=$pkgver-r$pkgrel wayland"
+	mkdir -p "$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen
+	mv "$pkgdir"/usr/lib/qt5/plugins/kf5/kscreen/KSC_KWayland.so \
+		"$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen/
+}
+
 sha512sums="fb24d0f4f79468d4246e912f4b7e814df398911cdbd475e18263e89502ecca35c9e4974b7f0af92afa8cba3081056f8f27b0f051eb287c682dd37b35568b3c5c  libkscreen-5.12.7.tar.xz"
diff --git a/user/libsodium/APKBUILD b/user/libsodium/APKBUILD
new file mode 100644
index 000000000..a63992976
--- /dev/null
+++ b/user/libsodium/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
+# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
+pkgname=libsodium
+pkgver=1.0.17
+pkgrel=0
+pkgdesc="Networking and Cryptography library: sodium fork"
+url="https://libsodium.org/"
+arch="all"
+license="ISC"
+subpackages="$pkgname-dev"
+source="https://download.libsodium.org/libsodium/releases/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--prefix=/usr \
+		--enable-retpoline \
+		--with-pthreads \
+		--with-gnu-ld
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make install "DESTDIR=$pkgdir"
+}
+
+sha512sums="7cc9e4f11e656008ce9dff735acea95acbcb91ae4936de4d26f7798093766a77c373e9bd4a7b45b60ef8a11de6c55bc8dcac13bebf8c23c671d0536430501da1  libsodium-1.0.17.tar.gz"
diff --git a/user/libtheora/APKBUILD b/user/libtheora/APKBUILD
index a1e1e1948..2dd25afa7 100644
--- a/user/libtheora/APKBUILD
+++ b/user/libtheora/APKBUILD
@@ -20,7 +20,6 @@ source="http://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.bz2
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 
 	sed -i 's/png_\(sizeof\)/\1/g' examples/png2theora.c
 
@@ -31,26 +30,23 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-
 	CFLAGS="${CFLAGS/-Os/-O3}" CPPFLAGS="${CPPFLAGS/-Os/-O3}" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--enable-shared \
 		--enable-static
+	# workaround parallel build issue
+	make -C lib libtheoradec.la
 	make -C lib
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-
 	make -j1 DESTDIR="$pkgdir" install
 
 	install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
diff --git a/user/wayland/APKBUILD b/user/wayland/APKBUILD
index 9e5b68f89..0c774d994 100644
--- a/user/wayland/APKBUILD
+++ b/user/wayland/APKBUILD
@@ -2,12 +2,12 @@
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
 # Maintainer: 
 pkgname=wayland
-pkgver=1.14.0
-pkgrel=3
+pkgver=1.16.0
+pkgrel=0
 pkgdesc="A computer display server protocol"
 url="https://wayland.freedesktop.org"
 arch="all"
-options="!checkroot"
+options="!check"  # Buggy.
 license="MIT"
 depends="$pkgname-libs-client $pkgname-libs-cursor $pkgname-libs-server"
 depends_dev="libffi-dev expat-dev"
@@ -55,4 +55,4 @@ _libs() {
 	mv "$pkgdir"/usr/lib/*-$name.so.* "$subpkgdir"/usr/lib
 }
 
-sha512sums="bd38b2b8963d4d98d42c270e5d7dbff6323789a173b19b67a18258424fd8adee5021b282c9d7f6dad0bd25aa0160e76aecd8ed803d4eb25d911ef0a81cd713a5  wayland-1.14.0.tar.xz"
+sha512sums="64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c  wayland-1.16.0.tar.xz"