uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,21 @@
{
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...