Upgrade to 4.1.3.2, also check in some changes that I needed already for 4.1.2.3 to compile succcessfully

4 files changed, 52 insertions, 40 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index 066e8de6..96e09156 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -152,6 +152,8 @@
 #               not released to the public).
 # 4.1.2-1:    05/oct/2013 by Eric Hameleers <alien@slackware.com>
 #             * New 4.1.2 release built for Slackware 14 and newer.
+# 4.1.3-1:    01/nov/2013 by Eric Hameleers <alien@slackware.com>
+#             * New 4.1.3 release built for Slackware 14 and newer.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -177,8 +179,8 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-HEAD}
 #SRCVER=${SRCVER:-3.3.0.4}
 
-SRCVER=${SRCVER:-4.1.2}
-SUBVER=".3"
+SRCVER=${SRCVER:-4.1.3}
+SUBVER=".2"
 PKG_SUBVER=""
 
 # How many tarballs does this release consist of:
@@ -271,7 +273,7 @@ SRCURL[5]="http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?id=
 #
 
 # --- Start of section generated by gensrc_lo4.sh ---
-# External sources for libreoffice-4.1.2.3
+# External sources for libreoffice-4.1.3.2
 
 SOURCE[6]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -282,8 +284,8 @@ SRCURL[7]="http://dev-www.libreoffice.org/src/libcdr-0.0.14.tar.bz2"
 SOURCE[8]="$SRCDIR/sources/libmspub-0.0.6.tar.bz2"
 SRCURL[8]="http://dev-www.libreoffice.org/src/libmspub-0.0.6.tar.bz2"
 
-SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.10.tar.bz2"
-SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.10.tar.bz2"
+SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.11.tar.bz2"
+SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.11.tar.bz2"
 
 SOURCE[10]="$SRCDIR/sources/libvisio-0.0.31.tar.bz2"
 SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.bz2"
@@ -893,6 +895,12 @@ make DESTDIR=$PKG distro-pack-install \
 # Remove cruft:
 rm -f $PKG/gid_Module*
 
+# We will be using these variables in the remainder of the script:
+set +u
+. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+set -u
+
 if [ ! -L $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes ]; then
   mkdir -p $PKG/usr/share/${PRGNAM}/sdk
   mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes \
@@ -1063,11 +1071,6 @@ cd $BUILDDIR
 
 # Libreoffice suddenly added version numbers to the name of the wrapper script
 # as well as the to the names of icons, so I'll remove that
-# (with thanks to Fedora's David Tardon):
-set +u
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
-export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR
-set -u
 cd $WORKDIR/CustomTarget/sysui/share/libreoffice
   sed -i -e "s/^PREFIX=.*$/PREFIX=${PRGNAM}/" \
          -e "s/^ICON_PREFIX=.*$/ICON_PREFIX=${PRGNAM}/" \
diff --git a/libreoffice/build/libreoffice41.SlackBuild b/libreoffice/build/libreoffice41.SlackBuild
index 066e8de6..96e09156 100755
--- a/libreoffice/build/libreoffice41.SlackBuild
+++ b/libreoffice/build/libreoffice41.SlackBuild
@@ -152,6 +152,8 @@
 #               not released to the public).
 # 4.1.2-1:    05/oct/2013 by Eric Hameleers <alien@slackware.com>
 #             * New 4.1.2 release built for Slackware 14 and newer.
+# 4.1.3-1:    01/nov/2013 by Eric Hameleers <alien@slackware.com>
+#             * New 4.1.3 release built for Slackware 14 and newer.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -177,8 +179,8 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-HEAD}
 #SRCVER=${SRCVER:-3.3.0.4}
 
-SRCVER=${SRCVER:-4.1.2}
-SUBVER=".3"
+SRCVER=${SRCVER:-4.1.3}
+SUBVER=".2"
 PKG_SUBVER=""
 
 # How many tarballs does this release consist of:
