mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 02:39:08 -07:00
Merge updates from master
This commit is contained in:
28
kde-frameworks/kio/files/kio-5.110.0-crash.patch
Normal file
28
kde-frameworks/kio/files/kio-5.110.0-crash.patch
Normal file
@@ -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
|
||||
|
||||
@@ -69,6 +69,8 @@ DEPEND="${RDEPEND}
|
||||
"
|
||||
PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-crash.patch" ) # KDE-bug 474451
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DKIO_NO_PUBLIC_QTCONCURRENT=ON
|
||||
@@ -1,3 +1,3 @@
|
||||
DIST postfix-3.8.1.tar.gz 4848293 BLAKE2B 83c043d6e74cbbf0c5d739838ff99d4905aa711b13483fe0f427956b962c432e6f76d9828b5c141260e210c9605ac260df950d273d5729c36666c935a3ed4518 SHA512 9eb91f2baab327de22dd55fc5ff398de74856e30be461282f41b1801301873881a8f40ce061c16e0505d51d96aaf0eff8d0ac660e5f6c70c6125133f64a4ee80
|
||||
DIST postfix-3.8.2.tar.gz 4848718 BLAKE2B 233693e088901e8ed986e34d60b55fb6b786c37868095ab914e6049c5ad6aee09f07d3b5d1f2bec64d8570e215bb15196760d30074cd8ddfaeff3897ad117b81 SHA512 1c441c95bcadee6fc038eb5cb826a686a8bd98b0c78afbc36fdcee01ca0b1c7071036542c729ac345ef8f1e6fb42211452da802e86048967ebc77774dea7752d
|
||||
DIST postfix-3.9-20230912.tar.gz 4874772 BLAKE2B a361615818b4da67e3ae7a73fc2d7aa3c7c2758adfe70e61132317c11ed76e9122903803fc1e6061ddc0123ecc7a382f4380f26ec60006c5fd906966bf0eecfa SHA512 cdbb99833e58dddc6c0adfc2857214ffa421c08fd6ac73f938b09ec8284669b50aacd54f8c218bd118d0d5e64da05030f68fa7688a44ca6be432f4f0bd31235a
|
||||
DIST postfix-3.9-20230916.tar.gz 4875152 BLAKE2B 2857e7990d139a948240d0699de1dcd2baa24d09fcc8c626a412f6479a099ab3f8fdb66f1b9aa5fbe9b6bfc8eba6f910c61de4fe6d0f635dc5617904582c3726 SHA512 2c903b20469112f8d3c8a659d576bbacaceddf61a6f42cc1f7fc75b4e84a9e41dcf6972174d96637175e01fb30a1baa347c1d436b267c914e96c517b0ff18da6
|
||||
|
||||
Reference in New Issue
Block a user