Unverified Commit 0bddfc3a authored by teutat3s's avatar teutat3s
Browse files

libreoffice-still: 25.2.6.2 -> 25.8.5.2 

https://wiki.documentfoundation.org/ReleaseNotes/25.8
parent 884b1523

pkgs/applications/office/libreoffice/default.nix

+27 −21
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  fetchurl,

  fetchgit,

  fetchpatch2,

  fetchFromGitLab,

  lib,

  pam,

  python3,
@@ -39,9 +40,11 @@ 
  which,

  icu,

  boost,

  boost188,

  jdk21,

  ant,

  cups,

  libixion,

  libxtst,

  libxi,

  libxinerama,
@@ -219,6 +222,26 @@ let 
    ];

  };



  # required for libreoffice-still version 25.8.5.2

  liborcus_0_20 = liborcus.overrideAttrs {

    version = "0.20.1";



    src = fetchFromGitLab {

      owner = "orcus";

      repo = "orcus";

      rev = "0.20.1";

      hash = "sha256-+YTK0EPgGHN4yKurJjuWWrAHzgtbc1dOvtppcvuRei4=";

    };



    buildInputs = [

      boost188

      libixion

      mdds

      python3

      zlib

    ];

  };



  importVariant = f: import (./. + "/src-${variant}/${f}");

  # Update these files with:

  # nix-shell maintainers/scripts/update.nix --argstr package libreoffice-$VARIANT.unwrapped
