diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-07-12 07:19:29 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-07-12 07:19:29 +0000 |
| commit | 8d9b5a4b08d46dac14197d6dbfa1edc6a1b1e463 (patch) | |
| tree | 4079bdcf9a0889bf55dbd85746c0cccd1b651e8a /libreoffice | |
| parent | e45cb4603f3d2732569f7c4061bf7ecd0fb15d66 (diff) | |
| download | asb-8d9b5a4b08d46dac14197d6dbfa1edc6a1b1e463.tar.gz asb-8d9b5a4b08d46dac14197d6dbfa1edc6a1b1e463.tar.xz | |
All those patches are no longer needed. In fact, the build fails because of them now.
Diffstat (limited to 'libreoffice')
| -rwxr-xr-x | libreoffice/build/libreoffice36.SlackBuild | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libreoffice/build/libreoffice36.SlackBuild b/libreoffice/build/libreoffice36.SlackBuild index d7b84211..f8089c44 100755 --- a/libreoffice/build/libreoffice36.SlackBuild +++ b/libreoffice/build/libreoffice36.SlackBuild @@ -746,21 +746,21 @@ echo Building ... # Apply our own (borrowed) patches. touch $OUTPUT/patch-$PRGNAM.log -# Fix compilation of hsqldb using java 1.7: -cat $SRCDIR/hsqldb.jdk7.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -# Fix building on armv7hl: -cat $SRCDIR/libreoffice.gcc3_linux_arm.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -# Fix general input/output error on save/open password-protected file: -cat $SRCDIR/libreoffice.nss_init.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -cat $SRCDIR/libreoffice.mozprofile.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -# LO would not start on secondary monitor (hopefully fixed in LO 3.5.4), -# see also https://bugs.freedesktop.org/show_bug.cgi?id=49365 : -cat $SRCDIR/libreoffice.multimonitor.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log +## Fix compilation of hsqldb using java 1.7: +#cat $SRCDIR/hsqldb.jdk7.patch | patch -p1 --verbose \ +# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log +## Fix building on armv7hl: +#cat $SRCDIR/libreoffice.gcc3_linux_arm.patch | patch -p1 --verbose \ +# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log +## Fix general input/output error on save/open password-protected file: +#cat $SRCDIR/libreoffice.nss_init.patch | patch -p1 --verbose \ +# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log +#cat $SRCDIR/libreoffice.mozprofile.patch | patch -p1 --verbose \ +# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log +## LO would not start on secondary monitor (hopefully fixed in LO 3.5.4), +## see also https://bugs.freedesktop.org/show_bug.cgi?id=49365 : +#cat $SRCDIR/libreoffice.multimonitor.patch | patch -p1 --verbose \ +# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log if [ -z "$SRCURL[0]" ]; then # Git build; find out what this version of LibreOffice calls itself: |