user/[KDE]: Upgrade the rest of KDE to current versions

8 files changed, 36 insertions, 73 deletions

diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD
index aa4e678bc..5393fbe18 100644
--- a/user/kde-education/APKBUILD
+++ b/user/kde-education/APKBUILD
@@ -17,7 +17,7 @@ source="org.adelie-linux.about-education.desktop"
 
 package() {
 	mkdir -p "$pkgdir"/usr/share/applications
-	cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/release-service/
+	cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/
 }
 
 sha512sums="d88ee909e3ce8d26f3fbfeebc8656e0b72ec399f5ba0a1225babf217b01f5c7caec6e81e95cabb00b23dcbd41416360ae15958f38a5cbf4d548b89e3dd3229d5  org.adelie-linux.about-education.desktop"
diff --git a/user/kde/APKBUILD b/user/kde/APKBUILD
index dbb054a1e..902ef67d1 100644
--- a/user/kde/APKBUILD
+++ b/user/kde/APKBUILD
@@ -1,16 +1,18 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kde
 pkgver=5
-pkgrel=1
+pkgrel=2
 pkgdesc="The K Desktop Environment"
 url="https://www.kde.org/"
 arch="noarch"
-license="NCSA"
 options="!check"  # Metapacakge
+license="NCSA"
 subpackages=""
 depends="adelie-kde-theme kde-education kde-games kde-graphics kde-multimedia
 	kde-system kde-utilities plasma-desktop
 
+	kcachegrind kget krdc ktorrent umbrello
+
 	kgamma5 khotkeys kmenuedit ksshaskpass plasma-workspace-wallpapers
 	user-manager"
 source=""
diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD
index b9903e868..934b57834 100644
--- a/user/kdenlive/APKBUILD
+++ b/user/kdenlive/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdenlive
-pkgver=19.08.1
+pkgver=19.12.0
 pkgrel=0
 pkgdesc="Libre video editor"
 url="https://kdenlive.org/"
@@ -20,10 +20,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev
 	kdoctools-dev kfilemetadata-dev qt5-qtwebkit-dev v4l-utils-dev
 	kdeclarative-dev qt5-qtmultimedia-dev rttr-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kdenlive-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kdenlive-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -34,18 +33,16 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="74f007ecdfe2368a1dee9d7b2331e45a56adc157a4d20127659b833e3f045a6edce680593232b9be43e50d16a5222e275af61a4c3a7e4c420ad6721b2e93b502  kdenlive-19.08.1.tar.xz"
+sha512sums="dc692db5dc4e0c7c8daa51fb8722d5d60efc22bb10b61c1048a67a50c15e9bac44bd009f6379153f1e1c21c12cb4b88f56ebe2db21a095c00bd068d0c1bbcb61  kdenlive-19.12.0.tar.xz"
diff --git a/user/kdewebkit/APKBUILD b/user/kdewebkit/APKBUILD
index 9d00ce5d9..07859c854 100644
--- a/user/kdewebkit/APKBUILD
+++ b/user/kdewebkit/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kdewebkit
-pkgver=5.54.0
+pkgver=5.65.0
 pkgrel=0
 pkgdesc="KDE integration with WebKit"
 url="https://www.kde.org/"
@@ -10,12 +10,11 @@ license="LGPL-2.1+"
 depends=""
 depends_dev="qt5-qtwebkit-dev"
 makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kcoreaddons-dev
-	kio-dev kparts-dev kwallet-dev"
+	kio-dev kparts-dev kwallet-dev qt5-qttools-dev"
 subpackages="$pkgname-dev"
-source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kdewebkit-$pkgver.tar.xz"
+source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kdewebkit-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -26,18 +25,16 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6d4a5cede572653db64826d29470e7f2f1ecded97547c4ee49f5ca51e218c22ffeb84dbd0f0953e4e55d993aff617d262cc6f974902c5dc0219642dffb1611f1  kdewebkit-5.54.0.tar.xz"
+sha512sums="6b66253e009871fa33e6f33a16a39b37f0828db688be95487f326bae96ef023aacb859a5726ea63faa4b12ee352be1f0d0d0697f67dde95292e677659a2f231d  kdewebkit-5.65.0.tar.xz"
diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD
index a679afb20..792ad2e1d 100644
--- a/user/rocs/APKBUILD
+++ b/user/rocs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=rocs
-pkgver=19.08.2
+pkgver=19.12.0
 pkgrel=0
 pkgdesc="Graph theory IDE"
 url="https://www.kde.org/applications/education/rocs/"
@@ -14,10 +14,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev boost-dev
 	karchive-dev kconfig-dev kcoreaddons-dev kcrash-dev kdeclarative-dev
 	ki18n-dev kitemviews-dev ktexteditor-dev kxmlgui-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/rocs-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/rocs-$pkgver.tar.xz
