Commit 87c887f4 authored by K900's avatar K900
Browse files

kdePackages: Gear 25.12.3 -> 26.04

parent 0a542217
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ mkKdeDerivation rec {
  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit pname version;
    src = sources.${pname};
    hash = "sha256-aGpmkuw7Y0PRFp0+0ozv5/A80O2T9lMN9SJfKfExx/o=";
    hash = "sha256-XbFbS8zNcrj8T2Av67f9JFAgheso9WW6flr3FabhL4I=";
  };

  extraNativeBuildInputs = [
@@ -31,7 +31,4 @@ mkKdeDerivation rec {
    corrosion
    qcoro
  ];

  # FIXME: work around Qt 6.10 cmake API changes
  cmakeFlags = [ "-DQT_FIND_PRIVATE_MODULES=1" ];
}
+0 −3
Original line number Diff line number Diff line
{
  lib,
  mkKdeDerivation,
  libkcompactdisc,
  cdparanoia,
  flac,
  libogg,
@@ -21,8 +20,6 @@ mkKdeDerivation {
  ];

  extraBuildInputs = [
    libkcompactdisc

    cdparanoia
    flac
    libogg
+3 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@
  kwordquiz = callPackage ./kwordquiz { };
  libgravatar = callPackage ./libgravatar { };
  libkcddb = callPackage ./libkcddb { };
  libkcompactdisc = callPackage ./libkcompactdisc { };
  libkdcraw = callPackage ./libkdcraw { };
  libkdegames = callPackage ./libkdegames { };
  libkdepim = callPackage ./libkdepim { };
@@ -232,6 +231,9 @@
  pim-data-exporter = callPackage ./pim-data-exporter { };
  pim-sieve-editor = callPackage ./pim-sieve-editor { };
  pimcommon = callPackage ./pimcommon { };
  plasma-camera = callPackage ./plasma-camera { };
  plasma-phonebook = callPackage ./plasma-phonebook { };
  plasma-settings = callPackage ./plasma-settings { };
  plasmatube = callPackage ./plasmatube { };
  poxml = callPackage ./poxml { };
  qmlkonsole = callPackage ./qmlkonsole { };
+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@
  pkg-config,
  wayland,
  wayland-protocols,
  libei,
  libevdev,
  libfakekey,
}:
mkKdeDerivation {
@@ -32,6 +34,8 @@ mkKdeDerivation {
    qtmultimedia
    wayland
    wayland-protocols
    libei
    libevdev
    libfakekey
  ];

+2 −8
Original line number Diff line number Diff line
diff --git a/samba/filepropertiesplugin/authhelper.cpp b/samba/filepropertiesplugin/authhelper.cpp
index b45b25f..b71554f 100644
--- a/samba/filepropertiesplugin/authhelper.cpp
+++ b/samba/filepropertiesplugin/authhelper.cpp
--- a/samba/filepropertiesplugin/kauth/authhelper.cpp
+++ b/samba/filepropertiesplugin/kauth/authhelper.cpp
@@ -50,7 +50,7 @@ ActionReply AuthHelper::isuserknown(const QVariantMap &args)
     }
 
@@ -29,8 +27,6 @@ index b45b25f..b71554f 100644
     p.setArguments({QStringLiteral("--append"), QStringLiteral("--groups"), group, user.value()});
 #else
 #error "Platform lacks group management support. Please add support."
diff --git a/samba/filepropertiesplugin/groupmanager.cpp b/samba/filepropertiesplugin/groupmanager.cpp
index 948f428..f25e549 100644
--- a/samba/filepropertiesplugin/groupmanager.cpp
+++ b/samba/filepropertiesplugin/groupmanager.cpp
@@ -18,7 +18,7 @@ GroupManager::GroupManager(QObject *parent)
@@ -42,8 +38,6 @@ index 948f428..f25e549 100644
         proc->setArguments({QStringLiteral("--debuglevel=0"),
                             QStringLiteral("--suppress-prompt"),
                             QStringLiteral("--verbose"),
diff --git a/samba/filepropertiesplugin/usermanager.cpp b/samba/filepropertiesplugin/usermanager.cpp
index 3be3b8c..66fd965 100644
--- a/samba/filepropertiesplugin/usermanager.cpp
+++ b/samba/filepropertiesplugin/usermanager.cpp
@@ -134,7 +134,7 @@ bool UserManager::canManageSamba() const
Loading