push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,43 @@
{
mkDerivation,
bison,
extra-cmake-modules,
flex,
kconfig,
kcoreaddons,
kcrash,
kdbusaddons,
kdoctools,
ki18n,
kwindowsystem,
qtbase,
shared-mime-info,
}:
mkDerivation {
pname = "kservice";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
propagatedNativeBuildInputs = [
bison
flex
];
buildInputs = [
kcrash
kdbusaddons
ki18n
kwindowsystem
qtbase
];
propagatedBuildInputs = [
kconfig
kcoreaddons
];
propagatedUserEnvPkgs = [ shared-mime-info ]; # for kbuildsycoca5
patches = [
./qdiriterator-follow-symlinks.patch
./no-canonicalize-path.patch
];
}

View File

@@ -0,0 +1,13 @@
Index: kservice-5.21.0/src/sycoca/vfolder_menu.cpp
===================================================================
--- kservice-5.21.0.orig/src/sycoca/vfolder_menu.cpp
+++ kservice-5.21.0/src/sycoca/vfolder_menu.cpp
@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &
}
if (!relative) {
- QString resolved = QDir(dir).canonicalPath();
+ QString resolved = QDir::cleanPath(dir);
if (!resolved.isEmpty()) {
dir = resolved;
}

View File

@@ -0,0 +1,13 @@
diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
index b125299..0682b90 100644
--- a/src/sycoca/kbuildsycoca.cpp
+++ b/src/sycoca/kbuildsycoca.cpp
@@ -207,7 +207,7 @@ bool KBuildSycoca::build()
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
qCDebug(SYCOCA) << "Looking for subdir" << m_resourceSubdir << "=>" << dirs;
for (const QString &dir : dirs) {
- QDirIterator it(dir, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
const QString filePath = it.next();
Q_ASSERT(filePath.startsWith(dir)); // due to the line below...