From e89036ce6d6c71f404b76772651650acb391563d Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Sun, 1 Jun 2025 00:43:17 +0200 Subject: [PATCH] podofo: change default podofo version from 0.9 to 1.0 - update release notes 25.11 - set podofo version for the following packages: - krename: 0.9 - scribus: 0.9 -> 0.10 - calibre: 0.10 - cie-middleware-linux: 0.9 -> 0.10 - gImageReader: 0.9 -> 0.10 - horizon-eda: 0.9 -> 0.10 - Implicit podofo version changes: - pdfmixtool: 0.9 -> 1.0 --- doc/release-notes/rl-2511.section.md | 3 +++ pkgs/applications/misc/krename/default.nix | 4 ++-- pkgs/applications/office/scribus/default.nix | 4 ++-- pkgs/by-name/ca/calibre/package.nix | 8 ++++---- pkgs/by-name/ci/cie-middleware-linux/package.nix | 4 ++-- pkgs/by-name/gi/gImageReader/package.nix | 4 ++-- pkgs/by-name/ho/horizon-eda/base.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 +----- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index c50ae7739abd..eca516c7085f 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -18,6 +18,9 @@ - `base16-builder` node package has been removed due to lack of upstream maintenance. - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier. +- `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatable due to major api changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`. + Changelog: https://github.com/podofo/podofo/blob/1.0.0/CHANGELOG.md, API-Migration-Guide: https://github.com/podofo/podofo/blob/1.0.0/API-MIGRATION.md. + ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes} diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 58e81790e683..fd385e7eddfe 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -11,7 +11,7 @@ kjsembed, taglib, exiv2, - podofo, + podofo_0_9, kcrash, }: @@ -39,7 +39,7 @@ mkDerivation rec { buildInputs = [ taglib exiv2 - podofo + podofo_0_9 ]; nativeBuildInputs = [ diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 42f157f81562..d5fc795c3645 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -14,7 +14,7 @@ libxml2, pixman, pkg-config, - podofo, + podofo_0_10, poppler, poppler_data, python3, @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libxml2 pixman - podofo + podofo_0_10 poppler poppler_data pythonEnv diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 0f2b25262a63..ad0c9a0e6e59 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -21,7 +21,7 @@ optipng, piper-tts, pkg-config, - podofo, + podofo_0_10, poppler-utils, python3Packages, qt6, @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { libuchardet libusb1 piper-tts - podofo + podofo_0_10 poppler-utils qt6.qtbase qt6.qtwayland @@ -156,8 +156,8 @@ stdenv.mkDerivation (finalAttrs: { export MAGICK_LIB=${imagemagick.out}/lib export FC_INC_DIR=${fontconfig.dev}/include/fontconfig export FC_LIB_DIR=${fontconfig.lib}/lib - export PODOFO_INC_DIR=${podofo.dev}/include/podofo - export PODOFO_LIB_DIR=${podofo}/lib + export PODOFO_INC_DIR=${podofo_0_10.dev}/include/podofo + export PODOFO_LIB_DIR=${podofo_0_10}/lib export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" export PIPER_TTS_DIR=${piper-tts}/bin diff --git a/pkgs/by-name/ci/cie-middleware-linux/package.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix index 0495b82c0693..77c9528e4451 100644 --- a/pkgs/by-name/ci/cie-middleware-linux/package.nix +++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix @@ -15,7 +15,7 @@ libxml2, openssl, pcsclite, - podofo, + podofo_0_10, ghostscript, }: @@ -54,7 +54,7 @@ stdenv.mkDerivation { buildInputs = [ cryptopp fontconfig - podofo + podofo_0_10 openssl pcsclite curl diff --git a/pkgs/by-name/gi/gImageReader/package.nix b/pkgs/by-name/gi/gImageReader/package.nix index 36bdd412d35a..b3fec01f2d3d 100644 --- a/pkgs/by-name/gi/gImageReader/package.nix +++ b/pkgs/by-name/gi/gImageReader/package.nix @@ -6,7 +6,7 @@ pkg-config, libuuid, sane-backends, - podofo, + podofo_0_10, libjpeg, djvulibre, libxmlxx3, @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { libzip libuuid sane-backends - podofo + podofo_0_10 libjpeg djvulibre tesseract diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix index 31c980998aa4..d76be96824d7 100644 --- a/pkgs/by-name/ho/horizon-eda/base.nix +++ b/pkgs/by-name/ho/horizon-eda/base.nix @@ -15,7 +15,7 @@ ninja, opencascade-occt_7_6, pkg-config, - podofo, + podofo_0_10, sqlite, }: let @@ -51,7 +51,7 @@ rec { librsvg libuuid opencascade-occt - podofo + podofo_0_10 sqlite ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 884d6189fe0c..673d6f431ea5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9291,7 +9291,7 @@ with pkgs; place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; - podofo = podofo_0_9; + podofo = podofo_1_0; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; @@ -12005,10 +12005,6 @@ with pkgs; calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { }; - calibre = callPackage ../by-name/ca/calibre/package.nix { - podofo = podofo_0_10; - }; - # calico-felix and calico-node have not been packaged due to libbpf, linking issues inherit (callPackage ../applications/networking/cluster/calico { }) calico-apiserver