From 446f87696428c10835f787f3d9b5ec112d88ae2e Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 May 2025 10:57:37 +0300 Subject: [PATCH] libreoffice-fresh: 25.2.1 -> 25.2.3 --- .../libreoffice/skip-broken-tests-fresh.patch | 179 ++++++++++-------- .../office/libreoffice/src-fresh/deps.nix | 96 +++++----- .../office/libreoffice/src-fresh/help.nix | 4 +- .../office/libreoffice/src-fresh/main.nix | 4 +- .../libreoffice/src-fresh/translations.nix | 4 +- .../office/libreoffice/src-fresh/version.nix | 2 +- 6 files changed, 160 insertions(+), 129 deletions(-) diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch index e8bd4b1f95f3..47e267ca1b11 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch @@ -1,6 +1,8 @@ +diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk +index 63dc4b92b90d..fc6d83da6448 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk -@@ -69,8 +69,8 @@ endif +@@ -70,8 +70,8 @@ endif ifneq ($(DISABLE_GUI),TRUE) ifeq ($(OS),LINUX) @@ -10,6 +12,8 @@ CppunitTest_sc_tiledrendering2 \ )) endif +diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx +index 4dc1f0fe93c4..46b506131719 100644 --- a/sc/qa/extras/vba-macro-test.cxx +++ b/sc/qa/extras/vba-macro-test.cxx @@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) @@ -21,6 +25,8 @@ { u"Ranges-3.xls"_ustr, u"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"_ustr }, #endif +diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx +index 40d2c6f174de..9f540581133e 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs) @@ -32,9 +38,11 @@ m_pDoc->InsertTab(0, u"Formula"_ustr); sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. +diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx +index 17055fa287ed..aa27d6969717 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx -@@ -1347,6 +1347,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader) +@@ -1364,6 +1364,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader) #if !defined(MACOSX) CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf150606) { @@ -42,10 +50,89 @@ + createSwDoc("tdf150606-1-min.odt"); - SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); +diff --git a/sw/qa/extras/layout/layout4.cxx b/sw/qa/extras/layout/layout4.cxx +index eb9abea5a538..a2d511607a48 100644 +--- a/sw/qa/extras/layout/layout4.cxx ++++ b/sw/qa/extras/layout/layout4.cxx +@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in LTR text + createSwDoc("tdf56408-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1532,6 +1533,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in RTL text + createSwDoc("tdf56408-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1546,6 +1548,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // The fix for tdf#56408 introduced a change to line breaking between text with + // direction changes. This test verifies behavior in the trivial case, when a + // break opportunity exists at the direction change boundary. +@@ -1562,6 +1565,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify there is no crash/assertion for underflow after a number field + createSwDoc("tdf56408-after-field.fodt"); + } +@@ -1619,6 +1623,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf164907_rowHeightAtLeast) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1633,6 +1638,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +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 ++++ b/sw/qa/extras/layout/layout5.cxx +@@ -1544,6 +1544,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf144450) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf166152) + { ++ return; // fails due to missing font: Noto Sans ++ + createSwDoc("tdf166152.fodt"); + + auto* pWrtShell = getSwDocShell()->GetWrtShell(); +diff --git a/sw/qa/extras/odfexport/odfexport2.cxx b/sw/qa/extras/odfexport/odfexport2.cxx +index 2f732b3863be..d06f19954da1 100644 +--- a/sw/qa/extras/odfexport/odfexport2.cxx ++++ b/sw/qa/extras/odfexport/odfexport2.cxx +@@ -1719,6 +1719,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, +diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx +index 0f0cd9ed3403..b40b3240120c 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -4091,6 +4091,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) +@@ -3754,6 +3754,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) // toggling Formatting Marks on/off for one view should have no effect on other views CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) { @@ -54,69 +141,11 @@ SwXTextDocument* pXTextDocument = createDoc(); int nView1 = SfxLokHelper::getView(); ---- a/sw/qa/extras/layout/layout4.cxx -+++ b/sw/qa/extras/layout/layout4.cxx -@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking a first bidi portion correctly underflows in LTR text - createSwDoc("tdf56408-ltr.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -1532,6 +1532,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking a first bidi portion correctly underflows in RTL text - createSwDoc("tdf56408-rtl.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -1546,6 +1547,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // The fix for tdf#56408 introduced a change to line breaking between text with - // direction changes. This test verifies behavior in the trivial case, when a - // break opportunity exists at the direction change boundary. -@@ -1562,6 +1563,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify there is no crash/assertion for underflow after a number field - createSwDoc("tdf56408-after-field.fodt"); - } -@@ -1612,6 +1614,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf155229RowAtLeast) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions - createSwDoc("tdf157829-ltr.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -1626,6 +1629,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions - createSwDoc("tdf157829-rtl.fodt"); - auto pXmlDoc = parseLayoutDump(); ---- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -@@ -6079,6 +6079,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature) - - CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters) - { -+ return; // fails due to missing font: Noto Sans - saveAsPDF(u"tdf164106.fodt"); - - auto pPdfDocument = parsePDFExport(); +diff --git a/unoxml/qa/unit/rdftest.cxx b/unoxml/qa/unit/rdftest.cxx +index 61c556369d21..c91befbbada2 100644 --- a/unoxml/qa/unit/rdftest.cxx +++ b/unoxml/qa/unit/rdftest.cxx -@@ -962,6 +962,7 @@ +@@ -962,6 +962,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testTdf123293) CPPUNIT_TEST_FIXTURE(RDFStreamTest, testDocumentMetadataAccess) { @@ -124,13 +153,15 @@ loadFromURL(u"private:factory/swriter"_ustr); uno::Reference xDocumentMetadataAccess(mxComponent, ---- 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 +diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +index 203b9cebc1df..b07082f1e6b1 100644 +--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx ++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +@@ -6077,6 +6077,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature) - xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); - assertXPathContent(pXmlDoc, + CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters) + { ++ return; // fails due to missing font: Noto Sans + saveAsPDF(u"tdf164106.fodt"); + + auto pPdfDocument = parsePDFExport(); diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index 0d1db330eec7..f546d1ff4c59 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -147,11 +147,11 @@ md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; } { - name = "expat-2.6.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz"; - sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee"; + name = "expat-2.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz"; + sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30"; md5 = ""; - md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz"; + md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -161,11 +161,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.16.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.0.tar.xz"; - sha256 = "6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220"; + name = "fontconfig-2.16.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.1.tar.xz"; + sha256 = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a"; md5 = ""; - md5name = "6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220-fontconfig-2.16.0.tar.xz"; + md5name = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a-fontconfig-2.16.1.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -336,11 +336,11 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "Amiri-1.000.zip"; - url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; - sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; + name = "Amiri-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-1.001.zip"; + sha256 = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a"; md5 = ""; - md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; + md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { name = "ReemKufi-1.7.zip"; @@ -588,18 +588,18 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2025-02-06.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-02-06.tar.bz2"; - sha256 = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662"; + name = "language-subtag-registry-2025-03-10.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2"; + sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39"; md5 = ""; - md5name = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662-language-subtag-registry-2025-02-06.tar.bz2"; + md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2"; } { - name = "lcms2-2.16.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz"; - sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51"; + name = "lcms2-2.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz"; + sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074"; md5 = ""; - md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; + md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz"; } { name = "libassuan-3.0.2.tar.bz2"; @@ -630,18 +630,18 @@ md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz"; } { - name = "libffi-3.4.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libffi-3.4.6.tar.gz"; - sha256 = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e"; + name = "libffi-3.4.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.4.8.tar.gz"; + sha256 = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b"; md5 = ""; - md5name = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e-libffi-3.4.6.tar.gz"; + md5name = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b-libffi-3.4.8.tar.gz"; } { - name = "libgpg-error-1.51.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.51.tar.bz2"; - sha256 = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2"; + name = "libgpg-error-1.54.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.54.tar.bz2"; + sha256 = "607dcadfd722120188eca5cd07193158b9dd906b578a557817ec779bd5e16d0e"; md5 = ""; - md5name = "be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2-libgpg-error-1.51.tar.bz2"; + md5name = "607dcadfd722120188eca5cd07193158b9dd906b578a557817ec779bd5e16d0e-libgpg-error-1.54.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -679,18 +679,18 @@ md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz"; } { - name = "libxml2-2.13.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.13.6.tar.xz"; - sha256 = "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96"; + name = "libxml2-2.13.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.13.8.tar.xz"; + sha256 = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a"; md5 = ""; - md5name = "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96-libxml2-2.13.6.tar.xz"; + md5name = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a-libxml2-2.13.8.tar.xz"; } { - name = "libxslt-1.1.42.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.42.tar.xz"; - sha256 = "85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb"; + name = "libxslt-1.1.43.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.43.tar.xz"; + sha256 = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a"; md5 = ""; - md5name = "85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb-libxslt-1.1.42.tar.xz"; + md5name = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a-libxslt-1.1.43.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -700,18 +700,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-5.3.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lxml-5.3.0.tar.gz"; - sha256 = "4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f"; + name = "lxml-5.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-5.4.0.tar.gz"; + sha256 = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd"; md5 = ""; - md5name = "4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f-lxml-5.3.0.tar.gz"; + md5name = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd-lxml-5.4.0.tar.gz"; } { - name = "mariadb-connector-c-3.3.14-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.14-src.tar.gz"; - sha256 = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49"; + name = "mariadb-connector-c-3.3.15-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz"; + sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe"; md5 = ""; - md5name = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49-mariadb-connector-c-3.3.14-src.tar.gz"; + md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -861,11 +861,11 @@ md5name = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1-postgresql-14.17.tar.bz2"; } { - name = "Python-3.10.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.10.16.tar.xz"; - sha256 = "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1"; + name = "Python-3.10.17.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.10.17.tar.xz"; + sha256 = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0"; md5 = ""; - md5name = "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1-Python-3.10.16.tar.xz"; + md5name = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0-Python-3.10.17.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index 34b2679b8400..9c18721e53a3 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0r6hbhi8zxnsjk2lmyqxdyfs7vdg30d40753qnwkwk3avq8hywdf"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-help-25.2.1.2.tar.xz"; + sha256 = "1cik6bvy4nvhyxr7nsbh5nl4irfmhlcfw2kpz2pyh5zbf11d5hi7"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-help-25.2.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index 15c5531bd614..825a8f845f53 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0pdpslpzrwkxxv775v563xw78wgsk8air8sf35cca165fwjaw0c0"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-25.2.1.2.tar.xz"; + sha256 = "1pysqa31by4rhghnfyz8xbygqn6d6fjqm2py1apxkw3xa8g4cm7a"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-25.2.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index a459874601f8..a1d4104540b2 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0jyc212vdjwixrm7fllnchai8jpxqk7kk4a4wsyfbx96ap5c1gc9"; - url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-translations-25.2.1.2.tar.xz"; + sha256 = "0iqcr2snc34x19ys0317a939lflgk75ndjw6frja6a12p9625lnk"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-translations-25.2.3.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 11bfd520bcdc..0d091853804d 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"25.2.1.2" +"25.2.3.2"