author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2024-06-19 07:30:58 UTC |
committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2024-06-19 07:30:58 UTC |
parent | 41d5b723c57a51064c82d2e69e71531b7ae15f63 |
.gitignore | +2 | -0 |
48322f44.patch | +28 | -0 |
PKGBUILD | +8 | -7 |
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a43258a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/src/ +/pkg/ diff --git a/48322f44.patch b/48322f44.patch new file mode 100644 index 0000000..dcda1cf --- /dev/null +++ b/48322f44.patch @@ -0,0 +1,28 @@ +From 48322f44323a1fc09305d66d9093fe6c3780709e Mon Sep 17 00:00:00 2001 +From: Kevin Ottens <kevin.ottens@enioka.com> +Date: Fri, 15 Sep 2023 09:45:58 +0200 +Subject: [PATCH] Don't crash if KMountPoint gives nothing back while checking + for CIFS + +BUG: 474451 +--- + src/ioslaves/file/file_unix.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp +index 87c47e7e74..c0bc64354d 100644 +--- a/src/ioslaves/file/file_unix.cpp ++++ b/src/ioslaves/file/file_unix.cpp +@@ -328,6 +328,9 @@ inline static time_t stat_mtime(const QT_STATBUF &buf) + static bool isOnCifsMount(const QString &filePath) + { + const auto mount = KMountPoint::currentMountPoints().findByPath(filePath); ++ if (!mount) { ++ return false; ++ } + return mount->mountType() == QStringLiteral("cifs") || mount->mountType() == QStringLiteral("smb3"); + } + +-- +GitLab + diff --git a/PKGBUILD b/PKGBUILD index 28eb3f0..1100ec9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,10 +3,10 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=kio -pkgver=5.110.0 +pkgver=5.115.0 pkgrel=2 pkgdesc='Resource and network access abstraction' -arch=(x86_64) +arch=(x86_64 'armv7h') url='https://community.kde.org/Frameworks' license=(LGPL) depends=(solid kjobwidgets kbookmarks libxslt kwallet ktextwidgets kded) @@ -17,14 +17,12 @@ optdepends=('kio-extras: extra protocols support (sftp, fish and more)' 'switcheroo-control: hybrid GPU support') groups=(kf5) source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig} - https://invent.kde.org/frameworks/kio/-/commit/48322f44.patch) -sha256sums=('228f9abcdfce1b23deacca97e9dd68d019e6b20607ddfe2295050333e90fc96b' - 'SKIP' - 'bff9696fc152c06fee2c4f21f1dc8a06c42745dbfe7fe88d47596bfb03d38220') +) validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org> prepare() { - patch -d $pkgname-$pkgver -p1 < 48322f44.patch # Fix crashes +# patch -d $pkgname-$pkgver -p1 < 48322f44.patch # Fix crashes + true } build() { @@ -38,3 +36,6 @@ build() { package() { DESTDIR="$pkgdir" cmake --install build } +sha256sums=('0f53387b5a883fcef3db10b7c1062485a314d42d9584d9119056e571568ff90b' + 'SKIP' +)