Date: Thursday, September 8, 2022 @ 18:05:19 Author: andyrtr Revision: 455610
upgpkg: libreoffice-fresh 7.4.0-4: go back again to build with internal heavily patched libcmis - fixes FS#75847; also build experimental gtk4 desktop integration Modified: libreoffice-fresh/trunk/PKGBUILD libreoffice-fresh/trunk/libreoffice-fresh.csh libreoffice-fresh/trunk/libreoffice-fresh.sh -----------------------+ PKGBUILD | 21 +++++++++++++-------- libreoffice-fresh.csh | 1 + libreoffice-fresh.sh | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-08 17:32:17 UTC (rev 455609) +++ PKGBUILD 2022-09-08 18:05:19 UTC (rev 455610) @@ -1,5 +1,5 @@ # Maintainer: AndyRTR <andy...@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # Note: These are for Arch Linux use ONLY. For your own distribution, please @@ -12,7 +12,7 @@ pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=7.4.0.3 pkgver=7.4.0 -pkgrel=3 +pkgrel=4 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/"; @@ -23,12 +23,12 @@ 'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gst-plugins-base-libs' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant' - 'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene' + 'gperf' 'gtk3' 'gtk4' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene' 'junit' 'libmythes' 'libwpg' 'java-environment=11' 'postgresql-libs' 'mariadb-libs' 'libgl' 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm' 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' - 'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient' + 'libexttextcat' 'gobject-introspection' # 'libfbclient' 'libcmis' 'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' 'gpgme' 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext' 'libcuckoo' 'abseil-cpp' 'clang' #'zxing-cpp' @@ -53,6 +53,7 @@ ${_additional_source_url}/lxml-4.1.1.tgz ${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2 ${_additional_source_url}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz + ${_additional_source_url}/libcmis-0.5.2.tar.xz ${_additional_source_url}/zxing-cpp-1.2.0.tar.gz ${_additional_source_url}/dragonbox-1.1.0.tar.gz ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite @@ -76,6 +77,7 @@ lxml-4.1.1.tgz Firebird-3.0.7.33374-0.tar.bz2 skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz + libcmis-0.5.2.tar.xz zxing-cpp-1.2.0.tar.gz dragonbox-1.1.0.tar.gz 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite @@ -103,6 +105,7 @@ '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e' 'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76' 'c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9' + 'd7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2' '653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a' '293247ccba995ec47ae3abb52c3e83904a7d71efb7093d4c0d2c6367c1cc1e20' 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' @@ -112,8 +115,8 @@ 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' '95716d255aae9d8795eb76c634541f82a094b87dfeaa6ffcdbd97c0f19c14ac4' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' - 'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a' - 'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1') + 'b20cc7c79e8e5d2c56eb17cf0f1e3bea7a2ceb243308a1bff3af24bf54f7d1f5' + 'b679a22ecad2892ac9854d80c5c77e404467236bae9fe094637b48ccad37da9d') prepare() { @@ -177,6 +180,7 @@ --enable-kf5 \ --enable-qt5 \ --enable-gtk3 \ + --enable-gtk4 \ --enable-introspection \ --enable-lto \ --enable-openssl \ @@ -193,7 +197,7 @@ --with-system-mdds\ --without-myspell-dicts \ --with-system-libvisio \ - --with-system-libcmis \ + --without-system-libcmis \ --with-system-libmspub \ --with-system-libexttextcat \ --with-system-orcus \ @@ -290,7 +294,7 @@ 'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'libpagemaker' 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' - 'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient' + 'liblangtag' 'libexttextcat' 'liborcus' # 'libfbclient' 'libcmis' 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' 'gpgme' 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d' #'zxing-cpp' @@ -309,6 +313,7 @@ 'mariadb-libs: for mysql-connector' 'coin-or-mp: required by the Calc solver' 'gtk3: for GTK3 integration' + 'gtk4: for GTK4 integration (experimental)' 'kio: for KF5 KDE desktop integration') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc Modified: libreoffice-fresh.csh =================================================================== --- libreoffice-fresh.csh 2022-09-08 17:32:17 UTC (rev 455609) +++ libreoffice-fresh.csh 2022-09-08 18:05:19 UTC (rev 455610) @@ -5,3 +5,4 @@ #setenv SAL_USE_VCLPLUGIN kf5 #setenv SAL_USE_VCLPLUGIN qt5 #setenv SAL_USE_VCLPLUGIN gtk3 +#setenv SAL_USE_VCLPLUGIN gtk4 Modified: libreoffice-fresh.sh =================================================================== --- libreoffice-fresh.sh 2022-09-08 17:32:17 UTC (rev 455609) +++ libreoffice-fresh.sh 2022-09-08 18:05:19 UTC (rev 455610) @@ -5,3 +5,4 @@ #export SAL_USE_VCLPLUGIN=kf5 #export SAL_USE_VCLPLUGIN=qt5 #export SAL_USE_VCLPLUGIN=gtk3 +#export SAL_USE_VCLPLUGIN=gtk4
