From e1b161786e86a71f7f1fc2b7d5b8b0b6f8441528 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 13 Feb 2019 13:54:50 +0000 Subject: [PATCH] extra/libreoffice-fresh to 6.2.0-3 --- extra/libreoffice-fresh/PKGBUILD | 14 ++++++++------ extra/libreoffice-fresh/libreoffice-fresh.csh | 2 ++ extra/libreoffice-fresh/libreoffice-fresh.sh | 2 ++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index 607725ea0..0da6ad65e 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -20,10 +20,10 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=6.2.0.3 pkgver=6.2.0 -pkgrel=2 +pkgrel=3 arch=('x86_64') license=('LGPL3') -url="http://www.libreoffice.org/" +url="https://www.libreoffice.org/" makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps' 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' @@ -44,8 +44,8 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'lib _mirror="http://mirror.sjc02.svwh.net/tdf/libreoffice/src/${pkgver}" #_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}" #_mirror="https://dev-builds.libreoffice.org/pre-releases/src" -_additional_source_url="http://dev-www.libreoffice.org/src" -_additional_source_url2="http://dev-www.libreoffice.org/extern" +_additional_source_url="https://dev-www.libreoffice.org/src" +_additional_source_url2="https://dev-www.libreoffice.org/extern" source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs @@ -105,8 +105,8 @@ sha256sums=('87d0581afbc582fdccf5e95a749a38572c62979a4b1c7f144b4854b93d6b1ade' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' '5099c5e7818a327b661c45c0bd218835c1e70b14861b5112525da1d48beebf8c' - '28c97effbe55e43a1370ab141c676cec9daba9e3dc408bec78136dfefc892a8b' - '7af3113c804e4d58c7de3b5ed10f515fc46e349a580ba56eebfc6e891acbef89') + 'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2' + '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6') prepare() { @@ -165,6 +165,8 @@ build() { --enable-evolution2\ --enable-gio\ --enable-gtk3-kde5 \ + --enable-kde5 \ + --enable-qt5 \ --enable-gtk3 \ --enable-introspection \ --disable-gstreamer-0-10 \ diff --git a/extra/libreoffice-fresh/libreoffice-fresh.csh b/extra/libreoffice-fresh/libreoffice-fresh.csh index e5a138cd6..d699bab19 100644 --- a/extra/libreoffice-fresh/libreoffice-fresh.csh +++ b/extra/libreoffice-fresh/libreoffice-fresh.csh @@ -2,5 +2,7 @@ #setenv SAL_USE_VCLPLUGIN gen #setenv SAL_USE_VCLPLUGIN gtk3_kde5 +#setenv SAL_USE_VCLPLUGIN kde5 +#setenv SAL_USE_VCLPLUGIN qt5 #setenv SAL_USE_VCLPLUGIN gtk #setenv SAL_USE_VCLPLUGIN gtk3 diff --git a/extra/libreoffice-fresh/libreoffice-fresh.sh b/extra/libreoffice-fresh/libreoffice-fresh.sh index 084721b4c..ae636d437 100644 --- a/extra/libreoffice-fresh/libreoffice-fresh.sh +++ b/extra/libreoffice-fresh/libreoffice-fresh.sh @@ -2,5 +2,7 @@ #export SAL_USE_VCLPLUGIN=gen #export SAL_USE_VCLPLUGIN=gtk3_kde5 +#export SAL_USE_VCLPLUGIN=kde5 +#export SAL_USE_VCLPLUGIN=qt5 #export SAL_USE_VCLPLUGIN=gtk #export SAL_USE_VCLPLUGIN=gtk3