Typo in the changelog...

1 files changed, 45 insertions, 28 deletions

diff --git a/libreoffice/build/libreoffice36.SlackBuild b/libreoffice/build/libreoffice36.SlackBuild
index 471c325c..3c28dac3 100755
--- a/libreoffice/build/libreoffice36.SlackBuild
+++ b/libreoffice/build/libreoffice36.SlackBuild
@@ -110,6 +110,13 @@
 #             * Update.
 # 3.5.3-1:    03/may/2012 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 3.5.3-3:    08/may/2012 by Eric Hameleers <alien@slackware.com>
+#             * Fix general input/output error on save/open of a
+#               password-protected file
+# 3.5.3-4:    17/may/2012 by Eric Hameleers <alien@slackware.com>
+#             * I accidentally had the download of .oxt files commented out.
+#               Also, LO would not start on secondary monitor, see bug
+#               https://bugs.freedesktop.org/show_bug.cgi?id=49365
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -121,7 +128,7 @@
 
 PRGNAM=libreoffice
 PRGNAM2=mozplugin
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
 TAG=${TAG:-alien}
 
 # SRCVER is the variable you control. It can be one of:
@@ -510,26 +517,26 @@ SOURCE[99]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[99]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 
 
-## Additional dictionaries I'd like to have installed:
-#SOURCE[110]="$SRCDIR/sources/dict-en-US.oxt"
-#SRCURL[110]="http://extensions.services.openoffice.org/e-files/1470/1/en_US.oxt"
-#SOURCE[111]="$SRCDIR/sources/dict-en-GB.oxt"
-#SRCURL[111]="http://numbertext.org/tmp/dict-en.oxt"
-#SOURCE[112]="$SRCDIR/sources/dict-es.oxt"
-##SRCURL[112]="http://extensions.services.openoffice.org/e-files/2979/3/es_ES.oxt"
-#SRCURL[112]="http://extensions.services.openoffice.org/e-files/1639/1/es_ANY.oxt"
-#SOURCE[113]="$SRCDIR/sources/dict-fr.oxt"
-#SRCURL[113]="http://extensions.services.openoffice.org/e-files/3554/3/ooo-dictionnaire-fr-moderne-v4.0.oxt"
-#SOURCE[114]="$SRCDIR/sources/dict-nl.oxt"
-#SRCURL[114]="http://extensions.services.openoffice.org/e-files/1456/6/nl-dict-v2.00g.oxt"
-#SOURCE[115]="$SRCDIR/sources/dict-it.oxt"
-#SRCURL[115]="http://extensions.services.openoffice.org/e-files/1064/0/dict-it-IT_and_Latin_2010-08-23.oxt"
-#SOURCE[116]="$SRCDIR/sources/dict-de.oxt"
-#SRCURL[116]="http://extensions.services.openoffice.org/e-files/1075/8/dict-de_DE-frami_2010-12-04.oxt"
-#SOURCE[117]="$SRCDIR/sources/dict-pl.oxt"
-#SRCURL[117]="http://extensions.services.openoffice.org/e-files/806/4/pl-dict.oxt"
-#SOURCE[118]="$SRCDIR/sources/dict-sv.oxt"
-#SRCURL[118]="http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan/releases/1.46/ooo_swedish_dict_1.46.oxt"
+# Additional dictionaries I'd like to have installed:
+SOURCE[100]="$SRCDIR/sources/dict-en-US.oxt"
+SRCURL[100]="http://extensions.services.openoffice.org/e-files/1470/1/en_US.oxt"
+SOURCE[101]="$SRCDIR/sources/dict-en-GB.oxt"
+SRCURL[101]="http://numbertext.org/tmp/dict-en.oxt"
+SOURCE[102]="$SRCDIR/sources/dict-es.oxt"
+#SRCURL[102]="http://extensions.services.openoffice.org/e-files/2979/3/es_ES.oxt"
+SRCURL[102]="http://extensions.services.openoffice.org/e-files/1639/1/es_ANY.oxt"
+SOURCE[103]="$SRCDIR/sources/dict-fr.oxt"
+SRCURL[103]="http://extensions.services.openoffice.org/e-files/3554/3/ooo-dictionnaire-fr-moderne-v4.0.oxt"
+SOURCE[104]="$SRCDIR/sources/dict-nl.oxt"
+SRCURL[104]="http://extensions.services.openoffice.org/e-files/1456/6/nl-dict-v2.00g.oxt"
+SOURCE[105]="$SRCDIR/sources/dict-it.oxt"
+SRCURL[105]="http://extensions.services.openoffice.org/e-files/1064/0/dict-it-IT_and_Latin_2010-08-23.oxt"
+SOURCE[106]="$SRCDIR/sources/dict-de.oxt"
+SRCURL[106]="http://extensions.services.openoffice.org/e-files/1075/8/dict-de_DE-frami_2010-12-04.oxt"
+SOURCE[107]="$SRCDIR/sources/dict-pl.oxt"
+SRCURL[107]="http://extensions.services.openoffice.org/e-files/806/4/pl-dict.oxt"
+SOURCE[108]="$SRCDIR/sources/dict-sv.oxt"
+SRCURL[108]="http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan/releases/1.46/ooo_swedish_dict_1.46.oxt"
 
 
 # Use the src_checkout() function if no downloadable tarball exists.
@@ -740,6 +747,15 @@ cat $SRCDIR/hsqldb.jdk7.patch | patch -p1 --verbose \
 # 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:
@@ -913,12 +929,12 @@ make DESTDIR=$PKG distro-pack-install \
 # Remove cruft:
 rm -f $PKG/gid_Module*
 
-# Copy the omitted math file into the package (seems that my packages never
-# shipped with a functional math module???)
-if [ ! -f $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/math.xcd ]
-then
-  cp -a postprocess/unxl*.pro/misc/math.xcd $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/
-fi
+## Copy the omitted math file into the package (seems that my packages never
+## shipped with a functional math module???)
+#if [ ! -f $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/math.xcd ]
+#then
+#  cp -a postprocess/unxl*.pro/misc/math.xcd $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/
+#fi
 
 ## Move the SDK files to sane locations:
 #mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/sdk
@@ -1047,7 +1063,8 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
       -o -type d -name "${lolang}" \
       -o -path "*/autocorr/*" -name "*${lolang}.dat" \
       -o -path "*/resource/*" -name "*${lolang}.res" \
-      -o -path "*/registry/*" -name "*${lolang}.xcd" \
+      -o -path "*/registry/*" -name "*_${lolang}.xcd" \
+      -o -path "*/registry/*" -name "*-${lolang}.xcd" \
       -o -name "Lang_*${lolang}.xba" \
       -o -name "Langpack-${lolang}.xcu" \
       -o -name "*${lolang}.oxt") \