commit 7b97b0732cab44ad0a4188015cca7199cf6d2769 · pyrox.dev/nixpkgs

+33 -13

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

··· 12 endif 13 --- a/sc/qa/extras/vba-macro-test.cxx 14 +++ b/sc/qa/extras/vba-macro-test.cxx 15 - @@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) 16 // Failed: : Test change event for Range.FillRight: 17 // Tests passed: 4 18 // Tests failed: 4 ··· 32 m_pDoc->InsertTab(0, u"Formula"_ustr); 33 34 sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. 35 --- a/sw/qa/extras/layout/layout3.cxx 36 +++ b/sw/qa/extras/layout/layout3.cxx 37 - @@ -3039,6 +3041,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL) 38 - 39 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) 40 { 41 + return; // requests Noto Sans Hebrew with charset=28, which the font does not have ··· 44 // Verify that line breaking a first bidi portion correctly underflows in LTR text 45 createSwDoc("tdf56408-ltr.fodt"); 46 auto pXmlDoc = parseLayoutDump(); 47 - @@ -3053,6 +3058,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) 48 - 49 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) 50 { 51 + return; // same Noto Sans Hebrew issue ··· 53 // Verify that line breaking a first bidi portion correctly underflows in RTL text 54 createSwDoc("tdf56408-rtl.fodt"); 55 auto pXmlDoc = parseLayoutDump(); 56 - @@ -3083,6 +3090,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) 57 - 58 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash) 59 { 60 + return; // same Noto Sans Hebrew issue ··· 62 // Verify there is no crash/assertion for underflow after a number field 63 createSwDoc("tdf56408-after-field.fodt"); 64 } 65 - @@ -3121,6 +3130,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081) 66 - 67 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) 68 { 69 + return; // same Noto Sans Hebrew issue ··· 71 // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions 72 createSwDoc("tdf157829-ltr.fodt"); 73 auto pXmlDoc = parseLayoutDump(); 74 - @@ -3135,6 +3146,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) 75 - 76 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL) 77 { 78 + return; // same Noto Sans Hebrew issue ··· 82 auto pXmlDoc = parseLayoutDump(); 83 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx 84 +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx 85 - @@ -4230,6 +4232,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) 86 // toggling Formatting Marks on/off for one view should have no effect on other views 87 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) 88 { ··· 90 + 91 SwXTextDocument* pXTextDocument = createDoc(); 92 int nView1 = SfxLokHelper::getView(); 93 -

