libreoffice: now uses opt/paper instead of libpaper; restructured optional dependencies

3 files changed, 39 insertions, 21 deletions

diff --git a/libreoffice/.footprint b/libreoffice/.footprint
index bf1e43464..6112fd57a 100644
--- a/libreoffice/.footprint
+++ b/libreoffice/.footprint
@@ -348,7 +348,6 @@ lrwxrwxrwx	root/root	usr/lib/libreoffice/program/bootstraprc -> ../../../etc/lib
 -rwxr-xr-x	root/root	usr/lib/libreoffice/program/libmswordlo.so
 -rwxr-xr-x	root/root	usr/lib/libreoffice/program/libmtfrendererlo.so
 -rwxr-xr-x	root/root	usr/lib/libreoffice/program/libmysql_jdbclo.so
--rwxr-xr-x	root/root	usr/lib/libreoffice/program/libmysqlclo.so
 -rwxr-xr-x	root/root	usr/lib/libreoffice/program/libnamingservicelo.so
 -rwxr-xr-x	root/root	usr/lib/libreoffice/program/libnumbertextlo.so
 -rwxr-xr-x	root/root	usr/lib/libreoffice/program/libodbclo.so
diff --git a/libreoffice/.signature b/libreoffice/.signature
index 29637e6a1..0a942802b 100644
--- a/libreoffice/.signature
+++ b/libreoffice/.signature
@@ -1,9 +1,9 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zJbFJsS1aa5daD3FBNuo4SuLycmsmnBI0wnUc1s7EHOEpPD8qlJoMsSF1kXi7R4ePEyDSkspafEwdRwoAu8dgI=
-SHA256 (Pkgfile) = 59dbc8269993ed25fcf39c90151fcc5f1553f5943879ba3634432dc2779367f7
-SHA256 (.footprint) = 1b53ce56bf10705a4b162cfaa0219b6fb6552dfb98f2cbdff95040e00690bfcb
-SHA256 (libreoffice-7.3.3.2.tar.xz) = ee12bdbe1621c20e2744bc5b6c5967810f25a5760b98ac5812d550ab00968685
-SHA256 (libreoffice-dictionaries-7.3.3.2.tar.xz) = a6f67d5a20fe656c909b16c338759c187cf7e5e7f463d33d8d58a8bbe0280323
+RWSagIOpLGJF32woH1L0Yy/bk5/9p0rz3Ggzz8WjBl6UaWJSuNoonx92t7+1ZJgWGv+mebzo0lIYCcPNN/Ql1eH3vcSS6KylogA=
+SHA256 (Pkgfile) = ae882b4521c2cf3fa90aff4138c134692e1e6f3016746ca8aa8c0daa7ca5d95d
+SHA256 (.footprint) = fde22fd8de26621b25773bbbe0d072d6fc6ef0da5a22a4c7e79c25b7497a2def
+SHA256 (libreoffice-7.3.4.1.tar.xz) = 6dc28d5b19d43a62d8667b8839dc3874b0138db623eb2b7b0f05790cdb8cfb9c
+SHA256 (libreoffice-dictionaries-7.3.4.1.tar.xz) = bef501119764b3c2375de8b4c23e78745b167dd70dc71ad8a16ab5e729674cd8
 SHA256 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
 SHA256 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
 SHA256 (dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile
index d9d5c7973..b0276f154 100644
--- a/libreoffice/Pkgfile
+++ b/libreoffice/Pkgfile
@@ -1,11 +1,11 @@
 # Description: LibreOffice is a powerful office suite
 # URL: https://www.libreoffice.org/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: abseil-cpp box2d clucene coin-or-mp fakeroot fontforge gpgme graphite2 gst-plugins-base hyphen icu libabw libcdr libcuckoo 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 nss openjpeg2 python3-lxml redland sane unzip xmlsec xorg-libxcomposite zip
-# Optional: cups kio openldap qt5 valgrind
+# Depends on: abseil-cpp box2d clucene fontforge graphite2 gst-plugins-base hyphen icu libabw libcdr libcuckoo libe-book libepubgen libetonyek libexttextcat libfreehand libmspub libmwaw libmythes libnumbertext libodfgen liborcus libpagemaker libqrcodegen libqxp libstaroffice libtommath libvisio libwpg libwps libzmf neon nss openjpeg2 paper redland unzip xmlsec xorg-libxcomposite zip
+# Optional: avahi coin-or-mp cups fakeroot gpgme kio lpsolve mariadb openldap postgresql python3-lxml qt5 sane valgrind
 
 name=libreoffice
-version=7.3.3.2
+version=7.3.4.1
 release=1
 pdfiumversion=4699
 source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-$version.tar.xz
@@ -50,22 +50,42 @@ build() {
   cd $name-$version
 
   patch -Np1 -i $SRC/makefile.in.patch
-
+  sed -i 's:application/pdf;::g' sysui/desktop/menus/draw.desktop
+  sed -i 's:text/plain;::g' sysui/desktop/menus/writer.desktop
   # optionals {{{
-  prt-get isinst cups && PKGMK_LIBREOFFICE+=" --enable-cups" || PKGMK_LIBREOFFICE+=" --disable-cups"
-  prt-get isinst kio && PKGMK_LIBREOFFICE+=" --enable-kde5 --enable-gtk3-kde5"
+  prt-get isinst avahi && PKGMK_LIBREOFFICE+=' --enable-avahi' || PKGMK_LIBREOFFICE+=' --disable-avahi'
+  #prt-get isinst box2d && PKGMK_LIBREOFFICE+=' --with-system-box2d' || PKGMK_LIBREOFFICE+=' --without-system-box2d'
+  #prt-get isinst ccache && PKGMK_LIBREOFFICE+=' --enable-ccache' || PKGMK_LIBREOFFICE+=' --disable-ccache'
+  prt-get isinst ccache && export CCACHE_CPP2=1
+  #prt-get isinst clucene && PKGMK_LIBREOFFICE+=' --with-system-clucene' || PKGMK_LIBREOFFICE+=' --without-system-clucene'
+  prt-get isinst coin-or-mp && PKGMK_LIBREOFFICE+=' --with-system-coinmp' || PKGMK_LIBREOFFICE+=' --disable-coinmp'
+  prt-get isinst cups && PKGMK_LIBREOFFICE+=' --enable-cups' || PKGMK_LIBREOFFICE+=' --disable-cups'
+  prt-get isinst gpgme && PKGMK_LIBREOFFICE+=' --enable-gpgmepp' || PKGMK_LIBREOFFICE+=' --disable-gpgmepp'
+  prt-get isinst dconf && PKGMK_LIBREOFFICE+=' --enable-dconf' || PKGMK_LIBREOFFICE+=' --disable-dconf'
+  #prt-get isinst gtk4 && PKGMK_LIBREOFFICE+=' --enable-gtk4'
+  prt-get isinst kio && PKGMK_LIBREOFFICE+=' --enable-kde5 --enable-gtk3-kde5'
+  #prt-get isinst libstaroffice && PKGMK_LIBREOFFICE+=' --with-system-libstaroffice' || PKGMK_LIBREOFFICE+=' --without-system-libstaroffice'
+  #prt-get isinst libtommath && PKGMK_LIBREOFFICE+= ' --with-system-libtommath' || PKGMK_LIBREOFFICE+=' --without-system-libtommath'
+  prt-get isinst lpsolve && PKGMK_LIBREOFFICE+=' --enable-lpsolve' || PKGMK_LIBREOFFICE+=' --disable-lpsolve'
+  prt-get isinst mariadb || PKGMK_LIBREOFFICE+=' --disable-mariadb-sdbc'
   prt-get isinst openldap || PKGMK_LIBREOFFICE+=' --disable-ldap'
-  prt-get isinst qt5 && PKGMK_LIBREOFFICE+=" --enable-qt5" || PKGMK_LIBREOFFICE+=" --disable-qt5"
-  prt-get isinst valgrind && PKGMK_LIBREOFFICE+=" --with-valgrind"
+  prt-get isinst postgresql || PKGMK_LIBREOFFICE+=' --disable-postgresql-sdbc'
+  prt-get isinst python3-lxml || PKGMK_LIBREOFFICE+=' --without-lxml'
+  prt-get isinst qt5 && PKGMK_LIBREOFFICE+=' --enable-qt5' || PKGMK_LIBREOFFICE+=' --disable-qt5'
+  #prt-get isinst qt6-base && PKGMK_LIBREOFFICE+=' --enable-qt6' || PKGMK_LIBREOFFICE+=' --disable-qt6'
+  prt-get isinst sane && PKGMK_LIBREOFFICE+=' --with-system-sane' || PKGMK_LIBREOFFICE+=' --without-system-sane'
+  prt-get isinst valgrind && PKGMK_LIBREOFFICE+=' --with-valgrind'
   # }}}
 
   local build_date=$(date +%Y%m%d)
-  ./autogen.sh $PKGMK_LIBREOFFICE \
+  NOCONFIGURE=1 ./autogen.sh
+  ./configure $PKGMK_LIBREOFFICE \
     --with-parallelism=${JOBS-1} \
     --prefix=/usr \
     --with-external-tar="$SRC/tarballs" \
-    --enable-{build-opensymbol,dbus,firebird-sdbc=no,gtk3,introspection=yes,release-build,odk,openssl,pdfium,python=system} \
-    --with-{lang="",package-format=archive,myspell-dicts,parallelism} \
+    --enable-{build-opensymbol,dbus,firebird-sdbc=no,gtk3,introspection=yes} \
+    --enable-{ld=gold,lto,odk,openssl,pdfium,python=system,release-build} \
+    --with-{lang="",package-format=archive,myspell-dicts} \
     --with-extra-buildid="$(crux | awk '{ print $1 " " $3 }') ${build_date}" \
     --with-package-version="$version" \
     --with-system-{headers,libs} \
@@ -73,8 +93,8 @@ 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,ccache,cmis,dconf,dependency-tracking,extension-update,fetch-external,firebird-sdbc} \
-    --disable-{poppler,postgresql-sdbc,report-builder,sdremote-bluetooth,skia,werror,zxing}
+    --disable-{ccache,cmis,dependency-tracking,extension-update,fetch-external,firebird-sdbc} \
+    --disable-{online-update,poppler,report-builder,sdremote-bluetooth,skia,werror,zxing}
 
   touch {sources.ver,src.downloaded}
   echo "lo_sources_ver=${version}" > sources.ver
@@ -97,9 +117,8 @@ build() {
   ln -vsrf $PKG/usr/etc/libreoffice/{bootstraprc,sofficerc} .
 
   # cleanup {{{
-  rm -r $PKG/usr/share/libreoffice/sdk
+  rm -r $PKG/usr/share/{doc,libreoffice/sdk}
   rm -r $PKG/usr/lib/libreoffice/sdk
-  rm -r $PKG/usr/share/doc
   find $PKG -iname "*readme*" -exec rm -fr '{}' \+
   # }}}
 }