summaryrefslogtreecommitdiff
path: root/user/kio
diff options
context:
space:
mode:
Diffstat (limited to 'user/kio')
-rw-r--r--user/kio/APKBUILD21
-rw-r--r--user/kio/cxx17.patch21
-rw-r--r--user/kio/strcpy-ppc.patch10
3 files changed, 32 insertions, 20 deletions
diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD
index b2ae829ce..d11ea594f 100644
--- a/user/kio/APKBUILD
+++ b/user/kio/APKBUILD
@@ -1,26 +1,29 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kio
-pkgver=5.54.0
+pkgver=5.94.0
pkgrel=0
pkgdesc="Framework for data and file management"
url="https://www.kde.org/"
arch="all"
options="!checkroot !check" # Test requires X11; segfault bug #34
license="LGPL-2.1-only AND LGPL-2.1+ AND (LGPL-2.1-only OR LGPL-3.0-only)"
-depends=""
+depends="kded"
depends_dev="qt5-qtbase-dev attica-dev kbookmarks-dev kcompletion-dev
kconfig-dev kcoreaddons-dev kiconthemes-dev kitemviews-dev
kjobwidgets-dev kservice-dev kwidgetsaddons-dev solid-dev"
+docdepends="kcoreaddons-doc kservice-doc kcompletion-doc kwidgetsaddons-doc
+ kjobwidgets-doc kbookmarks-doc kitemviews-doc kxmlgui-doc solid-doc
+ kwindowsystem-doc kconfig-doc kconfigwidgets-doc kcodecs-doc kauth-doc"
makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev python3
qt5-qttools-dev doxygen graphviz karchive-dev kdbusaddons-dev ki18n-dev
- knotifications-dev kwallet-dev acl-dev"
+ knotifications-dev kwallet-dev acl-dev kded-dev krb5-dev $docdepends"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz
- strcpy-ppc.patch"
+ cxx17.patch
+ "
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -32,19 +35,17 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_QCH:BOOL=ON \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="163929bd8e6e4d3be5390090511cafd11213e476a0460e5fdcffde15181332545380ef25f6350e465dbc7f9872a6b771e891f5302af64bd3ced162b2a94a8c6d kio-5.54.0.tar.xz
-280b2a610613786e688c06f4d4b51d3b9d583472bf1941b7b5873fece31b5df0b2f8f08f8de677ebb39fc906c57a2fa50d7890105c0aeb930b82986e0b504623 strcpy-ppc.patch"
+sha512sums="acf7456ab0a3d122d8bbf6e7dbff51f958b1c6bf29f7295c21c78c5c707d5fee05b76d30e51832f35220cd08bf06a2e27c11153559b25f74b7c8f5f532f50955 kio-5.94.0.tar.xz
+a3be4ad4800ada7331a47833f51d13bc5cf47e9e6153fffff27d18462f77083221a7aa02a36c0afe57d992a5292777628c09c5443ff58ca1803ddfbc482fa745 cxx17.patch"
diff --git a/user/kio/cxx17.patch b/user/kio/cxx17.patch
new file mode 100644
index 000000000..d73e93b65
--- /dev/null
+++ b/user/kio/cxx17.patch
@@ -0,0 +1,21 @@
+G++ does not have transform_reduce until C++20, despite being part of the
+C++17 standard. This reverts the only usage of Parallelism TR2 in KIO.
+
+--- kio-5.94.0/src/filewidgets/kurlnavigator.cpp.old 2022-05-12 07:14:39.000000000 -0500
++++ kio-5.94.0/src/filewidgets/kurlnavigator.cpp 2022-06-03 01:42:48.541164895 -0500
+@@ -729,11 +729,11 @@
+ availableWidth -= m_protocols->width();
+ }
+
+- auto MinWidth = [](const KUrlNavigatorButton *button) {
+- return button->minimumWidth();
+- };
+ // Check whether buttons must be hidden at all...
+- const int requiredButtonWidth = std::transform_reduce(m_navButtons.cbegin(), m_navButtons.cend(), 0, std::plus<>(), MinWidth);
++ int requiredButtonWidth = 0;
++ for (const KUrlNavigatorButton *button : std::as_const(m_navButtons)) {
++ requiredButtonWidth += button->minimumWidth();
++ }
+
+ if (requiredButtonWidth > availableWidth) {
+ // At least one button must be hidden. This implies that the
diff --git a/user/kio/strcpy-ppc.patch b/user/kio/strcpy-ppc.patch
deleted file mode 100644
index 95f2deb9c..000000000
--- a/user/kio/strcpy-ppc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kio-5.43.0/src/ioslaves/file/sharefd_p.h.old 2018-03-09 01:13:49.473808589 -0600
-+++ kio-5.43.0/src/ioslaves/file/sharefd_p.h 2018-03-09 01:35:33.903523248 -0600
-@@ -21,6 +21,7 @@
- #include <sys/un.h>
- #include <iostream>
- #include <unistd.h>
-+#include <cstring>
- #include <sys/socket.h>
-
- // fix SOCK_NONBLOCK for e.g. macOS