diff options
| author |   Eric Hameleers <alien@slackware.com> | 2015-11-19 22:13:18 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2015-11-19 22:13:18 +0000 |
| commit | e32c09d36d2d121f6501a3206805a956e24546ed (patch) | |
| tree | 616ece58a405b1d2dc91561bdd0c42916d2b7dd2 /libreoffice | |
| parent | a313552fe3a119f5d826a67b627af66b5b07843b (diff) | |
| download | asb-e32c09d36d2d121f6501a3206805a956e24546ed.tar.gz asb-e32c09d36d2d121f6501a3206805a956e24546ed.tar.xz | |
libreoffice: disable the sc_ucalc unittest... can't produce a working patch.
Diffstat (limited to 'libreoffice')
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 6 | ||||
| -rwxr-xr-x | libreoffice/build/libreoffice50.SlackBuild | 6 | ||||
| -rwxr-xr-x | libreoffice/build/libreoffice51.SlackBuild | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index 4cafd013..1f402bd1 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -996,9 +996,9 @@ echo Building ... # Apply our own (or borrowed) patches. if [ "$P1" != "--oldbuild" ]; then touch $OUTPUT/patch-$PRGNAM.log - ## Remove failing unit test: - #cat $SRCDIR/patches/libreoffice5.failing_unittest.patch \ - # | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log + # Disable failing unit test - bug is fixed in master, expected in LO 5.1: + cat $SRCDIR/patches/libreoffice5.failing_unittest.patch \ + | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log # Temporarily disable another failing unit test: sed -i -e /CppunitTest_sw_ooxmlimport/d sw/Module_sw.mk diff --git a/libreoffice/build/libreoffice50.SlackBuild b/libreoffice/build/libreoffice50.SlackBuild index 4cafd013..1f402bd1 100755 --- a/libreoffice/build/libreoffice50.SlackBuild +++ b/libreoffice/build/libreoffice50.SlackBuild @@ -996,9 +996,9 @@ echo Building ... # Apply our own (or borrowed) patches. if [ "$P1" != "--oldbuild" ]; then touch $OUTPUT/patch-$PRGNAM.log - ## Remove failing unit test: - #cat $SRCDIR/patches/libreoffice5.failing_unittest.patch \ - # | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log + # Disable failing unit test - bug is fixed in master, expected in LO 5.1: + cat $SRCDIR/patches/libreoffice5.failing_unittest.patch \ + | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log # Temporarily disable another failing unit test: sed -i -e /CppunitTest_sw_ooxmlimport/d sw/Module_sw.mk diff --git a/libreoffice/build/libreoffice51.SlackBuild b/libreoffice/build/libreoffice51.SlackBuild index 4cafd013..1f402bd1 100755 --- a/libreoffice/build/libreoffice51.SlackBuild +++ b/libreoffice/build/libreoffice51.SlackBuild @@ -996,9 +996,9 @@ echo Building ... # Apply our own (or borrowed) patches. if [ "$P1" != "--oldbuild" ]; then touch $OUTPUT/patch-$PRGNAM.log - ## Remove failing unit test: - #cat $SRCDIR/patches/libreoffice5.failing_unittest.patch \ - # | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log + # Disable failing unit test - bug is fixed in master, expected in LO 5.1: + cat $SRCDIR/patches/libreoffice5.failing_unittest.patch \ + | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log # Temporarily disable another failing unit test: sed -i -e /CppunitTest_sw_ooxmlimport/d sw/Module_sw.mk |