+	webkit.patch
+	"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -28,18 +29,17 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2832a0dfe83076100357c86eeb3ad0fccf55f667bd4b86c0cd8bd2db21f8b323a524d3016db9509f7bfee1837820d9bcdac0dc4dd8a4e5d2af020f8102b4aa0d  rocs-19.08.2.tar.xz"
+sha512sums="11d9c6a0e6234c86752e07b5037ddd066673459c9f2bc1a779bfe54a06bce796af01b79af811c056f59ffcc85233ab357502a3597eeb21b5112d0f681cb51c6a  rocs-19.12.0.tar.xz
+0ed6660f78096d0f6b53e563f7c632dd1616beda4032a3a6556aef20dc1c79f6a31b93a377b005a1d3acaecd9da7b20ae8c0b3e7e36d97ef65837b207d3e94b3  webkit.patch"
diff --git a/user/rocs/webkit.patch b/user/rocs/webkit.patch
new file mode 100644
index 000000000..87ba9e747
--- /dev/null
+++ b/user/rocs/webkit.patch
@@ -0,0 +1,11 @@
+--- rocs-19.12.0/src/CMakeLists.txt.old	2019-12-05 19:44:59.000000000 +0000
++++ rocs-19.12.0/src/CMakeLists.txt	2020-01-05 05:05:52.820317770 +0000
+@@ -103,7 +103,7 @@
+         Qt5::Core
+         Qt5::Quick
+         Qt5::QuickWidgets
+-        Qt5::WebKit
++        Qt5::WebKitLegacy
+         Qt5::WebKitWidgets
+         Qt5::XmlPatterns
+ )
diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD
index 67f2fa698..670483fdd 100644
--- a/user/umbrello/APKBUILD
+++ b/user/umbrello/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=umbrello
-pkgver=19.08.2
+pkgver=19.12.0
 pkgrel=0
 pkgdesc="Software modelling tool and code generator"
 url="https://umbrello.kde.org/"
@@ -14,12 +14,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
 	kcrash-dev kdoctools-dev kiconthemes-dev kdelibs4support-dev kio-dev
 	ktexteditor-dev kwindowsystem-dev kwidgetsaddons-dev kxmlgui-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/umbrello-$pkgver.tar.xz
+source="https://download.kde.org/stable/release-service/$pkgver/src/umbrello-$pkgver.tar.xz
 	hax.patch
 	"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -30,19 +29,17 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a251d6e65cb0b177fee88cadaea1cc9105ac5a0b0b8ab09b31a279c4e473fdeea3acf9a7b54b66178b4d77460bc1406caf4bb03844f8c57f46175bff6c587525  umbrello-19.08.2.tar.xz
+sha512sums="b85a1f099cebe207b65b0f69f6f4c3c7d76c72e7d09e2c025661ad5a8c1ccc6394b6686a59fa1c997d3b29cfaaa67fc4f98d269abd1a5fdae423de8fdf2ab232  umbrello-19.12.0.tar.xz
 fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562  hax.patch"
diff --git a/user/umbrello/assertion-fix.patch b/user/umbrello/assertion-fix.patch
deleted file mode 100644
index ef86e6546..000000000
--- a/user/umbrello/assertion-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From af72e059f728d70e43ac3ea03653865585818e66 Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-Date: Fri, 2 Nov 2018 11:38:37 +0100
-Subject: Fix 'Umbrello fails to start due to ASSERT failure in QVector<T>::at
- "index out of range"'
-
-The backtrace shows that Qt wants to access tree view items that
-have already been deleted. To avoid this, graphical updates are
-disabled when creating the new document.
-
-BUG:400501
-FIXED-IN:2.26.3 (KDE Applications 18.08.3)
----
- umbrello/umldoc.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/umbrello/umldoc.cpp b/umbrello/umldoc.cpp
-index d4099bb..af5c889 100644
---- a/umbrello/umldoc.cpp
-+++ b/umbrello/umldoc.cpp
-@@ -442,6 +442,9 @@ void UMLDoc::closeDocument()
-  */
- bool UMLDoc::newDocument()
- {
-+    bool state = UMLApp::app()->document()->loading();
-+    UMLApp::app()->document()->setLoading(false);
-+
-     closeDocument();
-     UMLApp::app()->setCurrentView(0);
-     setUrlUntitled();
-@@ -465,6 +468,7 @@ bool UMLDoc::newDocument()
-     UMLApp::app()->enableUndoAction(false);
-     UMLApp::app()->clearUndoStack();
- 
-+    UMLApp::app()->document()->setLoading(state);
-     return true;
- }
- 
--- 
-cgit v0.11.2
-