From 6b885ff885ef98923ef99d96a0c660a560d7b3a3 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Mon, 12 Dec 2022 14:17:47 +0000 Subject: [PATCH] extra/libreoffice-fresh to 7.4.3-3 --- extra/libreoffice-fresh/PKGBUILD | 15 ++++++++++----- extra/libreoffice-fresh/libreoffice-fresh.csh | 1 + extra/libreoffice-fresh/libreoffice-fresh.sh | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index ce0d7237d..8e3a4c80b 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -19,7 +19,7 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=7.4.3.2 pkgver=7.4.3 -pkgrel=2 +pkgrel=3 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/" @@ -30,7 +30,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'lib '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' 'gtk4' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene' + 'gperf' 'gtk3' 'gtk4' 'qt5-base' 'plasma-framework' 'qt6-base' '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' @@ -120,8 +120,8 @@ sha256sums=('ffbcbb182e2296ec68ea2ec46bce80a40d53540729c00280ad541cd83c69db3b' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' - 'b20cc7c79e8e5d2c56eb17cf0f1e3bea7a2ceb243308a1bff3af24bf54f7d1f5' - 'b679a22ecad2892ac9854d80c5c77e404467236bae9fe094637b48ccad37da9d') + 'b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e' + '66f2cb5d2ff9909ee9633aea73d5306fc8c4ff358fa526f45d9994210d3e23ff') prepare() { @@ -160,6 +160,9 @@ build() { # http://site.icu-project.org/download/61#TOC-Migration-Issues CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1' + # fix build with qt6 expecting libexec path + export qt6_libexec_dirs="/usr/lib/qt6" + ./autogen.sh --with-extra-buildid="${pkgver}-${pkgrel}" \ --with-vendor="Arch Linux" \ --enable-split-app-modules \ @@ -178,6 +181,7 @@ build() { --enable-gtk3-kde5 \ --enable-kf5 \ --enable-qt5 \ + --enable-qt6 \ --enable-gtk3 \ --enable-gtk4 \ --enable-introspection \ @@ -311,7 +315,8 @@ package_libreoffice-fresh() { 'coin-or-mp: required by the Calc solver' 'gtk3: for GTK3 integration' 'gtk4: for GTK4 integration (experimental)' - 'kio: for KF5 KDE desktop integration') + 'kio: for KF5 KDE desktop integration' + 'qt6-base: for QT6 desktop integration') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf diff --git a/extra/libreoffice-fresh/libreoffice-fresh.csh b/extra/libreoffice-fresh/libreoffice-fresh.csh index 04a32765b..a278dc4bc 100644 --- a/extra/libreoffice-fresh/libreoffice-fresh.csh +++ b/extra/libreoffice-fresh/libreoffice-fresh.csh @@ -4,5 +4,6 @@ #setenv SAL_USE_VCLPLUGIN gtk3_kde5 #setenv SAL_USE_VCLPLUGIN kf5 #setenv SAL_USE_VCLPLUGIN qt5 +#setenv SAL_USE_VCLPLUGIN qt6 #setenv SAL_USE_VCLPLUGIN gtk3 #setenv SAL_USE_VCLPLUGIN gtk4 diff --git a/extra/libreoffice-fresh/libreoffice-fresh.sh b/extra/libreoffice-fresh/libreoffice-fresh.sh index c0a592dd1..563cd7f45 100644 --- a/extra/libreoffice-fresh/libreoffice-fresh.sh +++ b/extra/libreoffice-fresh/libreoffice-fresh.sh @@ -4,5 +4,6 @@ #export SAL_USE_VCLPLUGIN=gtk3_kde5 #export SAL_USE_VCLPLUGIN=kf5 #export SAL_USE_VCLPLUGIN=qt5 +#export SAL_USE_VCLPLUGIN=qt6 #export SAL_USE_VCLPLUGIN=gtk3 #export SAL_USE_VCLPLUGIN=gtk4