Merge pull request #313978 from K900/kde-gear-24.05

KDE Gear 24.05

maintainers/scripts/kde/collect-missing-deps.py

@@ -80,13 +80,21 @@
     "plasma-desktop": {
         "scim",  # upstream is dead, not packaged in Nixpkgs
     },
+    "poppler-qt6": {
+        "gobject-introspection-1.0",  # we don't actually want to build the GTK variant
+        "gdk-pixbuf-2.0",
+        "gtk+-3.0",
+    },
     "powerdevil": {
         "DDCUtil",  # cursed, intentionally disabled
     },
     "pulseaudio-qt": {
         "Qt6Qml",  # tests only
         "Qt6Quick",
     },
+    "skladnik": {
+        "POVRay",  # too expensive to rerender all the assets
+    },
     "syntax-highlighting": {
         "XercesC",  # only used for extra validation at build time
     }

pkgs/development/python-modules/pyside6/default.nix

@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
 
   inherit (shiboken6) version src;
 
+  patches = [
+    # stripped down version of https://github.com/pyside/pyside-setup/commit/a0d68856d67ce6e178e3cfc2fccc236707e02fcd
+    # FIXME: remove in next release
+    ./qt-6.7.1.patch
+  ];
+
   sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
 
   # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS

pkgs/development/python-modules/pyside6/qt-6.7.1.patch

