Document how to build the dictionaries. Still have to find out how to install them properly

4 files changed, 52 insertions, 32 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index c4fb24a5..ce8359e1 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -721,7 +721,8 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
 # Enter the build directory:
-cd $TMP/tmp-$PRGNAM/libreoffice-${VERSION}${SUBVER}
+BUILDDIR="$TMP/tmp-$PRGNAM/libreoffice-${VERSION}${SUBVER}"
+cd $BUILDDIR
 
 echo Building ...
 
@@ -912,6 +913,12 @@ echo "Starting $PRGNAM compilation (takes a long time)..."
 #./bootstrap 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 make VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 
+# Compile the dictionaries from source.
+# Resulting dict-*.oxt are placed in ./solver/unxlngx6.pro/pck/ :
+# **TODO** figure out how to install these? Looks like the install line below
+#          does not actually install the dictionaries.
+make -C dictionaries VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+
 # Install the lot:
 echo "Starting the packaging stage for $PRGNAM..."
 make DESTDIR=$PKG distro-pack-install \
@@ -1081,9 +1088,9 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
 fi # End of splitting out language packs
 
 # Back to base:
-cd $TMP/tmp-$PRGNAM/build
+cd $BUILDDIR
 
-# Libreoffice suddenly adds version numbers to the name of the wrapper script
+# 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):
 cd sysui/unxl*.pro/misc/libreoffice
@@ -1093,9 +1100,7 @@ cd sysui/unxl*.pro/misc/libreoffice
          -e "s/^office_prefix=.*$/office_prefix=\/usr\/lib${LIBDIRSUFFIX}\/${PRGNAM}/" \
     create_tree.sh
 
-  # Time to start doing what the deprecated 'build' tarball used to do for us:
-  # We need to generate the icons and mime type files ourselves now.
-  # All the other created stuff can be discarded:
+  # Generate the icons and mimetype files; discard all the other created stuff:
   KDEMAINDIR=/usr GNOMEDIR=/usr GNOME_MIME_THEME=hicolor \
   DESTDIR=../../../output \
     ./create_tree.sh
@@ -1138,7 +1143,7 @@ Comment=Add and organize the LibreOffice extensions.
 EOF
 
 # Copy icons and mime definitions but exclude Gnome-specific stuff:
-cd $TMP/tmp-$PRGNAM/build/sysui/output/usr/share
+cd $BUILDDIR/sysui/output/usr/share
   rm -r icons/{gnome,locolor}
   cp -a icons $PKG/usr/share
   cp -a mime $PKG/usr/share
@@ -1227,7 +1232,7 @@ EOF
 )
 
 # Back to base:
-cd $TMP/tmp-$PRGNAM/build
+cd $BUILDDIR
 
 # Create the package's post-install script:
 mkdir -p $PKG/install
diff --git a/libreoffice/build/libreoffice41.SlackBuild b/libreoffice/build/libreoffice41.SlackBuild
index c4fb24a5..ce8359e1 100755
--- a/libreoffice/build/libreoffice41.SlackBuild
+++ b/libreoffice/build/libreoffice41.SlackBuild
@@ -721,7 +721,8 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
 # Enter the build directory:
-cd $TMP/tmp-$PRGNAM/libreoffice-${VERSION}${SUBVER}
+BUILDDIR="$TMP/tmp-$PRGNAM/libreoffice-${VERSION}${SUBVER}"
+cd $BUILDDIR
 
 echo Building ...
 
@@ -912,6 +913,12 @@ echo "Starting $PRGNAM compilation (takes a long time)..."
 #./bootstrap 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 make VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 
+# Compile the dictionaries from source.
+# Resulting dict-*.oxt are placed in ./solver/unxlngx6.pro/pck/ :
+# **TODO** figure out how to install these? Looks like the install line below
+#          does not actually install the dictionaries.
+make -C dictionaries VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+
 # Install the lot:
 echo "Starting the packaging stage for $PRGNAM..."
 make DESTDIR=$PKG distro-pack-install \
