libreoffice: 7.1.5.1 -> 7.2.0.1

1 files changed, 18 insertions, 31 deletions

diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile
index d999dfc09..2ea055eda 100644
--- a/libreoffice/Pkgfile
+++ b/libreoffice/Pkgfile
@@ -1,41 +1,35 @@
 # Description: LibreOffice is a powerful office suite
 # URL: https://www.libreoffice.org/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: box2d clucene coin-or-mp fakeroot fontforge gpgme graphite2 gst-plugins-base hyphen libabw libcdr libcmis libe-book libepubgen libetonyek libexttextcat libfreehand libmspub libmwaw libmythes libnumbertext libodfgen liborcus libpagemaker libpaper libqrcodegen libqxp libstaroffice libtommath libvisio libwpg libwps libzmf lpsolve mariadb neon openjpeg2 python3-lxml redland sane unzip xmlsec zip
+# Depends on: box2d clucene coin-or-mp fakeroot fontforge gpgme graphite2 gst-plugins-base hyphen libabw libcdr libcmis libe-book libepubgen libetonyek libexttextcat libfreehand libmspub libmwaw libmythes libnumbertext libodfgen liborcus libpagemaker libpaper libqrcodegen libqxp libstaroffice libtommath libvisio libwpg libwps libzmf lpsolve mariadb neon openjpeg2 python3-lxml redland sane unzip xmlsec zip xorg-libxcomposite
 # Optional: cups kio qt5 valgrind
 
 name=libreoffice
-version=7.1.5.1
+version=7.2.0.1
 release=1
-pdfiumversion=4306
+pdfiumversion=4500
 source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-$version.tar.xz
   https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-dictionaries-$version.tar.xz
   https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
   https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
   https://dev-www.libreoffice.org/src/dtoa-20180411.tgz
-  https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
+  #https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
   https://dev-www.libreoffice.org/src/pdfium-$pdfiumversion.tar.bz2
   makefile.in.patch pdfium-use-system-libopenjpeg.diff)
 
 unpack_source() {
+  mkdir $SRC/tarballs
   for file in ${source[@]}; do
     case ${file##*/} in
       libreoffice-*.tar.xz)
+        echo "Unpacking $(get_filename $file)"
         bsdtar -p -o -C $SRC -xf $(get_filename $file) ;;
-      185d60944ea767075d27247c3162b3bc-unowinreg.dll)
-        mkdir $SRC/tarballs || true
-        cp $(get_filename $file) $SRC/tarballs ;;
+      185d60944ea767075d27247c3162b3bc-unowinreg.dll|\
+      pdfium-$pdfiumversion.tar.bz2|\
+      dtoa-20180411.tgz|\
+      skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz|\
       0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz)
-        mkdir $SRC/tarballs || true
-        cp $(get_filename $file) $SRC/tarballs ;;
-      pdfium-$pdfiumversion.tar.bz2)
-        mkdir $SRC/tarballs || true
-        cp $(get_filename $file) $SRC/tarballs ;;
-      dtoa-20180411.tgz)
-        mkdir $SRC/tarballs || true
-        cp $(get_filename $file) $SRC/tarballs ;;
-      skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz)
-        mkdir $SRC/tarballs || true
+        echo "Moving $(get_filename $file) to $SRC/tarballs"
         cp $(get_filename $file) $SRC/tarballs ;;
       *)
         cp $(get_filename $file) $SRC ;;
@@ -44,29 +38,22 @@ unpack_source() {
 }
 
 build() {
+  # fail the build if dependencies are not met
+  ls /usr/include/harfbuzz/hb-icu.h || (printf '\e[1;31m%-6s\e[m\n' "you need to install icu, then rebuild harfbuzz for libreoffice to work, quitting.." ; exit 1)
+  ls /usr/lib/pkgconfig/xmlsec1-nss.pc || (printf '\e[1;31m%-6s\e[m\n' "you need to install nss, then rebuild xmlsec for libreoffice to work, quitting.." ; exit 1)
+
   cd $name-$version
 
   patch -Np1 -i $SRC/makefile.in.patch
   # https://sources.debian.org/patches/libreoffice/1:7.1.4%7Erc1-1/pdfium-use-system-libopenjpeg.diff/
   patch -Np1 -i $SRC/pdfium-use-system-libopenjpeg.diff
 
-  find -L . \
-     \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-     -o -perm 511 \) -exec chmod 755 {} \; -o \
-     \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-     -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
   # determine configure options based on installed packages on the system
-  [[ -e /usr/lib/ccache ]] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
-  [[ -e /usr/lib/ccache ]] && PKGMK_LIBREOFFICE+=" --enable-ccache" || PKGMK_LIBREOFFICE+=" --disable-ccache"
   [[ -e /usr/lib/cups ]] && PKGMK_LIBREOFFICE+=" --enable-cups" || PKGMK_LIBREOFFICE+=" --disable-cups"
   [[ -e /usr/lib/pkgconfig/Qt5Core.pc ]] && PKGMK_LIBREOFFICE+=" --enable-qt5" || PKGMK_LIBREOFFICE+=" --disable-qt5"
   [[ -e /usr/include/KF5/KIOCore ]] && PKGMK_LIBREOFFICE+=" --enable-kde5 --enable-gtk3-kde5"
   [[ -e /usr/lib/pkgconfig/valgrind.pc ]] && PKGMK_LIBREOFFICE+=" --with-valgrind"
 
-  ls /usr/include/harfbuzz/hb-icu.h || (printf '\e[1;31m%-6s\e[m\n' "you need to install icu, then rebuild harfbuzz for libreoffice to work, quitting.." ; exit 1)
-  ls /usr/lib/pkgconfig/xmlsec1-nss.pc || (printf '\e[1;31m%-6s\e[m\n' "you need to install nss, then rebuild xmlsec for libreoffice to work, quitting.." ; exit 1)
-
   local build_date=$(date +%Y%m%d)
   ./autogen.sh $PKGMK_LIBREOFFICE \
     --with-parallelism=${JOBS-1} \
@@ -81,12 +68,12 @@ build() {
     --with-external-hyph-dir=/usr/share/hypen \
     --with-external-thes-dir=/usr/share/mythes \
     --without-{doxygen,fonts,gssapi,help,helppack-integration,java,system-firebird} \
-    --disable-{avahi,build-unowinreg,dconf,dependency-tracking,extension-update,fetch-external} \
-    --disable-{firebird-sdbc,poppler,postgresql-sdbc,report-builder,sdremote-bluetooth,werror}
+    --disable-{avahi,ccache,dconf,dependency-tracking,extension-update,fetch-external} \
+    --disable-{firebird-sdbc,poppler,postgresql-sdbc,report-builder,sdremote-bluetooth,skia,werror,zxing}
 
   touch {sources.ver,src.downloaded}
   echo "lo_sources_ver=${version}" > sources.ver
-  make build-nocheck
+  make
 
   pushd workdir/installation/LibreOffice/archive/install/en-US
   tar xf *.tar.gz