@@ -271,7 +273,7 @@ SRCURL[5]="http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?id=
 #
 
 # --- Start of section generated by gensrc_lo4.sh ---
-# External sources for libreoffice-4.1.2.3
+# External sources for libreoffice-4.1.3.2
 
 SOURCE[6]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -282,8 +284,8 @@ SRCURL[7]="http://dev-www.libreoffice.org/src/libcdr-0.0.14.tar.bz2"
 SOURCE[8]="$SRCDIR/sources/libmspub-0.0.6.tar.bz2"
 SRCURL[8]="http://dev-www.libreoffice.org/src/libmspub-0.0.6.tar.bz2"
 
-SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.10.tar.bz2"
-SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.10.tar.bz2"
+SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.11.tar.bz2"
+SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.11.tar.bz2"
 
 SOURCE[10]="$SRCDIR/sources/libvisio-0.0.31.tar.bz2"
 SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.bz2"
@@ -893,6 +895,12 @@ make DESTDIR=$PKG distro-pack-install \
 # Remove cruft:
 rm -f $PKG/gid_Module*
 
+# We will be using these variables in the remainder of the script:
+set +u
+. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+set -u
+
 if [ ! -L $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes ]; then
   mkdir -p $PKG/usr/share/${PRGNAM}/sdk
   mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes \
@@ -1063,11 +1071,6 @@ cd $BUILDDIR
 
 # Libreoffice suddenly added version numbers to the name of the wrapper script
 # as well as the to the names of icons, so I'll remove that
-# (with thanks to Fedora's David Tardon):
-set +u
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
-export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR
-set -u
 cd $WORKDIR/CustomTarget/sysui/share/libreoffice
   sed -i -e "s/^PREFIX=.*$/PREFIX=${PRGNAM}/" \
          -e "s/^ICON_PREFIX=.*$/ICON_PREFIX=${PRGNAM}/" \
diff --git a/libreoffice/build/libreoffice42.SlackBuild b/libreoffice/build/libreoffice42.SlackBuild
index 066e8de6..96e09156 100755
--- a/libreoffice/build/libreoffice42.SlackBuild
+++ b/libreoffice/build/libreoffice42.SlackBuild
@@ -152,6 +152,8 @@
 #               not released to the public).
 # 4.1.2-1:    05/oct/2013 by Eric Hameleers <alien@slackware.com>
 #             * New 4.1.2 release built for Slackware 14 and newer.
+# 4.1.3-1:    01/nov/2013 by Eric Hameleers <alien@slackware.com>
+#             * New 4.1.3 release built for Slackware 14 and newer.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -177,8 +179,8 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-HEAD}
 #SRCVER=${SRCVER:-3.3.0.4}
 
-SRCVER=${SRCVER:-4.1.2}
-SUBVER=".3"
+SRCVER=${SRCVER:-4.1.3}
+SUBVER=".2"
 PKG_SUBVER=""
 
 # How many tarballs does this release consist of:
@@ -271,7 +273,7 @@ SRCURL[5]="http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?id=
 #
 
 # --- Start of section generated by gensrc_lo4.sh ---
-# External sources for libreoffice-4.1.2.3
+# External sources for libreoffice-4.1.3.2
 
 SOURCE[6]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -282,8 +284,8 @@ SRCURL[7]="http://dev-www.libreoffice.org/src/libcdr-0.0.14.tar.bz2"
 SOURCE[8]="$SRCDIR/sources/libmspub-0.0.6.tar.bz2"
 SRCURL[8]="http://dev-www.libreoffice.org/src/libmspub-0.0.6.tar.bz2"
 
-SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.10.tar.bz2"
-SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.10.tar.bz2"
+SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.11.tar.bz2"
+SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.11.tar.bz2"
 
 SOURCE[10]="$SRCDIR/sources/libvisio-0.0.31.tar.bz2"
 SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.bz2"