··· 12 endif 13 --- a/sc/qa/extras/vba-macro-test.cxx 14 +++ b/sc/qa/extras/vba-macro-test.cxx 15 + @@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) 16 // Failed: : Test change event for Range.FillRight: 17 // Tests passed: 4 18 // Tests failed: 4 ··· 32 m_pDoc->InsertTab(0, u"Formula"_ustr); 33 34 sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. 35 + --- a/sw/qa/extras/layout/layout.cxx 36 + +++ b/sw/qa/extras/layout/layout.cxx 37 + @@ -1347,6 +1347,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader) 38 + #if !defined(MACOSX) 39 + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf150606) 40 + { 41 + + return; // flaky 42 + + 43 + createSwDoc("tdf150606-1-min.odt"); 44 + 45 + SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); 46 --- a/sw/qa/extras/layout/layout3.cxx 47 +++ b/sw/qa/extras/layout/layout3.cxx 48 + @@ -3354,6 +3354,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL) 49 + 50 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) 51 { 52 + return; // requests Noto Sans Hebrew with charset=28, which the font does not have ··· 55 // Verify that line breaking a first bidi portion correctly underflows in LTR text 56 createSwDoc("tdf56408-ltr.fodt"); 57 auto pXmlDoc = parseLayoutDump(); 58 + @@ -3368,6 +3371,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) 59 + 60 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) 61 { 62 + return; // same Noto Sans Hebrew issue ··· 64 // Verify that line breaking a first bidi portion correctly underflows in RTL text 65 createSwDoc("tdf56408-rtl.fodt"); 66 auto pXmlDoc = parseLayoutDump(); 67 + @@ -3382,6 +3387,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) 68 + 69 + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) 70 + { 71 + + return; // same Noto Sans Hebrew issue 72 + + 73 + // The fix for tdf#56408 introduced a change to line breaking between text with 74 + // direction changes. This test verifies behavior in the trivial case, when a 75 + // break opportunity exists at the direction change boundary. 76 + @@ -3398,6 +3405,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) 77 + 78 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash) 79 { 80 + return; // same Noto Sans Hebrew issue ··· 82 // Verify there is no crash/assertion for underflow after a number field 83 createSwDoc("tdf56408-after-field.fodt"); 84 } 85 + @@ -3436,6 +3445,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081) 86 + 87 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) 88 { 89 + return; // same Noto Sans Hebrew issue ··· 91 // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions 92 createSwDoc("tdf157829-ltr.fodt"); 93 auto pXmlDoc = parseLayoutDump(); 94 + @@ -3450,6 +3461,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) 95 + 96 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL) 97 { 98 + return; // same Noto Sans Hebrew issue ··· 102 auto pXmlDoc = parseLayoutDump(); 103 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx 104 +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx 105 + @@ -4091,6 +4091,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) 106 // toggling Formatting Marks on/off for one view should have no effect on other views 107 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) 108 { ··· 110 + 111 SwXTextDocument* pXTextDocument = createDoc(); 112 int nView1 = SfxLokHelper::getView(); 113 +

+20 -20

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

