summaryrefslogtreecommitdiff
path: root/user/kio
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2022-06-04 16:52:38 -0500
committerZach van Rijn <me@zv.io>2022-10-21 18:34:01 -0500
commit18d37b40a1dff05c8e75928dfdf851bf2f1acf8b (patch)
tree2aa60b0e6a8f7f95a90ef159815c7c2dc675d223 /user/kio
parentdadb2364fa576f1b9d7e01fe26de6fae296c5844 (diff)
downloadpackages-18d37b40a1dff05c8e75928dfdf851bf2f1acf8b.tar.gz
packages-18d37b40a1dff05c8e75928dfdf851bf2f1acf8b.tar.bz2
packages-18d37b40a1dff05c8e75928dfdf851bf2f1acf8b.tar.xz
packages-18d37b40a1dff05c8e75928dfdf851bf2f1acf8b.zip
user/[KDE Frameworks]: Update to 5.94.0
Many frameworks have added or removed dependencies. Documentation builds have been fixed for new tag file dependencies. * KIO: Fix build on GCC 8. * Prison: Ensure QR and DTMX barcodes are generated properly on big-endian systems. * Syndication: New framework.
Diffstat (limited to 'user/kio')
-rw-r--r--user/kio/APKBUILD16
-rw-r--r--user/kio/cxx17.patch21
-rw-r--r--user/kio/strcpy-ppc.patch10
3 files changed, 31 insertions, 16 deletions
diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD
index 2620d60d0..d11ea594f 100644
--- a/user/kio/APKBUILD
+++ b/user/kio/APKBUILD
@@ -1,23 +1,27 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kio
-pkgver=5.74.1
+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 krb5-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() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -43,5 +47,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a563b939d2bc71443c6c748ddf293fab84072efebdcea639707d7aaf2739356a906668be3dca915464ce7c81b63d7482ac024df786e04bbafcf999cde5ebc5e2 kio-5.74.1.tar.xz
-a21e700948317e460f273276aee36359b5bba8a69da1e43714169002ca4bf4538f1cc3663e823be30a0fa838d61103769afb7445caa6e8ceba29830f8532b6db 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 119f0a71f..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
-@@ -24,6 +24,7 @@
- #include <sys/un.h>
- #include <iostream>
- #include <unistd.h>
-+#include <cstring>
- #include <sys/socket.h>
- #include <string.h>
- #include <stddef.h>