libreoffice*: skip test to fix build with icu70
This commit is contained in:
parent
084da134e9
commit
b3fd89bb20
@ -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
|
||||
|
@ -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()
|
||||
{
|
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user