@@ -1081,9 +1088,9 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
 fi # End of splitting out language packs
 
 # Back to base:
-cd $TMP/tmp-$PRGNAM/build
+cd $BUILDDIR
 
-# Libreoffice suddenly adds version numbers to the name of the wrapper script
+# 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):
 cd sysui/unxl*.pro/misc/libreoffice
@@ -1093,9 +1100,7 @@ cd sysui/unxl*.pro/misc/libreoffice
          -e "s/^office_prefix=.*$/office_prefix=\/usr\/lib${LIBDIRSUFFIX}\/${PRGNAM}/" \
     create_tree.sh
 
-  # Time to start doing what the deprecated 'build' tarball used to do for us:
-  # We need to generate the icons and mime type files ourselves now.
-  # All the other created stuff can be discarded:
+  # Generate the icons and mimetype files; discard all the other created stuff:
   KDEMAINDIR=/usr GNOMEDIR=/usr GNOME_MIME_THEME=hicolor \
   DESTDIR=../../../output \
     ./create_tree.sh
@@ -1138,7 +1143,7 @@ Comment=Add and organize the LibreOffice extensions.
 EOF
 
 # Copy icons and mime definitions but exclude Gnome-specific stuff:
-cd $TMP/tmp-$PRGNAM/build/sysui/output/usr/share
+cd $BUILDDIR/sysui/output/usr/share
   rm -r icons/{gnome,locolor}
   cp -a icons $PKG/usr/share
   cp -a mime $PKG/usr/share
@@ -1227,7 +1232,7 @@ EOF
 )
 
 # Back to base:
-cd $TMP/tmp-$PRGNAM/build
+cd $BUILDDIR
 
 # Create the package's post-install script:
 mkdir -p $PKG/install
diff --git a/libreoffice/build/libreoffice42.SlackBuild b/libreoffice/build/libreoffice42.SlackBuild
index c4fb24a5..ce8359e1 100755
--- a/libreoffice/build/libreoffice42.SlackBuild
+++ b/libreoffice/build/libreoffice42.SlackBuild
@@ -721,7 +721,8 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
 # Enter the build directory:
-cd $TMP/tmp-$PRGNAM/libreoffice-${VERSION}${SUBVER}
+BUILDDIR="$TMP/tmp-$PRGNAM/libreoffice-${VERSION}${SUBVER}"
+cd $BUILDDIR
 
 echo Building ...
 
@@ -912,6 +913,12 @@ echo "Starting $PRGNAM compilation (takes a long time)..."
 #./bootstrap 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 make VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 
+# Compile the dictionaries from source.
+# Resulting dict-*.oxt are placed in ./solver/unxlngx6.pro/pck/ :
+# **TODO** figure out how to install these? Looks like the install line below
+#          does not actually install the dictionaries.
+make -C dictionaries VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+
 # Install the lot:
 echo "Starting the packaging stage for $PRGNAM..."
 make DESTDIR=$PKG distro-pack-install \
@@ -1081,9 +1088,9 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
 fi # End of splitting out language packs
 
 # Back to base:
-cd $TMP/tmp-$PRGNAM/build
+cd $BUILDDIR
 
-# Libreoffice suddenly adds version numbers to the name of the wrapper script
+# 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):
 cd sysui/unxl*.pro/misc/libreoffice
@@ -1093,9 +1100,7 @@ cd sysui/unxl*.pro/misc/libreoffice
          -e "s/^office_prefix=.*$/office_prefix=\/usr\/lib${LIBDIRSUFFIX}\/${PRGNAM}/" \
     create_tree.sh
 
