user/[misc KDE]: Bump to most recent stable

8 files changed, 22 insertions, 47 deletions

diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD
index d3b5c81f6..b15c8dc8b 100644
--- a/user/kcachegrind/APKBUILD
+++ b/user/kcachegrind/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcachegrind
-pkgver=19.08.2
+pkgver=19.12.0
 pkgrel=0
 pkgdesc="Profile data visualisation tool and call graph viewer"
 url="https://kcachegrind.github.io/html/Home.html"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev
 	karchive-dev kconfig-dev kcoreaddons-dev kdoctools-dev ki18n-dev kio-dev
 	kwidgetsaddons-dev kxmlgui-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kcachegrind-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kcachegrind-$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="7e2c7dc247e5adce6b68097ae265bbd449634efff581a68a18c725635ac8e976c9e5c92e8dbcde519d57b4fbb904e97afee85407992c8e5b2ab4a9fb04b28208  kcachegrind-19.08.2.tar.xz"
+sha512sums="ae511c229dc5dc18187bec8cda6a644474456ed320582271aacf1fec7f96db331d9e27e604a87b4acbdc8bf90fa0e39d8b5a15f2a8dd8eda5cab0be662d283de  kcachegrind-19.12.0.tar.xz"
diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD
index cf1efe711..42e8d2ac0 100644
--- a/user/kcontacts/APKBUILD
+++ b/user/kcontacts/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kcontacts
-pkgver=18.12.3
+pkgver=5.65.0
 pkgrel=0
 pkgdesc="Library for working with contact information"
 url="https://www.kde.org"
@@ -10,12 +10,11 @@ license="LGPL-2.1-only"
 depends="iso-codes"
 depends_dev="qt5-qtbase-dev"
 makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kcoreaddons-dev
-	ki18n-dev kcodecs-dev iso-codes-dev"
+	ki18n-dev kcodecs-dev iso-codes-dev doxygen graphviz qt5-qttools-dev"
 subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kcontacts-$pkgver.tar.xz"
+source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcontacts-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -26,20 +25,19 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		-DBUILD_QCH:BOOL=ON \
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
 check() {
-	cd "$builddir"
 	# addresstest requires the library to already be installed.
 	# picturetest requires X11 running.
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "(address|picture)test"
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3afdc0f3fb304329f0dec37f7db1d4cf457eda726a9276d440d9ada83f946c28806d5a3e69f0c711fb398567a7e3566b7c043b1dfc4ec59eae0b9ed0aa08689a  kcontacts-18.12.3.tar.xz"
+sha512sums="6d1ff93319e7208608270f7a2db3cac1bbd6e5def706c2f11990f9acd1bc3f8845da3be38a732858e632d41f4fdd10a6d345f7462de68c89b8ba52fb6ceb7ed6  kcontacts-5.65.0.tar.xz"
diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD
index 18ac5f9c8..4930f47ea 100644
--- a/user/kget/APKBUILD
+++ b/user/kget/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kget
-pkgver=19.08.2
+pkgver=19.12.0
 pkgrel=0
 pkgdesc="Versatile download manager"
 url="https://www.kde.org/applications/internet/kget/"
@@ -15,9 +15,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev
 	solid-dev ktextwidgets-dev kwallet-dev kwidgetsaddons-dev kxmlgui-dev
 	kwindowsystem-dev gpgme-dev qca-dev boost-dev libktorrent-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kget-$pkgver.tar.xz
-	kf5.patch
-	"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kget-$pkgver.tar.xz"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
@@ -30,7 +28,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
@@ -42,5 +40,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="aec147c2f4e7927b85e660b84d082de4a2ef9d3345cc9e8246da80f46f9eca5a098afc12e3d5c8c5fa14db81decd6087d87002bdce14fc393964bdf3d9d1ea0d  kget-19.08.2.tar.xz
-d66fb3988aa26c2cb9e243ef446679e715cb3bd10ee8cb1b0b39a68d424ab9fca71428fa0c6004a1671093201e71e371331b069d6bb0325d0e7b936a9b95a73c  kf5.patch"
+sha512sums="5a512a53d0881dba4ad8c1a31e18cdb55ef9df14a1a6d747740351f92b495a8a446cb1b7faf452facaaa5fafea59d0e5d800a218a3420d8452578f1ecdd75cd9  kget-19.12.0.tar.xz"
diff --git a/user/kget/kf5.patch b/user/kget/kf5.patch
deleted file mode 100644
index 0630603d3..000000000
--- a/user/kget/kf5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kget-19.08.0/CMakeLists.txt.old	2019-08-09 00:42:54.000000000 +0000
-+++ kget-19.08.0/CMakeLists.txt	2019-08-15 15:24:02.319818769 +0000
-@@ -8,7 +8,7 @@
- 
- project(kget VERSION ${KDE_APPLICATIONS_VERSION})
- 
--set(KF5_VERSION "5.55.0")
-+set(KF5_VERSION "5.54.0")
- set(REQUIRED_QT_VERSION "5.7.0")
- 
- find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD
index e47058f3d..7968c5e45 100644
--- a/user/kphotoalbum/APKBUILD
+++ b/user/kphotoalbum/APKBUILD
@@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang"
 source="https://download.kde.org/stable/kphotoalbum/$pkgver/kphotoalbum-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -27,17 +26,15 @@ 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
 }
 
diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD
index 37b1ba618..e014cf6c6 100644
--- a/user/krdc/APKBUILD
+++ b/user/krdc/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=krdc
-pkgver=19.08.2
+pkgver=19.12.0
 pkgrel=0
 pkgdesc="View and control remote desktops (RDP and VNC)"
 url="https://www.kde.org/applications/internet/krdc/"
@@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules kcmutils-dev kdnssd-dev kiconthemes-dev
 	kcompletion-dev kwallet-dev kwidgetsaddons-dev knotifyconfig-dev
 	libvncserver-dev $depends_dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/krdc-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/krdc-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -28,18 +27,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="45ce82235899e6b090fa3c2d015dfd9e80c436317fe3f288276dabad7568ec3caaba7225e2641dbc8084e71e31ee4a633cc91e6bc5dd9d91676fd4f5f7bc9db3  krdc-19.08.2.tar.xz"
+sha512sums="0e8dcf72b80c8797ae66fa6e7b6d650389218c2fdddba4b3f16869b204aef2141ea3d85c4ed30b256cd276a459b4e2252e4435a9ddcea666ae0270f20e790970  krdc-19.12.0.tar.xz"
diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD
index 0a5a81798..d64205f64 100644
--- a/user/ktorrent/APKBUILD
+++ b/user/ktorrent/APKBUILD
@@ -29,7 +29,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
diff --git a/user/libktorrent/APKBUILD b/user/libktorrent/APKBUILD
index c226584a7..1ab72541a 100644
--- a/user/libktorrent/APKBUILD
+++ b/user/libktorrent/APKBUILD
@@ -11,7 +11,7 @@ license="LGPL-2.1+"
 depends=""
 depends_dev="qt5-qtbase-dev karchive-dev kcrash-dev kio-dev solid-dev gmp-dev
 	boost-dev qca-dev libgcrypt-dev"
-makedepends="cmake extra-cmake-modules $depends_dev ki18n-dev"
+makedepends="cmake extra-cmake-modules $depends_dev doxygen ki18n-dev"
 subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.kde.org/stable/ktorrent/5.1.2/libktorrent-$pkgver.tar.xz"
 
@@ -26,7 +26,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }