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

Merge pull request #303657 from K900/kf-6.1

kdePackages.frameworks: 6.0 -> 6.1
parents 9b816f8f 1c224142
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -122,10 +122,7 @@ class KDERepoMetadata:
            dep_graph={},
        )

        dep_specs = [
            "dependency-data-common",
            "dependency-data-kf6-qt6"
        ]
        dep_specs = ["dependency-data-stable-kf6-qt6"]
        dep_graph = collections.defaultdict(set)

        for spec in dep_specs:
+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@
  ebook_tools,
  exiv2,
  ffmpeg,
  kcodecs,
  kconfig,
  kdegraphics-mobipocket,
  libappimage,
@@ -17,5 +18,5 @@ mkKdeDerivation {
  patches = [./cmake-install-paths.patch];

  extraNativeBuildInputs = [pkg-config];
  extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kconfig kdegraphics-mobipocket libappimage];
  extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kcodecs kconfig kdegraphics-mobipocket libappimage];
}
+2 −0
Original line number Diff line number Diff line
{
  mkKdeDerivation,
  qtdeclarative,
  qttools,
  sonnet,
}:
mkKdeDerivation {
  pname = "qqc2-desktop-style";

  extraNativeBuildInputs = [qttools];
  extraBuildInputs = [qtdeclarative];
  extraPropagatedBuildInputs = [sonnet];
}
+4 −1
Original line number Diff line number Diff line
{mkKdeDerivation}:
mkKdeDerivation {
  pname = "kompare";
  meta.mainProgram = "kompare";
  meta = {
    mainProgram = "kompare";
    broken = true; # Qt5
  };
}
+2 −0
Original line number Diff line number Diff line
@@ -6,4 +6,6 @@ mkKdeDerivation {
  pname = "libkomparediff2";

  extraBuildInputs = [qt5compat];

  meta.broken = true; # Qt5
}
Loading