-  # Time to start doing what the deprecated 'build' tarball used to do for us:
-  # We need to generate the icons and mime type files ourselves now.
-  # All the other created stuff can be discarded:
+  # Generate the icons and mimetype files; discard all the other created stuff:
   KDEMAINDIR=/usr GNOMEDIR=/usr GNOME_MIME_THEME=hicolor \
   DESTDIR=../../../output \
     ./create_tree.sh
@@ -1138,7 +1143,7 @@ Comment=Add and organize the LibreOffice extensions.
 EOF
 
 # Copy icons and mime definitions but exclude Gnome-specific stuff:
-cd $TMP/tmp-$PRGNAM/build/sysui/output/usr/share
+cd $BUILDDIR/sysui/output/usr/share
   rm -r icons/{gnome,locolor}
   cp -a icons $PKG/usr/share
   cp -a mime $PKG/usr/share
@@ -1227,7 +1232,7 @@ EOF
 )
 
 # Back to base:
-cd $TMP/tmp-$PRGNAM/build
+cd $BUILDDIR
 
 # Create the package's post-install script:
 mkdir -p $PKG/install
diff --git a/libreoffice/build/libreoffice43.SlackBuild b/libreoffice/build/libreoffice43.SlackBuild
index c4fb24a5..ce8359e1 100755
--- a/libreoffice/build/libreoffice43.SlackBuild
+++ b/libreoffice/build/libreoffice43.SlackBuild
@@ -721,7 +721,8 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
 # Enter the build directory:
-cd $TMP/tmp-$PRGNAM/libreoffice-${VERSION}${SUBVER}
+BUILDDIR="$TMP/tmp-$PRGNAM/libreoffice-${VERSION}${SUBVER}"
+cd $BUILDDIR
 
 echo Building ...
 
@@ -912,6 +913,12 @@ echo "Starting $PRGNAM compilation (takes a long time)..."
 #./bootstrap 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 make VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 
+# Compile the dictionaries from source.
+# Resulting dict-*.oxt are placed in ./solver/unxlngx6.pro/pck/ :
+# **TODO** figure out how to install these? Looks like the install line below
+#          does not actually install the dictionaries.
+make -C dictionaries VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+
 # Install the lot:
 echo "Starting the packaging stage for $PRGNAM..."
 make DESTDIR=$PKG distro-pack-install \
@@ -1081,9 +1088,9 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
 fi # End of splitting out language packs
 
 # Back to base:
-cd $TMP/tmp-$PRGNAM/build
+cd $BUILDDIR
 
-# Libreoffice suddenly adds version numbers to the name of the wrapper script
+# 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):
 cd sysui/unxl*.pro/misc/libreoffice
@@ -1093,9 +1100,7 @@ cd sysui/unxl*.pro/misc/libreoffice
          -e "s/^office_prefix=.*$/office_prefix=\/usr\/lib${LIBDIRSUFFIX}\/${PRGNAM}/" \
     create_tree.sh
 
-  # Time to start doing what the deprecated 'build' tarball used to do for us:
-  # We need to generate the icons and mime type files ourselves now.
-  # All the other created stuff can be discarded:
+  # Generate the icons and mimetype files; discard all the other created stuff:
   KDEMAINDIR=/usr GNOMEDIR=/usr GNOME_MIME_THEME=hicolor \
   DESTDIR=../../../output \
     ./create_tree.sh
@@ -1138,7 +1143,7 @@ Comment=Add and organize the LibreOffice extensions.
 EOF
 
 # Copy icons and mime definitions but exclude Gnome-specific stuff:
-cd $TMP/tmp-$PRGNAM/build/sysui/output/usr/share
+cd $BUILDDIR/sysui/output/usr/share
   rm -r icons/{gnome,locolor}
   cp -a icons $PKG/usr/share
   cp -a mime $PKG/usr/share
@@ -1227,7 +1232,7 @@ EOF
 )
 
 # Back to base:
-cd $TMP/tmp-$PRGNAM/build
+cd $BUILDDIR
 
 # Create the package's post-install script:
 mkdir -p $PKG/install