scribus: 1.6.4 -> 1.7.0

pkgs/applications/office/scribus/default.nix

@@ -4,14 +4,27 @@
   cmake,
   cups,
   fetchurl,
+  fetchpatch,
   fontconfig,
   freetype,
+  graphicsmagick,
   harfbuzzFull,
   hunspell,
   lcms2,
+  libcdr,
+  libfreehand,
   libjpeg,
+  libjxl,
+  libmspub,
+  libpagemaker,
+  libqxp,
+  librevenge,
+  libsysprof-capture,
   libtiff,
+  libvisio,
+  libwpg,
   libxml2,
+  libzmf,
   pixman,
   pkg-config,
   podofo_0_10,
@@ -20,7 +33,7 @@
   python3,
   lib,
   stdenv,
-  qt5,
+  qt6,
 }:
 
 let
@@ -32,17 +45,17 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = "scribus";
 
-  version = "1.6.4";
+  version = "1.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz";
-    hash = "sha256-UzvnrwOs+qc27F96P8JWKr0gD+9coqfN7gK19E1hgp4=";
+    hash = "sha256-+lnWIh/3z/qTcjV5l+hlcBYuHhiRNza3F2/RD0jCQ/Y=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    qt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -51,37 +64,63 @@ stdenv.mkDerivation (finalAttrs: {
     cups
     fontconfig
     freetype
+    graphicsmagick
     harfbuzzFull
     hunspell
     lcms2
+    libcdr
+    libfreehand
     libjpeg
+    libjxl
+    libpagemaker
+    libqxp
+    librevenge
+    libsysprof-capture
     libtiff
+    libvisio
+    libwpg
     libxml2
+    libzmf
     pixman
     podofo_0_10
     poppler
     poppler_data
     pythonEnv
-    qt5.qtbase
+    qt6.qt5compat
-    qt5.qtimageformats
+    qt6.qtbase
-    qt5.qttools
+    qt6.qtdeclarative
+    qt6.qtimageformats
+    qt6.qtsvg
+    qt6.qttools
+  ] ++ lib.optionals libmspub.meta.available [ libmspub ];
+
+  cmakeFlags = [ (lib.cmakeBool "WANT_GRAPHICSMAGICK" true) ];
+
+  patches = [
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_qt_6.9.0.patch?h=scribus-unstable";
+      hash = "sha256-hzd9XpoVVqbwvZ40QPGBqqWkIFXug/tSojf/Ikc4nn4=";
+    })
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_poppler_25.02.0.patch?h=scribus-unstable";
+      hash = "sha256-t9xJA6KGMGAdUFyjI8OlTNilewyMr1FFM7vjHOM15Xg=";
+    })
   ];
 
-  meta = with lib; {
+  meta = {
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [ arthsmn ];
-      arthsmn
-    ];
     description = "Desktop Publishing (DTP) and Layout program";
     mainProgram = "scribus";
     homepage = "https://www.scribus.net";
     # There are a lot of licenses...
     # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
-    license = with licenses; [
+    license = with lib.licenses; [
       bsd3
       gpl2Plus
       mit
       publicDomain
     ];
+    platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin;
   };
 })

pkgs/top-level/all-packages.nix

@@ -13726,8 +13726,7 @@ with pkgs;
 
   scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { };
 
-  scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { };
+  scribus = callPackage ../applications/office/scribus/default.nix { };
-  scribus = scribus_1_5;
 
   seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };