Commit 309af598 authored by K900's avatar K900
Browse files

kdePackages: Frameworks 6.16 -> 6.17 

A bunch of patches got upstreamed. Yay.
parent 42ec6658

pkgs/kde/frameworks/kpackage/default.nix

+0 −3
Original line number Diff line number Diff line
@@ -2,8 +2,5 @@ 
mkKdeDerivation {

  pname = "kpackage";



  # Follow symlinks when resolving packages

  # FIXME(later): upstream

  patches = [ ./follow-symlinks.patch ];

  meta.mainProgram = "kpackagetool6";

}

pkgs/kde/frameworks/kpackage/follow-symlinks.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp

index 9dbd1f6..c50a6e5 100644

--- a/src/kpackage/packageloader.cpp

+++ b/src/kpackage/packageloader.cpp

@@ -128,7 +128,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,

     }



     for (auto const &plugindir : std::as_const(paths)) {

-        QDirIterator it(plugindir, QStringList{QStringLiteral("metadata.json")}, QDir::Files, QDirIterator::Subdirectories);

+        QDirIterator it(plugindir, QStringList{QStringLiteral("metadata.json")}, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);

         std::unordered_set<QString> dirs;

         while (it.hasNext()) {

             it.next();

pkgs/kde/frameworks/kservice/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -2,10 +2,8 @@ 
mkKdeDerivation {

  pname = "kservice";



  # FIXME(later): upstream

  # FIXME(later): the whole sycoca situation is very bad

  patches = [

    # follow symlinks when generating sycoca

    ./qdiriterator-follow-symlinks.patch

    # explode less when sycoca is deleted

    ./handle-sycoca-deletion.patch

  ];

pkgs/kde/frameworks/kservice/qdiriterator-follow-symlinks.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
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...

pkgs/kde/frameworks/solid/default.nix

+0 −5
Original line number Diff line number Diff line
@@ -8,11 +8,6 @@ 
mkKdeDerivation {

  pname = "solid";



  patches = [

    # Also search /run/wrappers for mount/umount

    ./fix-search-path.patch

  ];



  extraNativeBuildInputs = [

    qttools

    bison