summaryrefslogtreecommitdiffstats
path: root/libreoffice
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2011-03-01 19:59:20 +0000
committer Eric Hameleers <alien@slackware.com>2011-03-01 19:59:20 +0000
commitd2e40a31f92bfd3e5a2d8450082650fd570972a9 (patch)
treee284c403d46448ed98ce8c69ea7c84d07050fa37 /libreoffice
parent0770de8c9c167bca8a455d190a67a002595663c6 (diff)
downloadasb-d2e40a31f92bfd3e5a2d8450082650fd570972a9.tar.gz
asb-d2e40a31f92bfd3e5a2d8450082650fd570972a9.tar.xz
Disable a patch to prevent compilation errors in the sw module, which appears only on 32bit Slackware... see also http://lists.freedesktop.org/archives/libreoffice/2010-October/000763.html
Diffstat (limited to 'libreoffice')
-rwxr-xr-xlibreoffice/build/libreoffice36.SlackBuild5
1 files changed, 5 insertions, 0 deletions
diff --git a/libreoffice/build/libreoffice36.SlackBuild b/libreoffice/build/libreoffice36.SlackBuild
index 62ea748a..88ad13ae 100755
--- a/libreoffice/build/libreoffice36.SlackBuild
+++ b/libreoffice/build/libreoffice36.SlackBuild
@@ -30,6 +30,7 @@
# URL: http://www.documentfoundation.org/
# Needs:
# Build-time: apache-ant,jdk,perl-archive-zip,xulrunner
+# (and removepkg seamonkey as well as seamonkey-solibs !)
# Changelog:
# 20101010-1: 10/oct/2010 by Eric Hameleers <alien@slackware.com>
# * Initial build from git. I will refine this SlackBuild, once a
@@ -607,6 +608,10 @@ cd ${PRGNAM}-build-${VERSION}${SUBVER}
# all subsequent patching to be aborted:
cp $SRCDIR/scp2-user-config-ooo3.diff patches/dev300/
+# Disable this diff to prevent error in 32-bit compilation of 'sw'
+# ( undefined reference to `ixion::formula_lexer::swap_tokens ):
+mv patches/dev300/fields-table-formula.diff{,.disabled}
+
# Add a patch to make the presenter console compile:
cp $SRCDIR/libreoffice.presenter.diff patches/hotfixes/