From 81e609e813016ffcc8af59fe311b863ea0136cc3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Oct 2025 18:23:37 +0100 Subject: [PATCH 1/3] libreoffice-fresh: Fix build The patch is part of libreoffice 25.8.2.1. --- pkgs/applications/office/libreoffice/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 213ae69d8f86..5dac65d51741 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -313,7 +313,8 @@ stdenv.mkDerivation (finalAttrs: { # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking ./readd-explicit-zlib-link.patch - + ] + ++ lib.optionals (lib.versionOlder version "25.8.2.1") [ # Backport patch to fix build with Poppler 25.09 (fetchpatch2 { url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch"; @@ -321,10 +322,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU="; }) ] - ++ lib.optionals (lib.versionAtLeast version "25.8") [ + ++ lib.optionals (lib.versionAtLeast version "25.8.2.2") [ # Fix build with Poppler 25.10 (fetchpatch2 { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/41e58e117c356af2be83993595caf61f9f30cc89/poppler-25.10.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/f7b0e4385108b95c134599502a7bccf0a41925c8/poppler-25.10.patch"; hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ="; }) ] From b6badb34ac9757d733667c24b115cab8e2c2acb9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Oct 2025 18:38:42 +0100 Subject: [PATCH 2/3] kdePackages.calligra: Fix build with Poppler 25.10 --- pkgs/kde/gear/calligra/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/kde/gear/calligra/default.nix b/pkgs/kde/gear/calligra/default.nix index 6cbdeb223aa4..b0d1e99c9b0c 100644 --- a/pkgs/kde/gear/calligra/default.nix +++ b/pkgs/kde/gear/calligra/default.nix @@ -1,6 +1,7 @@ { mkKdeDerivation, lib, + fetchpatch, boost, eigen, gsl, @@ -26,6 +27,14 @@ mkKdeDerivation { pname = "calligra"; + patches = [ + # Fix build with Poppler 25.10 + (fetchpatch { + url = "https://invent.kde.org/office/calligra/-/commit/45e8b302bce1d318f310ea13599d7ce84acc477e.patch"; + hash = "sha256-TECB3eo24+gI8TXL8gw9BIdFWqw0JBKCWpoNVqBSan8="; + }) + ]; + extraBuildInputs = [ boost eigen From c9b78f12c8bdf0fbed91aa5c46f111eaf0fa7875 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Oct 2025 18:43:12 +0100 Subject: [PATCH 3/3] libreoffice-still: actually fix build with poppler 25.10.0 --- pkgs/applications/office/libreoffice/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 5dac65d51741..8da0b046cba1 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -321,6 +321,11 @@ stdenv.mkDerivation (finalAttrs: { includes = [ "sdext/*" ]; hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU="; }) + # Fix build with Poppler 25.10 + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch"; + hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8="; + }) ] ++ lib.optionals (lib.versionAtLeast version "25.8.2.2") [ # Fix build with Poppler 25.10