diff options
Diffstat (limited to 'user/kio')
| -rw-r--r-- | user/kio/APKBUILD | 31 | ||||
| -rw-r--r-- | user/kio/cxx17.patch | 21 |
2 files changed, 21 insertions, 31 deletions
diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index d11ea594f..40a4c2591 100644 --- a/user/kio/APKBUILD +++ b/user/kio/APKBUILD @@ -1,12 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio -pkgver=5.94.0 +pkgver=5.116.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 +options="!checkroot checkx11" license="LGPL-2.1-only AND LGPL-2.1+ AND (LGPL-2.1-only OR LGPL-3.0-only)" depends="kded" depends_dev="qt5-qtbase-dev attica-dev kbookmarks-dev kcompletion-dev @@ -15,13 +15,11 @@ depends_dev="qt5-qtbase-dev attica-dev kbookmarks-dev kcompletion-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 +makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev python3 chelf qt5-qttools-dev doxygen graphviz karchive-dev kdbusaddons-dev ki18n-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 - cxx17.patch - " +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -31,21 +29,34 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ ${CMAKE_CROSSOPTS} . make + # KIO threads use a lot of stack space. We need to make sure they don't + # run out of stack space during file operations. + chelf -s 1048576 bin/libKF5KIOCore.so.5 } check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # Multiple tests require umask to be 077; example: JobTest::storedPut(). + # Disable these due to #1348: + # 44 - kiowidgets-kdirlistertest (Failed) + # 45 - kiowidgets-kdirmodeltest (Failed) + # 60 - kiofilewidgets-kfilewidgettest (Failed) + # Disable this due to known musl limitations (#1349): + # 70 - kioworker-httpheaderdispositiontest (Failed) + # These try to connect to google.com: + # 12 - kiocore-ktcpsockettest (Failed) + # 14 - kiocore-mimetypefinderjobtest (Failed) + # 28 - kiogui-openurljobtest (Failed) + (umask 077; CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(kdirlistertest|kdirmodeltest|kfilewidgettest|httpheaderdispositiontest|ktcpsockettest|mimetypefinderjobtest|openurljobtest)') } package() { make DESTDIR="$pkgdir" install } -sha512sums="acf7456ab0a3d122d8bbf6e7dbff51f958b1c6bf29f7295c21c78c5c707d5fee05b76d30e51832f35220cd08bf06a2e27c11153559b25f74b7c8f5f532f50955 kio-5.94.0.tar.xz -a3be4ad4800ada7331a47833f51d13bc5cf47e9e6153fffff27d18462f77083221a7aa02a36c0afe57d992a5292777628c09c5443ff58ca1803ddfbc482fa745 cxx17.patch" +sha512sums="a07661717846860db3a64bcead9c2b80192d8c5b8e66a25f0f83ced6b596c4e8af7eb94e68b17770f45b36b22ccbcecaef4f8590d790cf69fceb140ab9e47376 kio-5.116.0.tar.xz" diff --git a/user/kio/cxx17.patch b/user/kio/cxx17.patch deleted file mode 100644 index d73e93b65..000000000 --- a/user/kio/cxx17.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 |