··· 105 md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; 106 } 107 { 108 - name = "curl-8.10.1.tar.xz"; 109 - url = "https://dev-www.libreoffice.org/src/curl-8.10.1.tar.xz"; 110 - sha256 = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee"; 111 md5 = ""; 112 - md5name = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee-curl-8.10.1.tar.xz"; 113 } 114 { 115 name = "libe-book-0.1.3.tar.xz"; ··· 147 md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; 148 } 149 { 150 - name = "expat-2.6.3.tar.xz"; 151 - url = "https://dev-www.libreoffice.org/src/expat-2.6.3.tar.xz"; 152 - sha256 = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc"; 153 md5 = ""; 154 - md5name = "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc-expat-2.6.3.tar.xz"; 155 } 156 { 157 name = "Firebird-3.0.7.33374-0.tar.bz2"; ··· 224 md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; 225 } 226 { 227 - name = "NotoSans-v2.013.zip"; 228 - url = "https://dev-www.libreoffice.org/src/NotoSans-v2.013.zip"; 229 - sha256 = "9fd595dd701d7ea103a9ba8a9cfdcf0c35c5574ef754fecabe718eadad8bccde"; 230 md5 = ""; 231 - md5name = "9fd595dd701d7ea103a9ba8a9cfdcf0c35c5574ef754fecabe718eadad8bccde-NotoSans-v2.013.zip"; 232 } 233 { 234 - name = "NotoSerif-v2.013.zip"; 235 - url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.013.zip"; 236 - sha256 = "fb4c6c75f10365f63b5c8ad5a1864ebe46dd0c70c40d0461cb0dc1b1b7c13a35"; 237 md5 = ""; 238 - md5name = "fb4c6c75f10365f63b5c8ad5a1864ebe46dd0c70c40d0461cb0dc1b1b7c13a35-NotoSerif-v2.013.zip"; 239 } 240 { 241 name = "NotoSerifHebrew-v2.004.zip"; ··· 882 md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; 883 } 884 { 885 - name = "libvisio-0.1.7.tar.xz"; 886 - url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; 887 - sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; 888 md5 = ""; 889 - md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; 890 } 891 { 892 name = "libwpd-0.10.3.tar.xz";

··· 105 md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; 106 } 107 { 108 + name = "curl-8.11.0.tar.xz"; 109 + url = "https://dev-www.libreoffice.org/src/curl-8.11.0.tar.xz"; 110 + sha256 = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb"; 111 md5 = ""; 112 + md5name = "db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb-curl-8.11.0.tar.xz"; 113 } 114 { 115 name = "libe-book-0.1.3.tar.xz"; ··· 147 md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; 148 } 149 { 150 + name = "expat-2.6.4.tar.xz"; 151 + url = "https://dev-www.libreoffice.org/src/expat-2.6.4.tar.xz"; 152 + sha256 = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee"; 153 md5 = ""; 154 + md5name = "a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee-expat-2.6.4.tar.xz"; 155 } 156 { 157 name = "Firebird-3.0.7.33374-0.tar.bz2"; ··· 224 md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; 225 } 226 { 227 + name = "NotoSans-v2.014.zip"; 228 + url = "https://dev-www.libreoffice.org/src/NotoSans-v2.014.zip"; 229 + sha256 = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1"; 230 md5 = ""; 231 + md5name = "1dffbaf31a0a699ee2c57dfb60c1a628010425301dd076cfb485adbe017352c1-NotoSans-v2.014.zip"; 232 } 233 { 234 + name = "NotoSerif-v2.014.zip"; 235 + url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.014.zip"; 236 + sha256 = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3"; 237 md5 = ""; 238 + md5name = "6abce0a80df4ef6d5a944d60c81099364481d6a7015b0721d87bc4c16acc1fd3-NotoSerif-v2.014.zip"; 239 } 240 { 241 name = "NotoSerifHebrew-v2.004.zip"; ··· 882 md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; 883 } 884 { 885 + name = "libvisio-0.1.8.tar.xz"; 886 + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz"; 887 + sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b"; 888 md5 = ""; 889 + md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz"; 890 } 891 { 892 name = "libwpd-0.10.3.tar.xz";

+2 -2

pkgs/applications/office/libreoffice/src-fresh/help.nix

··· 1 { fetchurl, ... }: 2 fetchurl { 3 - sha256 = "1xlfs1380h9axqx37kp9nwq4bwlg08rm136ayzglaz57vx87vxsg"; 4 - url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-help-24.8.2.1.tar.xz"; 5 }

··· 1 { fetchurl, ... }: 2 fetchurl { 3 + sha256 = "04z77jzn816r19ig54fhl0p1arh3fpamn5bh2wc2v17rz73chp8y"; 4 + url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-help-24.8.3.2.tar.xz"; 5 }

+2 -2

pkgs/applications/office/libreoffice/src-fresh/main.nix

··· 1 { fetchurl, ... }: 2 fetchurl { 3 - sha256 = "1ky4ph9g7x9k68px6x4dgfnf5wqbxqabkp75pjhsj521nsp1nc5b"; 4 - url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-24.8.2.1.tar.xz"; 5 }

··· 1 { fetchurl, ... }: 2 fetchurl { 3 + sha256 = "1sa7bxxh7v26p77vj1mspynhn2l2b1vnz1mpyczhnmcxcan9nw2x"; 4 + url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-24.8.3.2.tar.xz"; 5 }

+2 -2

pkgs/applications/office/libreoffice/src-fresh/translations.nix

··· 1 { fetchurl, ... }: 2 fetchurl { 3 - sha256 = "1yvfcwj9dr2216b9fyi89849jy4lw3jg2yqrx4dm30qdn07jqf3j"; 4 - url = "https://download.documentfoundation.org/libreoffice/src/24.8.2/libreoffice-translations-24.8.2.1.tar.xz"; 5 }

··· 1 { fetchurl, ... }: 2 fetchurl { 3 + sha256 = "11qwbkn2i84g439ya5fw5by7wf4c8rs7is4k2v7yijpngrp9370a"; 4 + url = "https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-translations-24.8.3.2.tar.xz"; 5 }

+1 -1

pkgs/applications/office/libreoffice/src-fresh/version.nix

··· 1 - "24.8.2.1"

··· 1 + "24.8.3.2"