libreoffice: make it compile against icu4c-61.x.

Do not oeverwrite customized profile scripts.

1 files changed, 28 insertions, 3 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index b5345f19..3c1917cf 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -280,7 +280,7 @@ PRGNAM3=dict
 PRGNAM4=sdkdoc
 PRGNAM5=kde-integration
 
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-alien}
 
 # SRCVER is the variable you control. It can be one of:
@@ -1185,6 +1185,7 @@ export OODESTDIR="$PKG"
 export LDFLAGS="-lboost_system -Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ $SLKLDFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
+export CPPFLAGS="-DU_USING_ICU_NAMESPACE=1"
 export HARFBUZZ_LIBS="-lharfbuzz-icu -lharfbuzz"
 
 # If this local directory does not exist during configuration,
@@ -1675,12 +1676,36 @@ cd $BUILDDIR
 
 # Create the package's post-install script:
 mkdir -p $PKG/install
+cat <<EOT > $PKG/install/doinst.sh
+# Handle the incoming configuration files:
+config() {
+  for infile in \$1; do
+    NEW="\$infile"
+    OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
+    # If there's no config file by that name, mv it over:
+    if [ ! -r \$OLD ]; then
+      mv \$NEW \$OLD
+    elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then
+      # toss the redundant copy
+      rm \$NEW
+    fi
+    # Otherwise, we leave the .new copy for the admin to consider...
+  done
+}
+for file in etc/profile.d/${PRGNAM}*.new ; do
+  config \$file
+done
+
+EOT
+
 # Install language dictionary:
 cat $SRCDIR/doinst.sh.l10n \
   | sed -e "s/@LIBDIRSUFFIX@/${LIBDIRSUFFIX}/g" \
         -e "s/@LANG@/$(echo ${DEF_LANG} |tr _ -)/g" -e "s/@PRGNAM@/$PRGNAM/" \
-  > ${PKG}/install/doinst.sh
+  >> ${PKG}/install/doinst.sh
+
 cat <<EOT >> $PKG/install/doinst.sh
+
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
   chroot . /usr/bin/update-desktop-database usr/share/applications 1> /dev/null 2> /dev/null
@@ -1721,7 +1746,7 @@ find ${PKG} -perm 555 -exec chmod 755 {} \; || true
 mkdir -p $PKG/etc/profile.d
 for file in $(ls $SRCDIR/profile.d/${PRGNAM}*) ; do
   cat $file | sed -e "s#@LIBDIRSUFFIX@#${LIBDIRSUFFIX}#g" \
-    > $PKG/etc/profile.d/$(basename $file)
+    > $PKG/etc/profile.d/$(basename $file).new
 done
 chmod 755 $PKG/etc/profile.d/*