@@ -314,26 +337,6 @@ 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";

      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" && lib.versionOlder version "26.2.1.2") [

    # Fix build with Poppler 25.10

    (fetchpatch2 {

      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/f7b0e4385108b95c134599502a7bccf0a41925c8/poppler-25.10.patch";

      hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ=";

    })

  ]

  ++ lib.optionals (variant == "collabora") [

    # Backport patch to fix build with Poppler 25.05

    (fetchpatch2 {
@@ -463,7 +466,6 @@ stdenv.mkDerivation (finalAttrs: { 
      libmspack

      libmwaw

      libodfgen

      liborcus

      libpthread-stubs

      librdf_redland

      librevenge
@@ -508,8 +510,12 @@ stdenv.mkDerivation (finalAttrs: { 
    ++ optionals withJava [

      jre'

    ]

    ++ optionals (lib.versionOlder version "26.2.1.2") [

      liborcus_0_20

    ]

    ++ optionals (lib.versionAtLeast version "26.2.1.2") [

      fast-float

      liborcus

      md4c

    ];

pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch

+0 −92
Original line number Diff line number Diff line
@@ -103,40 +103,6 @@ index eb9abea5a538..a2d511607a48 100644 
     // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions

     createSwDoc("tdf157829-rtl.fodt");

     auto pXmlDoc = parseLayoutDump();

diff --git i/sw/qa/extras/layout/layout5.cxx w/sw/qa/extras/layout/layout5.cxx

index b1b6c9cc9d23..3f920d00f996 100644

--- i/sw/qa/extras/layout/layout5.cxx

+++ w/sw/qa/extras/layout/layout5.cxx

@@ -721,6 +721,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf117028)



 CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf106390)

 {

+    return; // fails due to missing font: DejaVu Sans

     createSwDoc("tdf106390.odt");

     SwDocShell* pShell = getSwDocShell();



diff --git i/sw/qa/extras/layout/layout5.cxx w/sw/qa/extras/layout/layout5.cxx

index b1b6c9cc9d23..72990739711f 100644

--- i/sw/qa/extras/layout/layout5.cxx

+++ w/sw/qa/extras/layout/layout5.cxx

@@ -739,6 +739,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf106390)



 CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion1)

 {

+    return; // fails due to missing font: DejaVu Sans

+

     createSwDoc("table-extrusion1.odt");

     SwDocShell* pShell = getSwDocShell();



@@ -759,6 +761,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion1)



 CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion2)

 {

+    return; // fails due to missing font: DejaVu Sans

+

     createSwDoc("table-extrusion2.odt");

     SwDocShell* pShell = getSwDocShell();



diff --git a/sw/qa/extras/layout/layout5.cxx b/sw/qa/extras/layout/layout5.cxx

index 5f008a55b1c0..c6ae2a9023de 100644

--- a/sw/qa/extras/layout/layout5.cxx
@@ -199,52 +165,6 @@ index 0537b6e4f4ffdae3b094457db0034f2de8676608..8ce4deaa368f11fdc7eb36fec4e75501 
     uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);

     uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW);

     uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW);

diff --git i/sc/qa/unit/subsequent_export_test2.cxx w/sc/qa/unit/subsequent_export_test2.cxx

index 956838656b28..70b38e4d59ba 100644

--- i/sc/qa/unit/subsequent_export_test2.cxx

+++ w/sc/qa/unit/subsequent_export_test2.cxx

@@ -100,6 +100,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringXLSX)

 

 CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX)

 {

+    return;

     // this doc is configured with CalcA1 ref syntax

     createScDoc("xlsx/empty.xlsx");

 

@@ -137,6 +138,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX)

 

 CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified)

 {

+    return;

     createScDoc();

 

     ScDocument* pDoc = getScDoc();

diff --git i/sw/qa/extras/tiledrendering/tiledrendering.cxx w/sw/qa/extras/tiledrendering/tiledrendering.cxx

index 4ebc4be96149..28ebf8c0d446 100644

--- i/sw/qa/extras/tiledrendering/tiledrendering.cxx

+++ w/sw/qa/extras/tiledrendering/tiledrendering.cxx

@@ -1262,6 +1262,7 @@ static void addDarkLightThemes(const Color& rDarkColor, const Color& rLightColor

 

 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testGetViewRenderState)

 {

+    return;

     addDarkLightThemes(COL_BLACK, COL_WHITE);

     SwXTextDocument* pXTextDocument = createDoc();

     int nFirstViewId = SfxLokHelper::getView();

diff --git i/vcl/qa/cppunit/complextext.cxx w/vcl/qa/cppunit/complextext.cxx

index 9be428b59128..b5a5493c53e8 100644

--- i/vcl/qa/cppunit/complextext.cxx

+++ w/vcl/qa/cppunit/complextext.cxx

@@ -794,6 +794,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf165510)

 

 CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf154104)

 {

+    return;

+

     ScopedVclPtrInstance<VirtualDevice> pOutDev;

 

     vcl::Font aBaseFont{ u"David Libre"_ustr, u"Regular"_ustr, Size{ 0, 72 } };



diff --git i/reportdesign/qa/unit/ReportDesignBasicTests.cxx w/reportdesign/qa/unit/ReportDesignBasicTests.cxx

index 875aca028be9..41df1e3e7ab0 100644

--- i/reportdesign/qa/unit/ReportDesignBasicTests.cxx
@@ -450,15 +370,3 @@ index 7766c3aa3e76..bb00df6ba673 100644 
     vcl::filter::PDFDocument aDocument;

     load(u"tdf105093.odp", aDocument);

diff --git i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx

index b9c560f422b5..e415b1fcc807 100644

--- i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx

+++ w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx

@@ -6320,6 +6320,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTextBoxRuby)



 CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf166044ContFootnoteOnlyOnePgNum)

 {

+    return; // fails due to missing font: Noto Sans Lao

     saveAsPDF(u"tdf166044-cont-footnote-one-pgnum.fodt");



     auto pPdfDocument = parsePDFExport();

pkgs/applications/office/libreoffice/skip-broken-tests-still.patch

+0 −10
Original line number Diff line number Diff line
@@ -85,16 +85,6 @@ 
     createDoc("shape.fodt");

 

     SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();

--- a/sw/qa/extras/odfexport/odfexport2.cxx

+++ b/sw/qa/extras/odfexport/odfexport2.cxx

@@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime)

     // - Error: "2001-01-01" does not satisfy the "dateTime" type

     // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip.

     loadAndReload("midnight_redline.fodt");