@@ -893,6 +895,12 @@ make DESTDIR=$PKG distro-pack-install \
 # Remove cruft:
 rm -f $PKG/gid_Module*
 
+# We will be using these variables in the remainder of the script:
+set +u
+. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+set -u
+
 if [ ! -L $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes ]; then
   mkdir -p $PKG/usr/share/${PRGNAM}/sdk
   mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes \
@@ -1063,11 +1071,6 @@ cd $BUILDDIR
 
 # Libreoffice suddenly added version numbers to the name of the wrapper script
 # as well as the to the names of icons, so I'll remove that
-# (with thanks to Fedora's David Tardon):
-set +u
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
-export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR
-set -u
 cd $WORKDIR/CustomTarget/sysui/share/libreoffice
   sed -i -e "s/^PREFIX=.*$/PREFIX=${PRGNAM}/" \
          -e "s/^ICON_PREFIX=.*$/ICON_PREFIX=${PRGNAM}/" \
diff --git a/libreoffice/build/libreoffice43.SlackBuild b/libreoffice/build/libreoffice43.SlackBuild
index 066e8de6..96e09156 100755
--- a/libreoffice/build/libreoffice43.SlackBuild
+++ b/libreoffice/build/libreoffice43.SlackBuild
@@ -152,6 +152,8 @@
 #               not released to the public).
 # 4.1.2-1:    05/oct/2013 by Eric Hameleers <alien@slackware.com>
 #             * New 4.1.2 release built for Slackware 14 and newer.
+# 4.1.3-1:    01/nov/2013 by Eric Hameleers <alien@slackware.com>
+#             * New 4.1.3 release built for Slackware 14 and newer.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -177,8 +179,8 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-HEAD}
 #SRCVER=${SRCVER:-3.3.0.4}
 
-SRCVER=${SRCVER:-4.1.2}
-SUBVER=".3"
+SRCVER=${SRCVER:-4.1.3}
+SUBVER=".2"
 PKG_SUBVER=""
 
 # How many tarballs does this release consist of:
@@ -271,7 +273,7 @@ SRCURL[5]="http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?id=
 #
 
 # --- Start of section generated by gensrc_lo4.sh ---
-# External sources for libreoffice-4.1.2.3
+# External sources for libreoffice-4.1.3.2
 
 SOURCE[6]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -282,8 +284,8 @@ SRCURL[7]="http://dev-www.libreoffice.org/src/libcdr-0.0.14.tar.bz2"
 SOURCE[8]="$SRCDIR/sources/libmspub-0.0.6.tar.bz2"
 SRCURL[8]="http://dev-www.libreoffice.org/src/libmspub-0.0.6.tar.bz2"
 
-SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.10.tar.bz2"
-SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.10.tar.bz2"
+SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.11.tar.bz2"
+SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.11.tar.bz2"
 
 SOURCE[10]="$SRCDIR/sources/libvisio-0.0.31.tar.bz2"
 SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.bz2"
@@ -893,6 +895,12 @@ make DESTDIR=$PKG distro-pack-install \
 # Remove cruft:
 rm -f $PKG/gid_Module*
 
+# We will be using these variables in the remainder of the script:
+set +u
+. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+set -u
+
 if [ ! -L $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes ]; then
   mkdir -p $PKG/usr/share/${PRGNAM}/sdk
   mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes \
@@ -1063,11 +1071,6 @@ cd $BUILDDIR
 
 # Libreoffice suddenly added version numbers to the name of the wrapper script
 # as well as the to the names of icons, so I'll remove that
-# (with thanks to Fedora's David Tardon):
-set +u
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
-export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR
-set -u
 cd $WORKDIR/CustomTarget/sysui/share/libreoffice
   sed -i -e "s/^PREFIX=.*$/PREFIX=${PRGNAM}/" \
          -e "s/^ICON_PREFIX=.*$/ICON_PREFIX=${PRGNAM}/" \