Fix errors in creating sdkdocs and kde-integration packages

3 files changed, 54 insertions, 18 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index 12a9684e..2ed15e33 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -178,6 +178,10 @@
 
 PRGNAM=libreoffice
 PRGNAM2=mozplugin
+PRGNAM3=dict
+PRGNAM4=sdkdoc
+PRGNAM5=kde-integration
+
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -242,6 +246,9 @@ ADD_LANGUAGES="$(cat $SRCDIR/languages |grep -v "^#" |cut -f1 -d= |tr '\n' ' ' |
 TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 PKG2=$TMP/package-$PRGNAM-$PRGNAM2
+PKG3=$TMP/package-$PRGNAM-$PRGNAM3
+PKG4=$TMP/package-$PRGNAM-$PRGNAM4
+PKG5=$TMP/package-$PRGNAM-$PRGNAM5
 OUTPUT=${OUTPUT:-/tmp}
 
 # Base resource locators for tarballs and snapshots
@@ -680,6 +687,9 @@ else
   mkdir -p $PKG             # place for the package to be built
   rm -rf $PKG/*             # always erase old package's contents
   rm -rf $PKG2/*            # always erase old package's contents
+  rm -rf $PKG3/*            # always erase old package's contents
+  rm -rf $PKG4/*            # always erase old package's contents
+  rm -rf $PKG5/*            # always erase old package's contents
   rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
   rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
                             # remove old log files
@@ -767,10 +777,12 @@ cd $BUILDDIR
 echo Building ...
 
 # Apply our own (borrowed) patches.
-touch $OUTPUT/patch-$PRGNAM.log
-# Add internal copies of Google's Carlito and Caladea fonts:
-cat $SRCDIR/patches/libreoffice.crosextra_fonts.patch | patch -p1 --verbose \
-  2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+if [ "$P1" != "--oldbuild" ]; then
+  touch $OUTPUT/patch-$PRGNAM.log
+  # Add internal copies of Google's Carlito and Caladea fonts:
+  cat $SRCDIR/patches/libreoffice.crosextra_fonts.patch | patch -p1 --verbose \
+    2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+fi
 
 if [ -z "$SRCURL[0]" ]; then
   # Git build; find out what this version of LibreOffice calls itself:
@@ -976,7 +988,7 @@ fi
 echo "Starting split-off of SDK docs from main $PRGNAM package..."
 mkdir -p \
   $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}
-mv usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk \
+mv $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk \
   $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}
 mkdir -p $TMP/package-${PRGNAM}-sdkdoc/install
 cat $SRCDIR/slack-desc.sdkdoc \
@@ -994,7 +1006,7 @@ cat $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc | grep "^${PRGNAM}-sdkdoc"
 echo "Starting split-off of KDE integration libraries from main $PRGNAM package..."
 mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program
 for KDEFILE in libvclplug_kde4lo.so kde-open-url libkde4be1lo.so ; do
-  mv usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \
+  mv $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \
     $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/
 done
 mkdir -p $TMP/package-${PRGNAM}-kde-integration/install
diff --git a/libreoffice/build/libreoffice42.SlackBuild b/libreoffice/build/libreoffice42.SlackBuild
index 12a9684e..2ed15e33 100755
--- a/libreoffice/build/libreoffice42.SlackBuild
+++ b/libreoffice/build/libreoffice42.SlackBuild
@@ -178,6 +178,10 @@
 
 PRGNAM=libreoffice
 PRGNAM2=mozplugin
+PRGNAM3=dict
+PRGNAM4=sdkdoc
+PRGNAM5=kde-integration
+
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -242,6 +246,9 @@ ADD_LANGUAGES="$(cat $SRCDIR/languages |grep -v "^#" |cut -f1 -d= |tr '\n' ' ' |
 TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 PKG2=$TMP/package-$PRGNAM-$PRGNAM2
+PKG3=$TMP/package-$PRGNAM-$PRGNAM3
+PKG4=$TMP/package-$PRGNAM-$PRGNAM4
+PKG5=$TMP/package-$PRGNAM-$PRGNAM5
 OUTPUT=${OUTPUT:-/tmp}
 
 # Base resource locators for tarballs and snapshots
@@ -680,6 +687,9 @@ else
   mkdir -p $PKG             # place for the package to be built
   rm -rf $PKG/*             # always erase old package's contents
   rm -rf $PKG2/*            # always erase old package's contents
+  rm -rf $PKG3/*            # always erase old package's contents
+  rm -rf $PKG4/*            # always erase old package's contents
+  rm -rf $PKG5/*            # always erase old package's contents
   rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
   rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
                             # remove old log files
@@ -767,10 +777,12 @@ cd $BUILDDIR
 echo Building ...
 
 # Apply our own (borrowed) patches.
-touch $OUTPUT/patch-$PRGNAM.log
-# Add internal copies of Google's Carlito and Caladea fonts:
-cat $SRCDIR/patches/libreoffice.crosextra_fonts.patch | patch -p1 --verbose \
-  2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+if [ "$P1" != "--oldbuild" ]; then
+  touch $OUTPUT/patch-$PRGNAM.log
+  # Add internal copies of Google's Carlito and Caladea fonts:
+  cat $SRCDIR/patches/libreoffice.crosextra_fonts.patch | patch -p1 --verbose \
+    2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+fi
 
 if [ -z "$SRCURL[0]" ]; then
   # Git build; find out what this version of LibreOffice calls itself:
@@ -976,7 +988,7 @@ fi
 echo "Starting split-off of SDK docs from main $PRGNAM package..."
 mkdir -p \
   $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}
-mv usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk \
+mv $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk \
   $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}
 mkdir -p $TMP/package-${PRGNAM}-sdkdoc/install
 cat $SRCDIR/slack-desc.sdkdoc \
@@ -994,7 +1006,7 @@ cat $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc | grep "^${PRGNAM}-sdkdoc"
 echo "Starting split-off of KDE integration libraries from main $PRGNAM package..."
 mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program
 for KDEFILE in libvclplug_kde4lo.so kde-open-url libkde4be1lo.so ; do
-  mv usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \
+  mv $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \
     $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/
 done
 mkdir -p $TMP/package-${PRGNAM}-kde-integration/install
diff --git a/libreoffice/build/libreoffice43.SlackBuild b/libreoffice/build/libreoffice43.SlackBuild
index 12a9684e..2ed15e33 100755
--- a/libreoffice/build/libreoffice43.SlackBuild
+++ b/libreoffice/build/libreoffice43.SlackBuild
@@ -178,6 +178,10 @@
 
 PRGNAM=libreoffice
 PRGNAM2=mozplugin
+PRGNAM3=dict
+PRGNAM4=sdkdoc
+PRGNAM5=kde-integration
+
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -242,6 +246,9 @@ ADD_LANGUAGES="$(cat $SRCDIR/languages |grep -v "^#" |cut -f1 -d= |tr '\n' ' ' |
 TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 PKG2=$TMP/package-$PRGNAM-$PRGNAM2
+PKG3=$TMP/package-$PRGNAM-$PRGNAM3
+PKG4=$TMP/package-$PRGNAM-$PRGNAM4
+PKG5=$TMP/package-$PRGNAM-$PRGNAM5
 OUTPUT=${OUTPUT:-/tmp}
 
 # Base resource locators for tarballs and snapshots
@@ -680,6 +687,9 @@ else
   mkdir -p $PKG             # place for the package to be built
   rm -rf $PKG/*             # always erase old package's contents
   rm -rf $PKG2/*            # always erase old package's contents
+  rm -rf $PKG3/*            # always erase old package's contents
+  rm -rf $PKG4/*            # always erase old package's contents
+  rm -rf $PKG5/*            # always erase old package's contents
   rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
   rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
                             # remove old log files
@@ -767,10 +777,12 @@ cd $BUILDDIR
 echo Building ...
 
 # Apply our own (borrowed) patches.
-touch $OUTPUT/patch-$PRGNAM.log
-# Add internal copies of Google's Carlito and Caladea fonts:
-cat $SRCDIR/patches/libreoffice.crosextra_fonts.patch | patch -p1 --verbose \
-  2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+if [ "$P1" != "--oldbuild" ]; then
+  touch $OUTPUT/patch-$PRGNAM.log
+  # Add internal copies of Google's Carlito and Caladea fonts:
+  cat $SRCDIR/patches/libreoffice.crosextra_fonts.patch | patch -p1 --verbose \
+    2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+fi
 
 if [ -z "$SRCURL[0]" ]; then
   # Git build; find out what this version of LibreOffice calls itself:
@@ -976,7 +988,7 @@ fi
 echo "Starting split-off of SDK docs from main $PRGNAM package..."
 mkdir -p \
   $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}
-mv usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk \
+mv $PKG/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}/sdk \
   $TMP/package-${PRGNAM}-sdkdoc/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER}
 mkdir -p $TMP/package-${PRGNAM}-sdkdoc/install
 cat $SRCDIR/slack-desc.sdkdoc \
@@ -994,7 +1006,7 @@ cat $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc | grep "^${PRGNAM}-sdkdoc"
 echo "Starting split-off of KDE integration libraries from main $PRGNAM package..."
 mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program
 for KDEFILE in libvclplug_kde4lo.so kde-open-url libkde4be1lo.so ; do
-  mv usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \
+  mv $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \
     $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/
 done
 mkdir -p $TMP/package-${PRGNAM}-kde-integration/install