Unverified Commit ee783ddc authored by K900's avatar K900 Committed by GitHub
Browse files

kdePackages: Frameworks 6.16 -> 6.17 (#432198)

parents bcd7a755 e7d49759

pkgs/by-name/ko/kora-icon-theme/package.nix

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ stdenvNoCC.mkDerivation rec { 
    hicolor-icon-theme

  ];



  # breeze-icons propagates qtbase

  dontWrapQtApps = true;



  dontDropIconThemeCache = true;



  installPhase = ''

pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ stdenv.mkDerivation rec { 
    deepin-icon-theme

  ];



  # breeze-icons propagates qtbase

  dontWrapQtApps = true;



  dontDropIconThemeCache = true;



  preFixup = ''

pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ stdenvNoCC.mkDerivation rec { 


  propagatedBuildInputs = [ papirus-icon-theme ];



  # breeze-icons propagates qtbase

  dontWrapQtApps = true;



  dontDropIconThemeCache = true;



  # Remove broken symbolic link(https://github.com/linuxdeepin/developer-center/issues/11245)

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();