diff options
author | Vladimír Čunát <v@cunat.cz> | 2021-11-15 11:52:15 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2021-11-15 11:52:15 +0100 |
commit | 64065d76f434457073f5d255a3246658119e08ed (patch) | |
tree | 14f46f5f01349178ec35a0ec1e3b80123760c6fb /pkgs/applications/office | |
parent | 49b08e49195fdb17b5999a0695497765985c451e (diff) | |
parent | 093d80687875ed18961b47c444a1d380b3b3cd02 (diff) |
Merge #144730: branch 'staging-next'
Diffstat (limited to 'pkgs/applications/office')
4 files changed, 36 insertions, 5 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index f94beabd1f90d..fb3a6c005b719 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -78,6 +78,8 @@ in (mkDrv rec { tar -xf ${srcs.translations} ''; + patches = [ ./skip-failed-test-with-icu70.patch ]; + ### QT/KDE # # We have to resort to the ugly patching of configure.ac as it assumes that diff --git a/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch b/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch new file mode 100644 index 0000000000000..d3ae91835ada9 --- /dev/null +++ b/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch @@ -0,0 +1,29 @@ +--- a/i18npool/qa/cppunit/test_breakiterator.cxx ++++ b/i18npool/qa/cppunit/test_breakiterator.cxx +@@ -35,7 +35,7 @@ public: + void testWeak(); + void testAsian(); + void testThai(); +-#if (U_ICU_VERSION_MAJOR_NUM > 51) ++#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) + void testLao(); + #ifdef TODO + void testNorthernThai(); +@@ -52,7 +52,7 @@ public: + CPPUNIT_TEST(testWeak); + CPPUNIT_TEST(testAsian); + CPPUNIT_TEST(testThai); +-#if (U_ICU_VERSION_MAJOR_NUM > 51) ++#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) + CPPUNIT_TEST(testLao); + #ifdef TODO + CPPUNIT_TEST(testKhmer); +@@ -843,7 +843,7 @@ void TestBreakIterator::testAsian() + } + } + +-#if (U_ICU_VERSION_MAJOR_NUM > 51) ++#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) + //A test to ensure that our Lao word boundary detection is useful + void TestBreakIterator::testLao() + { diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 746e7679f380d..186f4b17d6aaa 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -9,5 +9,5 @@ attrs: "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" "--without-system-qrcodegen" ]; - patches = [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2 + patches = attrs.patches or [] ++ [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2 } diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index df6dcb58e9eaf..9ce1d26c14786 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "1"; - patch = "6"; + patch = "7"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1g1nlnmgxka1xj3800ra7j28y08k1irz7a24awx1gyjs9fci58qq"; + sha256 = "T98ICdiAM4i9E6zis0V/Cmq5+e98mNb0bMZA//xelLo="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0kblfwcnsc0pz96wxmkghmchjd31h0w1wjxlqxqbqqpz3vbr61k3"; + sha256 = "g8skm02R5nRyF09ZbL9kJqMxRqaQ0AfpletDK3AAggk="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1b28xqgvfnx62zgnxfisi58r7nhixvz35pmq8cb20ayxhdfg6v31"; + sha256 = "jAFrO4RyONhPH3H5QW0SL8Id53bBvJ7AYxSNtLhG4rQ="; }; } |