@@ -0,0 +1,87 @@
+--- a/PySide6/QtMultimedia/CMakeLists.txt
++++ b/PySide6/QtMultimedia/CMakeLists.txt
+@@ -12,6 +12,7 @@ ${QtMultimedia_GEN_DIR}/qaudioinput_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qaudiooutput_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qaudiosink_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qaudiosource_wrapper.cpp
++${QtMultimedia_GEN_DIR}/qaudio_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qcameraformat_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qcameradevice_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qcamera_wrapper.cpp
+@@ -28,7 +29,6 @@ ${QtMultimedia_GEN_DIR}/qmediatimerange_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qmediatimerange_interval_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qscreencapture_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qsoundeffect_wrapper.cpp
+-${QtMultimedia_GEN_DIR}/qtaudio_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qtvideo_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qvideoframe_wrapper.cpp
+ ${QtMultimedia_GEN_DIR}/qvideoframeformat_wrapper.cpp
+diff --git a/PySide6/QtMultimedia/typesystem_multimedia.xml b/PySide6/QtMultimedia/typesystem_multimedia.xml
+index dd58f41cc..d37eb15fd 100644
+--- a/PySide6/QtMultimedia/typesystem_multimedia.xml
++++ b/PySide6/QtMultimedia/typesystem_multimedia.xml
+@@ -9,7 +9,7 @@
+     <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/>
+     <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/>
+
+-    <namespace-type name="QtAudio">
++    <namespace-type name="QAudio">
+         <enum-type name="Error"/>
+         <enum-type name="State"/>
+         <enum-type name="VolumeScale"/>
+@@ -65,9 +65,6 @@
+         </modify-argument>
+       </modify-function>
+       <modify-function signature="stop()" allow-thread="true"/>
+-      <!-- FIXME PYSIDE 7: Remove this (QT6_DECL_NEW_OVERLOAD_TAIL) -->
+-      <declare-function signature="state()const" return-type="QtAudio::State"/>
+-      <declare-function signature="error()const" return-type="QtAudio::Error"/>
+     </object-type>
+
+     <object-type name="QAudioSink">
+@@ -82,9 +79,6 @@
+         </modify-argument>
+       </modify-function>
+       <modify-function signature="stop()" allow-thread="true"/>
+-      <!-- FIXME PYSIDE 7: Remove this (QT6_DECL_NEW_OVERLOAD_TAIL) -->
+-      <declare-function signature="state()const" return-type="QtAudio::State"/>
+-      <declare-function signature="error()const" return-type="QtAudio::Error"/>
+     </object-type>
+
+     <object-type name="QCamera">
+diff --git a/PySide6/glue/qtmultimedia.cpp b/PySide6/glue/qtmultimedia.cpp
+index d193b1bd3..ac8434b97 100644
+--- a/PySide6/glue/qtmultimedia.cpp
++++ b/PySide6/glue/qtmultimedia.cpp
+@@ -2,6 +2,7 @@
+ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+ // @snippet qvideoframe-bits
++#include "object.h"
+ %BEGIN_ALLOW_THREADS
+ %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1);
+ %END_ALLOW_THREADS
+@@ -23,5 +24,5 @@ const auto size = %CPPSELF.byteCount();
+
+ // @snippet qtaudio-namespace-compatibility-alias
+ Py_INCREF(pyType);
+-PyModule_AddObject(module, "QAudio", reinterpret_cast<PyObject *>(pyType));
++PyModule_AddObject(module, "QtAudio", reinterpret_cast<PyObject *>(pyType));
+ // @snippet qtaudio-namespace-compatibility-alias
+diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp
+index 625e4a405..557f130e0 100644
+--- a/libpyside/signalmanager.cpp
++++ b/libpyside/signalmanager.cpp
+@@ -813,11 +813,6 @@ static PyObject *parseArguments(const QMetaMethod &method, void **args)
+     for (qsizetype i = 0; i < argsSize; ++i) {
+         void *data = args[i+1];
+         auto param = paramTypes.at(i);
+-#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
+-        // Qt 6.7 renamed namespace "QAudio"->"QtAudio" except for signals
+-        if (param.startsWith("QAudio::"_ba))
+-            param.insert(1, 't');
+-#endif
+         Shiboken::Conversions::SpecificConverter converter(param.constData());
+         if (!converter) {
+             PyErr_SetString(PyExc_TypeError, msgCannotConvertParameter(method, i).constData());
+

pkgs/kde/default.nix

@@ -3,7 +3,6 @@
   generateSplicesForMkScope,
   makeScopeWithSplicing',
   fetchurl,
-  fetchFromGitLab,
   libsForQt5,
   qt6Packages,
   cmark,
@@ -65,6 +64,7 @@
       kdiagram = self.callPackage ./misc/kdiagram {};
       kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {};
       kirigami-addons = self.callPackage ./misc/kirigami-addons {};
+      kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {};
       kio-fuse = self.callPackage ./misc/kio-fuse {};
       ktextaddons = self.callPackage ./misc/ktextaddons {};
       kunifiedpush = self.callPackage ./misc/kunifiedpush {};

pkgs/kde/gear/accessibility-inspector/default.nix

@@ -0,0 +1,4 @@
+{mkKdeDerivation}:
+mkKdeDerivation {
+  pname = "accessibility-inspector";
+}

pkgs/kde/gear/akonadi-search/default.nix

@@ -7,7 +7,7 @@
   cargo,
   rustc,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-fY0mQiYS/CMThOVsWp8NgxpWfUph2dZ7hj7W5JUJ2J4=",
+  cargoHash ? "sha256-xT1SkW5iJy5Y9CK0CSxp+08XXjrbljxZzwYo2fEqxYE=",
 }:
 mkKdeDerivation rec {
   pname = "akonadi-search";

pkgs/kde/gear/angelfish/default.nix

@@ -8,7 +8,7 @@
   cargo,
   rustc,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-QJZJqdixPThgiKnruKetmzhbvtY/MsGy4v+OdQiEFR8=",
+  cargoHash ? "sha256-94f4DKRXcp3o6l3zbQzCpH2ZOztZMEAHa9ookPxbeDU=",
   qcoro,
 }:
 mkKdeDerivation rec {

pkgs/kde/gear/audex/default.nix

@@ -0,0 +1,10 @@
+{
+  mkKdeDerivation,
+  libcdio,
+  libcdio-paranoia,
+}:
+mkKdeDerivation {
+  pname = "audex";
+
+  extraBuildInputs = [libcdio libcdio-paranoia];
+}

pkgs/kde/gear/bovo/default.nix

@@ -1,10 +1,13 @@
 {
   mkKdeDerivation,
   qtsvg,
+  _7zz,
 }:
 mkKdeDerivation {
   pname = "bovo";
 
+  extraNativeBuildInputs = [_7zz];
   extraBuildInputs = [qtsvg];
+
   meta.mainProgram = "bovo";
 }

pkgs/kde/gear/calindori/default.nix

@@ -1,15 +1,9 @@
 {
   mkKdeDerivation,
   qtsvg,
-  qqc2-desktop-style,
 }:
 mkKdeDerivation {
   pname = "calindori";
 
-  extraBuildInputs = [
-    qtsvg
-    qqc2-desktop-style
-  ];
-  # FIXME(qt5)
-  meta.broken = true;
+  extraBuildInputs = [qtsvg];
 }

pkgs/kde/gear/default.nix

@@ -1,4 +1,5 @@
 {callPackage}: {
+  accessibility-inspector = callPackage ./accessibility-inspector {};
   akonadi = callPackage ./akonadi {};
   akonadi-calendar = callPackage ./akonadi-calendar {};
   akonadi-calendar-tools = callPackage ./akonadi-calendar-tools {};
@@ -15,6 +16,7 @@
   arianna = callPackage ./arianna {};
   ark = callPackage ./ark {};
   artikulate = callPackage ./artikulate {};
+  audex = callPackage ./audex {};
   audiocd-kio = callPackage ./audiocd-kio {};
   audiotube = callPackage ./audiotube {};
   baloo-widgets = callPackage ./baloo-widgets {};
@@ -34,6 +36,7 @@
   falkon = callPackage ./falkon {};
   ffmpegthumbs = callPackage ./ffmpegthumbs {};
   filelight = callPackage ./filelight {};
+  francis = callPackage ./francis {};
   ghostwriter = callPackage ./ghostwriter {};
   granatier = callPackage ./granatier {};
   grantlee-editor = callPackage ./grantlee-editor {};
@@ -51,6 +54,7 @@
   kalarm = callPackage ./kalarm {};
   kalgebra = callPackage ./kalgebra {};
   kalk = callPackage ./kalk {};
+  kalm = callPackage ./kalm {};
   kalzium = callPackage ./kalzium {};
   kamera = callPackage ./kamera {};
   kamoso = callPackage ./kamoso {};
@@ -112,7 +116,6 @@
   kimap = callPackage ./kimap {};
   kio-admin = callPackage ./kio-admin {};
   kio-extras = callPackage ./kio-extras {};
-  kio-extras-kf5 = callPackage ./kio-extras-kf5 {};
   kio-gdrive = callPackage ./kio-gdrive {};
   kio-zeroconf = callPackage ./kio-zeroconf {};
   kipi-plugins = callPackage ./kipi-plugins {};
@@ -236,6 +239,7 @@
   signon-kwallet-extension = callPackage ./signon-kwallet-extension {};
   skanlite = callPackage ./skanlite {};
   skanpage = callPackage ./skanpage {};
+  skladnik = callPackage ./skladnik {};
   spectacle = callPackage ./spectacle {};
   step = callPackage ./step {};
   svgpart = callPackage ./svgpart {};

pkgs/kde/gear/francis/default.nix

@@ -0,0 +1,9 @@
+{
+  mkKdeDerivation,
+  qtsvg,
+}:
+mkKdeDerivation {
+  pname = "francis";
+
+  extraBuildInputs = [qtsvg];
+}

pkgs/kde/gear/kalm/default.nix

@@ -0,0 +1,4 @@
+{mkKdeDerivation}:
+mkKdeDerivation {
+  pname = "kalm";
+}

pkgs/kde/gear/katomic/default.nix

@@ -1,5 +1,11 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  _7zz
+}:
 mkKdeDerivation {
   pname = "katomic";
+
+  extraNativeBuildInputs = [_7zz];
+
   meta.mainProgram = "katomic";
 }

pkgs/kde/gear/kblackbox/default.nix

@@ -1,10 +1,13 @@
 {
   mkKdeDerivation,
   qtsvg,
+  _7zz,
 }:
 mkKdeDerivation {
   pname = "kblackbox";
 
+  extraNativeBuildInputs = [_7zz];
   extraBuildInputs = [qtsvg];
+
   meta.mainProgram = "kblackbox";
 }

pkgs/kde/gear/kbounce/default.nix

@@ -1,10 +1,13 @@
 {
   mkKdeDerivation,
   qtsvg,
+  _7zz,
 }:
 mkKdeDerivation {
   pname = "kbounce";
 
+  extraNativeBuildInputs = [_7zz];
   extraBuildInputs = [qtsvg];
+
   meta.mainProgram = "kbounce";
 }

pkgs/kde/gear/kdepim-addons/default.nix

@@ -8,7 +8,7 @@
   corrosion,
   alpaka,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-Yt1Gxw9Q1Q108YRJoUIpeNZlGjZ7yabLW3bRO4+x6Vo=",
+  cargoHash ? "sha256-AMOgchdx9754rkGJg8IdsNgYgH8esnlrreuY5AFZlwE=",
 }:
 mkKdeDerivation rec {
   pname = "kdepim-addons";

pkgs/kde/gear/kfourinline/default.nix

@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
   qtsvg,
+  _7zz,
 }:
 mkKdeDerivation {
   pname = "kfourinline";
 
+  extraNativeBuildInputs = [_7zz];
   extraBuildInputs = [qtsvg];
 }

pkgs/kde/gear/kjumpingcube/default.nix

@@ -1,10 +1,13 @@
 {
   mkKdeDerivation,
   qtsvg,
+  _7zz,
 }:
 mkKdeDerivation {
   pname = "kjumpingcube";
 
+  extraNativeBuildInputs = [_7zz];
   extraBuildInputs = [qtsvg];
+
   meta.mainProgram = "kjumpingcube";
 }

pkgs/kde/gear/klickety/default.nix

@@ -1,5 +1,11 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  _7zz,
+}:
 mkKdeDerivation {
   pname = "klickety";
+
+  extraNativeBuildInputs = [_7zz];
+
   meta.mainProgram = "klickety";
 }

pkgs/kde/gear/klines/default.nix

@@ -1,5 +1,11 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  _7zz,
+}:
 mkKdeDerivation {
   pname = "klines";
+
+  extraNativeBuildInputs = [_7zz];
+
   meta.mainProgram = "klines";
 }

pkgs/kde/gear/kmines/default.nix

@@ -1,5 +1,11 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  _7zz,
+}:
 mkKdeDerivation {
   pname = "kmines";
+
+  extraNativeBuildInputs = [_7zz];
+
   meta.mainProgram = "kmines";
 }

pkgs/kde/gear/knavalbattle/default.nix

@@ -1,5 +1,11 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  _7zz,
+}:
 mkKdeDerivation {
   pname = "knavalbattle";
+
+  extraNativeBuildInputs = [_7zz];
+
   meta.mainProgram = "knavalbattle";
 }