commit 6f0ee2cb5d6f2234884ee3d181c016deb5836e36 Author: Tim Biermann <tbier@posteo.de> Date: Sun Aug 15 21:59:52 2021 +0200 [notify] libreoffice: 7.2.0.1 -> 7.2.0.3; dropped dependency on libcmis, openldap now optional diff --git a/libreoffice/.footprint b/libreoffice/.footprint index c58a6171e..bf5ec773b 100644 --- a/libreoffice/.footprint +++ b/libreoffice/.footprint @@ -328,7 +328,6 @@ lrwxrwxrwx root/root usr/lib/libreoffice/program/bootstraprc -> ../../../etc/lib -rwxr-xr-x root/root usr/lib/libreoffice/program/libinvocadaptlo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libinvocationlo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libiolo.so --rwxr-xr-x root/root usr/lib/libreoffice/program/libldapbe2lo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/liblibreofficekitgtk.so -rwxr-xr-x root/root usr/lib/libreoffice/program/liblnglo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/liblnthlo.so @@ -420,7 +419,6 @@ lrwxrwxrwx root/root usr/lib/libreoffice/program/bootstraprc -> ../../../etc/lib -rwxr-xr-x root/root usr/lib/libreoffice/program/libucb1.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libucbhelper.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libucpchelp1.so --rwxr-xr-x root/root usr/lib/libreoffice/program/libucpcmis1lo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libucpdav1.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libucpexpand1lo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libucpextlo.so diff --git a/libreoffice/.signature b/libreoffice/.signature index 0914ff873..e73b19324 100644 --- a/libreoffice/.signature +++ b/libreoffice/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31qmJzsdHtay9Z/bLfZLNaY57wYBuS6DQkq5rCJ5phmz9V51x9CtYmlnDDKNoNirzYVVZRbTPVp6t7qjynoRAQk= -SHA256 (Pkgfile) = 032aeef8d58b80dd72f77a35367492a3c5c84cf3313d0b6f56c9ad57025a4122 -SHA256 (.footprint) = 903550ff96f2fec3be9c37f4b3e3238cf0719b2234c3b8f37ced03931795499c -SHA256 (libreoffice-7.2.0.1.tar.xz) = 218c22ac991ac2ac071ef26c2dc3b4a0153d49d2f8ca97cee836e5ffe92f7396 -SHA256 (libreoffice-dictionaries-7.2.0.1.tar.xz) = f50cd9ef0e2a534645eb9c214c509b1546e04e8918f939a3923250e25abba617 +RWSagIOpLGJF3xPreFm5QnBJhfcYWKI2RnS/bCAX+b/5qmq2xVDcGL8GFuUlbtTOLAOmFtVsdQpzXzjOgKGZ1C1D8MhWaQ/95QU= +SHA256 (Pkgfile) = 43ece7fc3029ac42ffa1034e5e8aef701503097e71a3cc956ef02e2daf4b2d56 +SHA256 (.footprint) = e723234350c195c0f15a287b1bb4343483bde67a3718f3771235dfac9bf380a8 +SHA256 (libreoffice-7.2.0.3.tar.xz) = 2c17b6bfe0a8bfc92002f713cf095bc865ebfae7d8f66f989484fcc460ed9648 +SHA256 (libreoffice-dictionaries-7.2.0.3.tar.xz) = 3a1caf6a741c9cc476493a8a75ee6d6f67c396cb80457cfd03a53c603433280b 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 2ea055eda..e4ee14770 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: 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 +# Depends on: box2d clucene coin-or-mp fakeroot fontforge gpgme graphite2 gst-plugins-base hyphen libabw libcdr 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 openldap qt5 valgrind name=libreoffice -version=7.2.0.1 +version=7.2.0.3 release=1 pdfiumversion=4500 source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/... @@ -15,8 +15,10 @@ source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/ https://dev-www.libreoffice.org/src/dtoa-20180411.tgz #https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a47627... https://dev-www.libreoffice.org/src/pdfium-$pdfiumversion.tar.bz2 + #https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz makefile.in.patch pdfium-use-system-libopenjpeg.diff) +# unpack_source() {{{ unpack_source() { mkdir $SRC/tarballs for file in ${source[@]}; do @@ -28,6 +30,7 @@ unpack_source() { pdfium-$pdfiumversion.tar.bz2|\ dtoa-20180411.tgz|\ skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz|\ + libcmis-0.5.2.tar.xz|\ 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) echo "Moving $(get_filename $file) to $SRC/tarballs" cp $(get_filename $file) $SRC/tarballs ;; @@ -36,11 +39,13 @@ unpack_source() { esac done } +# }}} build() { - # fail the build if dependencies are not met + # 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 @@ -48,11 +53,13 @@ build() { # https://sources.debian.org/patches/libreoffice/1:7.1.4%7Erc1-1/pdfium-use-sy... patch -Np1 -i $SRC/pdfium-use-system-libopenjpeg.diff - # determine configure options based on installed packages on the system - [[ -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" + # 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 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" + # }}} local build_date=$(date +%Y%m%d) ./autogen.sh $PKGMK_LIBREOFFICE \ @@ -68,8 +75,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,dconf,dependency-tracking,extension-update,fetch-external} \ - --disable-{firebird-sdbc,poppler,postgresql-sdbc,report-builder,sdremote-bluetooth,skia,werror,zxing} + --disable-{avahi,ccache,cmis,dconf,dependency-tracking,extension-update,fetch-external,firebird-sdbc} \ + --disable-{poppler,postgresql-sdbc,report-builder,sdremote-bluetooth,skia,werror,zxing} touch {sources.ver,src.downloaded} echo "lo_sources_ver=${version}" > sources.ver @@ -91,9 +98,10 @@ build() { cd $PKG/usr/lib/libreoffice/program/ ln -vsrf $PKG/usr/etc/libreoffice/{bootstraprc,sofficerc} . - # cleanup + # cleanup {{{ rm -r $PKG/usr/share/libreoffice/sdk rm -r $PKG/usr/lib/libreoffice/sdk rm -r $PKG/usr/share/doc find $PKG -iname "*readme*" -exec rm -fr '{}' \+ + # }}} }