Merge pull request #173266 from andrevmatos/kde/frameworks

kde/frameworks: 5.93 -> 5.94

pkgs/applications/misc/ksmoothdock/default.nix

@@ -1,7 +1,6 @@
 { lib
 , mkDerivation
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , extra-cmake-modules
 , kactivities
@@ -10,28 +9,15 @@
 
 mkDerivation rec {
   pname = "KSmoothDock";
-  version = "6.2";
+  version = "6.3";
 
   src = fetchFromGitHub {
     owner = "dangvd";
     repo = "ksmoothdock";
     rev = "v${version}";
-    sha256 = "182x47cymgnp5xisa0xx93hmd5wrfigy8zccrr23p4r9hp8xbnam";
+    sha256 = "sha256-hO7xgjFMFrEhQs3oc2peFTjSVEDsl7Ma/TeVybEZMEk=";
   };
 
-  patches = [
-    # Fixed hard coded installation path to use CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_PREFIX instead
-    (fetchpatch {
-      url = "https://github.com/dangvd/ksmoothdock/commit/00799bef8a1c1fe61ef9274866267d9fe9194041.patch";
-      sha256 = "1nmb7gf1ggzicxz8k4fd67xhwjy404myqzjpgjym66wqxm0arni4";
-    })
-    # Pull request to fix build on Qt 5.15 https://github.com/dangvd/ksmoothdock/pull/123
-    (fetchpatch {
-      url = "https://github.com/dangvd/ksmoothdock/commit/259527aacadb0fd9110d4425b9bf41a15bedce72.patch";
-      sha256 = "12nj58v9qqrynarn3gpywih3w27mr4n51z1b8mh0rfbnd2kib8dc";
-    })
-  ];
-
   nativeBuildInputs = [ cmake extra-cmake-modules ];
 
   buildInputs = [ kactivities qtbase ];

pkgs/applications/office/semantik/default.nix

@@ -1,6 +1,7 @@
 { lib
 , mkDerivation
 , fetchFromGitLab
+, fetchpatch
 , wafHook
 , pkg-config
 , cmake
@@ -33,7 +34,14 @@ mkDerivation rec {
     sha256 = "sha256-aXOokji6fYTpaeI/IIV+5RnTE2Cm8X3WfADf4Uftkss=";
   };
 
-  patches = [ ./qt5.patch ];
+  patches = [
+    (fetchpatch {
+      name = "fix-kdelibs4support.patch";
+      url = "https://gitlab.com/ita1024/semantik/-/commit/a991265bd6e3ed6541f8ec099420bc08cc62e30c.patch";
+      sha256 = "sha256-E4XjdWfUnqhmFJs9ORznHoXMDS9zHWNXvQIKKkN4AAo=";
+    })
+    ./qt5.patch
+  ];
 
   postPatch = ''
     echo "${lib.getDev qtwebengine}"

pkgs/applications/office/semantik/qt5.patch

@@ -40,14 +40,14 @@ diff --color -ur a/wscript b/wscript
  	if not os.path.exists(specpath):
  		raise ValueError('No spec path, cannot build')
 
-@@ -196,17 +220,28 @@
+@@ -196,17 +220,29 @@
 
  	conf.env.append_value('INCLUDES_KDECORE', specpath)
 
 -	libs = ['KF5KIOCore', 'KF5Auth', 'KF5KIOWidgets',
 -		'KF5IconThemes', 'KF5ConfigWidgets', 'KF5XmlGui',
 -		'KF5CoreAddons', 'KF5ConfigGui', 'KF5ConfigCore',
--		'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi']
+-		'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi', 'KF5AuthCore']
 +	libs = {
 +            'KF5KIOCore': '@KF5KIOCore_dev@',
 +            'KF5Auth': '@KF5Auth_dev@',
@@ -61,6 +61,7 @@ diff --color -ur a/wscript b/wscript
 +            'KF5WidgetsAddons': '@KF5WidgetsAddons_dev@',
 +            'KF5I18n': '@KF5I18n_dev@',
 +            'KF5SonnetUi': '@KF5SonnetUi_dev@',
++            'KF5AuthCore': '@KF5Auth_dev@',
 +        }
 
 -	for lib in libs:
@@ -73,6 +74,6 @@ diff --color -ur a/wscript b/wscript
 -		p = '%s/qt_%s.pri' % (path, name)
 +		p = '%s/qt_%s.pri' % (mkspec_path+"/mkspecs/modules", name)
 +		print("[log] path :",path,", name : ",name)
- 		for line in Utils.readf(p).splitlines():
- 			lst = line.strip().split(' = ')
- 			if lst[0].endswith('.name'):
+ 		try:
+ 			code = Utils.readf(p)
+ 		except EnvironmentError:

pkgs/development/libraries/kde-frameworks/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.93/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.94/ -A '*.tar.xz' )

pkgs/development/libraries/kde-frameworks/kapidox.nix

@@ -1,9 +1,26 @@
-{ mkDerivation, lib, extra-cmake-modules, python3 }:
+{ mkDerivation, python3, qtbase }:
 
 mkDerivation {
   pname = "kapidox";
-  nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ];
-  postFixup = ''
-    moveToOutput bin $bin
+  nativeBuildInputs = [ python3.pkgs.setuptools qtbase ];
+
+  buildInputs = with python3.pkgs; [ jinja2 pyyaml requests ];
+
+  postPatch = ''
+    sed -i -e 's|"doxy\w\+", ||g' setup.py
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    ${python3.interpreter} setup.py build
+    runHook postBuild
   '';
+
+  installPhase = ''
+    runHook preInstall
+    ${python3.interpreter} setup.py install --prefix="$out"
+    runHook postInstall
+  '';
+
+  outputs = [ "out" ];
 }

pkgs/development/libraries/kde-frameworks/kguiaddons.nix

@@ -1,13 +1,13 @@
 { mkDerivation
 , extra-cmake-modules
-, qtbase, qtx11extras, wayland
+, qtbase, qtx11extras, wayland, plasma-wayland-protocols
 }:
 
 mkDerivation {
   pname = "kguiaddons";
 
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras wayland ];
+  buildInputs = [ qtx11extras wayland plasma-wayland-protocols ];
   propagatedBuildInputs = [ qtbase ];
 
   outputs = [ "out" "dev" ];