+    return; // fails on aarch64

 

     xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);

     assertXPathContent(pXmlDoc,

--- a/sdext/qa/unit/pdfimport.cxx	2025-03-22 14:46:52.202082763 +0100

+++ b/sdext/qa/unit/pdfimport.cxx	2025-03-22 14:49:22.947719369 +0100

@@ -785,6 +785,7 @@

pkgs/applications/office/libreoffice/skip-broken-tests.patch

+88 −0
Original line number Diff line number Diff line
@@ -83,6 +83,40 @@ index 6cf8f22647b9..12848713771b 100644 
     createSwWebDoc("outline-level.html");

     // This was 0, HTML imported into Writer lost the outline numbering for

     // Heading 1 styles.

diff --git i/sw/qa/extras/layout/layout5.cxx w/sw/qa/extras/layout/layout5.cxx

index b1b6c9cc9d23..3f920d00f996 100644

--- i/sw/qa/extras/layout/layout5.cxx

+++ w/sw/qa/extras/layout/layout5.cxx

@@ -721,6 +721,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf117028)



 CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf106390)

 {

+    return; // fails due to missing font: DejaVu Sans

     createSwDoc("tdf106390.odt");

     SwDocShell* pShell = getSwDocShell();



diff --git i/sw/qa/extras/layout/layout5.cxx w/sw/qa/extras/layout/layout5.cxx

index b1b6c9cc9d23..72990739711f 100644

--- i/sw/qa/extras/layout/layout5.cxx

+++ w/sw/qa/extras/layout/layout5.cxx

@@ -739,6 +739,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf106390)



 CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion1)

 {

+    return; // fails due to missing font: DejaVu Sans

+

     createSwDoc("table-extrusion1.odt");

     SwDocShell* pShell = getSwDocShell();



@@ -759,6 +761,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion1)



 CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion2)

 {

+    return; // fails due to missing font: DejaVu Sans

+

     createSwDoc("table-extrusion2.odt");

     SwDocShell* pShell = getSwDocShell();



diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx

index 794b3bd16ed4..3feaadd7a20f 100644

--- a/sw/qa/extras/odfimport/odfimport.cxx
@@ -149,6 +183,28 @@ index e37df27fd817..937c12e8c4c5 100644 
     // Regression test for bidi portion line breaking where the portion layout ends with underflow,

     // but the bidi portion should not be truncated.

     createSwDoc("tdf162314.fodt");

--- i/sw/qa/extras/tiledrendering/tiledrendering.cxx

+++ w/sw/qa/extras/tiledrendering/tiledrendering.cxx

@@ -1262,6 +1262,7 @@ static void addDarkLightThemes(const Color& rDarkColor, const Color& rLightColor

 

 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testGetViewRenderState)

 {

+    return;

     addDarkLightThemes(COL_BLACK, COL_WHITE);

     SwXTextDocument* pXTextDocument = createDoc();

     int nFirstViewId = SfxLokHelper::getView();

--- i/vcl/qa/cppunit/complextext.cxx

+++ w/vcl/qa/cppunit/complextext.cxx

@@ -794,6 +794,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf165510)

 

 CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf154104)

 {

+    return;

+

     ScopedVclPtrInstance<VirtualDevice> pOutDev;

 

     vcl::Font aBaseFont{ u"David Libre"_ustr, u"Regular"_ustr, Size{ 0, 72 } };



--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx	2025-11-05 10:25:25.693126767 +0100

+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx	2025-11-05 10:27:38.216128865 +0100

@@ -5127,6 +5127,7 @@
@@ -187,3 +243,35 @@ index ef0da39f5..43caa9002 100644 
     //TODO: sc/qa/unit/data/functions/array/dubious/fods/linest.fods produces widely different

     // values when built with -ffp-contract enabled (-ffp-contract=on default on Clang 14,

     // -ffp-contract=fast default when building with optimizations on GCC) on at least aarch64

diff --git i/sc/qa/unit/subsequent_export_test2.cxx w/sc/qa/unit/subsequent_export_test2.cxx

index 956838656b28..70b38e4d59ba 100644

--- i/sc/qa/unit/subsequent_export_test2.cxx

+++ w/sc/qa/unit/subsequent_export_test2.cxx

@@ -100,6 +100,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringXLSX)

 

 CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX)

 {

+    return;

     // this doc is configured with CalcA1 ref syntax

     createScDoc("xlsx/empty.xlsx");

 

@@ -137,6 +138,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX)

 

 CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified)

 {

+    return;

     createScDoc();

 

     ScDocument* pDoc = getScDoc();

diff --git i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx

index b9c560f422b5..e415b1fcc807 100644

--- i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx

+++ w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx

@@ -6320,6 +6320,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTextBoxRuby)



 CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf166044ContFootnoteOnlyOnePgNum)

 {

+    return; // fails due to missing font: Noto Sans Lao

     saveAsPDF(u"tdf166044-cont-footnote-one-pgnum.fodt");



     auto pPdfDocument = parsePDFExport();

pkgs/applications/office/libreoffice/src-still/deps.nix

+170 −149

File changed.

Preview size limit exceeded, changes collapsed.