From 201e8fa440565e2180ec4b01c5d20e59cd1b4fb9 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Fri, 27 Jun 2025 22:38:57 -0300 Subject: [PATCH 1/5] libfreehand: init at 0.1.2 --- pkgs/by-name/li/libfreehand/package.nix | 58 +++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 pkgs/by-name/li/libfreehand/package.nix diff --git a/pkgs/by-name/li/libfreehand/package.nix b/pkgs/by-name/li/libfreehand/package.nix new file mode 100644 index 000000000000..3a7ae6f8565e --- /dev/null +++ b/pkgs/by-name/li/libfreehand/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchzip, + fetchpatch, + perl, + pkg-config, + boost, + cppunit, + doxygen, + gperf, + icu, + lcms2, + librevenge, + zlib, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libfreehand"; + version = "0.1.2"; + + src = fetchzip { + url = "https://dev-www.libreoffice.org/src/libfreehand/libfreehand-${finalAttrs.version}.tar.xz"; + hash = "sha256-0icEGnTtYveP24FbYjRB7tFW/TquSOszbqZspHAhQ7I="; + }; + + nativeBuildInputs = [ + perl + pkg-config + ]; + + buildInputs = [ + boost + cppunit + doxygen + gperf + icu + lcms2 + librevenge + zlib + ]; + + configureFlags = [ "--disable-werror" ]; + + patches = [ + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libfreehand/-/raw/main/libfreehand-0.1.2-icu-fix.patch?ref_type=heads"; + hash = "sha256-SRkcF+FRkFdueLSTOMYWo6+CCl05f0OBP6G5VrXRyCw="; + }) + ]; + + meta = { + description = "Adobe Freehand import library"; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.all; + }; +}) From 854270d45fd1e84a75da3a6dbab2dedef6fcb769 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Fri, 27 Jun 2025 22:49:42 -0300 Subject: [PATCH 2/5] libpagemaker: init at 0.0.4 --- pkgs/by-name/li/libpagemaker/package.nix | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/li/libpagemaker/package.nix diff --git a/pkgs/by-name/li/libpagemaker/package.nix b/pkgs/by-name/li/libpagemaker/package.nix new file mode 100644 index 000000000000..4edb59e9d992 --- /dev/null +++ b/pkgs/by-name/li/libpagemaker/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchzip, + fetchpatch, + pkg-config, + boost, + doxygen, + librevenge, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libpagemaker"; + version = "0.0.4"; + + src = fetchzip { + url = "https://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-${finalAttrs.version}.tar.xz"; + hash = "sha256-fAtCNbP0fI2LxTOPPh5zbdF50wWhsrfSoNFPVU9tBas="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + boost + doxygen + librevenge + ]; + + patches = [ + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libpagemaker/-/raw/main/libpagemaker-0.0.4-const-ref-exception.patch?ref_type=heads"; + hash = "sha256-yZbiLAZHgzygGetiuoKiQS010pRfZTi2CbAAxQdCZbs="; + }) + ]; + + meta = { + description = "Adobe PageMaker import library"; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.all; + }; +}) From cfde5ac44ee5b387f8480a5ca44a3bfd598fff4f Mon Sep 17 00:00:00 2001 From: arthsmn Date: Fri, 27 Jun 2025 22:59:02 -0300 Subject: [PATCH 3/5] libmspub: init at 0.1.4 --- pkgs/by-name/li/libmspub/package.nix | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/li/libmspub/package.nix diff --git a/pkgs/by-name/li/libmspub/package.nix b/pkgs/by-name/li/libmspub/package.nix new file mode 100644 index 000000000000..803be7ab7e32 --- /dev/null +++ b/pkgs/by-name/li/libmspub/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchzip, + fetchpatch, + pkg-config, + boost, + doxygen, + icu, + librevenge, + zlib, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libmspub"; + version = "0.1.4"; + + src = fetchzip { + url = "https://dev-www.libreoffice.org/src/libmspub/libmspub-${finalAttrs.version}.tar.xz"; + hash = "sha256-/6e9IGcTIZTlnsakOaSjTn3DsO9ZNQigdCCbMbrBTQE="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + boost + doxygen + icu + librevenge + zlib + ]; + + configureFlags = [ "--with-docs" ]; + + patches = [ + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libmspub/-/raw/main/buildfix.diff?ref_type=heads"; + hash = "sha256-evxEoQ0a6YHoymR+SEJwqfr7rkWp3JnsWOD1tfYfZOw="; + }) + ]; + + meta = { + description = "Microsoft Publisher import library"; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libmspub"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; + }; +}) From 5ad7e1948b171ee638a57eaaceb29601b203d60e Mon Sep 17 00:00:00 2001 From: arthsmn Date: Fri, 27 Jun 2025 23:05:43 -0300 Subject: [PATCH 4/5] libqxp: init at 0.0.2 --- pkgs/by-name/li/libqxp/package.nix | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/li/libqxp/package.nix diff --git a/pkgs/by-name/li/libqxp/package.nix b/pkgs/by-name/li/libqxp/package.nix new file mode 100644 index 000000000000..46a70cf55007 --- /dev/null +++ b/pkgs/by-name/li/libqxp/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchzip, + pkg-config, + boost, + cppunit, + doxygen, + icu, + librevenge, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libqxp"; + version = "0.0.2"; + + src = fetchzip { + url = "https://dev-www.libreoffice.org/src/libqxp/libqxp-${finalAttrs.version}.tar.xz"; + hash = "sha256-5AcZDdmowFbsl9xJ/CPXAUL5zSNu90HgX3V0V8Pt/Rw="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + boost + cppunit + doxygen + icu + librevenge + ]; + + meta = { + description = "QuarkXPress import library"; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libqxp"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ arthsmn ]; + platforms = lib.platforms.all; + }; +}) From cd9ac20af512fea5f3bfca5acc9ddf1b081474d7 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Fri, 27 Jun 2025 21:07:37 -0300 Subject: [PATCH 5/5] scribus: 1.6.4 -> 1.7.0 --- pkgs/applications/office/scribus/default.nix | 63 ++++++++++++++++---- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index d5fc795c3645..6e5fbf8b34ad 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/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 - qt5.qtimageformats - qt5.qttools + qt6.qt5compat + qt6.qtbase + 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; { - maintainers = with maintainers; [ - arthsmn - ]; + meta = { + maintainers = with lib.maintainers; [ 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; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 845e7e2c543c..2be835c35d14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 = scribus_1_5; + scribus = callPackage ../applications/office/scribus/default.nix { }; seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };