diff options
Diffstat (limited to 'user/kio')
| -rw-r--r-- | user/kio/APKBUILD | 10 | ||||
| -rw-r--r-- | user/kio/favicon-url.patch | 14 | ||||
| -rw-r--r-- | user/kio/unmounted-root.patch | 37 |
3 files changed, 59 insertions, 2 deletions
diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index 40a4c2591..89eca1dc4 100644 --- a/user/kio/APKBUILD +++ b/user/kio/APKBUILD @@ -12,6 +12,7 @@ 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" +checkdepends="udisks2" 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" @@ -19,7 +20,10 @@ 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" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz + favicon-url.patch + unmounted-root.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -59,4 +63,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a07661717846860db3a64bcead9c2b80192d8c5b8e66a25f0f83ced6b596c4e8af7eb94e68b17770f45b36b22ccbcecaef4f8590d790cf69fceb140ab9e47376 kio-5.116.0.tar.xz" +sha512sums="a07661717846860db3a64bcead9c2b80192d8c5b8e66a25f0f83ced6b596c4e8af7eb94e68b17770f45b36b22ccbcecaef4f8590d790cf69fceb140ab9e47376 kio-5.116.0.tar.xz +9dc784fe35a09b145ff3dd1e1f3b02242891c0f39b087b31fcc11ca7fc98ed900f63b91213d33affd9ef0b9982e11fd16f50cc7dd274b78f187c20ac3f08dba0 favicon-url.patch +35e2e4525ee1b8779d9e42d5e280f0ca84ee5932d633392c483d069bc9d7f52240ee1d7111cc1751f11bf6e92e344e8254d29e589ef27a30622e44a970798705 unmounted-root.patch" diff --git a/user/kio/favicon-url.patch b/user/kio/favicon-url.patch new file mode 100644 index 000000000..bcf4d432a --- /dev/null +++ b/user/kio/favicon-url.patch @@ -0,0 +1,14 @@ +Set the URL to one we control that is >65KB. + +Some KDE mirrors have dropped KCalc 4.x, which makes this test flaky. +--- kio-5.116.0/autotests/favicontest.cpp.old 2024-05-04 11:40:29.000000000 +0000 ++++ kio-5.116.0/autotests/favicontest.cpp 2025-08-10 05:32:25.751427228 +0000 +@@ -216,7 +216,7 @@ + + // Set icon URL to a >65KB file + KIO::FavIconRequestJob *job = new KIO::FavIconRequestJob(url); +- job->setIconUrl(QUrl("http://download.kde.org/Attic/4.13.2/src/kcalc-4.13.2.tar.xz")); ++ job->setIconUrl(QUrl("http://distfiles.adelielinux.org/source/adelie-kde-theme-1.0.tar.xz")); + QVERIFY(willDownload(job)); + QVERIFY(!job->exec()); + QCOMPARE(job->error(), int(KIO::ERR_WORKER_DEFINED)); diff --git a/user/kio/unmounted-root.patch b/user/kio/unmounted-root.patch new file mode 100644 index 000000000..520703d1f --- /dev/null +++ b/user/kio/unmounted-root.patch @@ -0,0 +1,37 @@ +These tests fail if / (root) is not a mountpoint. + +Upstream-URL: https://invent.kde.org/frameworks/kio/-/issues/43 + +--- kio-5.116.0/autotests/jobtest.cpp.old 2024-05-04 11:40:29.000000000 +0000 ++++ kio-5.116.0/autotests/jobtest.cpp 2025-08-10 05:18:18.789195125 +0000 +@@ -60,8 +60,7 @@ + { + KMountPoint::Ptr srcMountPoint = KMountPoint::currentMountPoints().findByPath(homeTmpDir()); + KMountPoint::Ptr destMountPoint = KMountPoint::currentMountPoints().findByPath(otherTmpDir()); +- Q_ASSERT(srcMountPoint); +- Q_ASSERT(destMountPoint); ++ if (srcMountPoint == nullptr || destMountPoint == nullptr) return true; + return srcMountPoint->mountedFrom() == destMountPoint->mountedFrom(); + } + +--- kio-5.116.0/autotests/kmountpointtest.cpp.old 2024-05-04 11:40:29.000000000 +0000 ++++ kio-5.116.0/autotests/kmountpointtest.cpp 2025-08-10 05:26:09.210428498 +0000 +@@ -56,9 +56,15 @@ + // Check findByPath + #ifdef Q_OS_UNIX + const KMountPoint::Ptr rootMountPoint = mountPoints.findByPath(QStringLiteral("/")); +- QVERIFY(rootMountPoint); +- QCOMPARE(rootMountPoint->mountPoint(), QStringLiteral("/")); +- QVERIFY(!rootMountPoint->probablySlow()); ++ if (!rootMountPoint) { ++ // This happens on Linux systems running inside chroot jails. ++ QSKIP("Couldn't find a root mountpoint, skipping those tests"); ++ return; ++ } else { ++ QVERIFY(rootMountPoint); ++ QCOMPARE(rootMountPoint->mountPoint(), QStringLiteral("/")); ++ QVERIFY(!rootMountPoint->probablySlow()); ++ } + + QT_STATBUF rootStatBuff; + QCOMPARE(QT_STAT("/", &rootStatBuff), 0); |