From 365a025b00618b259a8da96d57f771c151ae3fef Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 20 Feb 2020 14:48:32 +0000 Subject: [PATCH] extra/libreoffice-still to 6.3.5-1 --- extra/libreoffice-still/PKGBUILD | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/extra/libreoffice-still/PKGBUILD b/extra/libreoffice-still/PKGBUILD index 2388947a1..4ba20dad3 100644 --- a/extra/libreoffice-still/PKGBUILD +++ b/extra/libreoffice-still/PKGBUILD @@ -18,9 +18,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') -_LOver=6.3.4.2 -pkgver=6.3.4 -pkgrel=2 +_LOver=6.3.5.2 +pkgver=6.3.5 +pkgrel=1 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/" @@ -63,8 +63,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} make-pyuno-work-with-system-wide-module-install.diff soffice-template.desktop.in libreoffice-still.sh libreoffice-still.csh - libreoffice-poppler-0.82.patch::"https://github.com/LibreOffice/core/commit/2eadd46a.patch" - libreoffice-poppler-0.83.patch::"https://github.com/LibreOffice/core/commit/9065cd8d.patch" 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -82,11 +80,11 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 185d60944ea767075d27247c3162b3bc-unowinreg.dll ) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) -sha256sums=('cb72559aa9774f2c13e8fa78391d8f30f3c6f02e3fd83b2311bd643a5cdde49c' +sha256sums=('ffdb61dc01f18d85272dc798c3403ba74569b0b3e90f3cdc7d014710c3f6ca4a' 'SKIP' - '8eac0f6a846c90ab06490c0fec144d108da7f88082175eea28b81a0e8942af06' + 'a639d5ff1fa63672e52c3ab1be49ec9720dfafacc21e3ce7958b994d19e568dc' 'SKIP' - '74a11926ba96ad2fa373a3231ad2e283d95e2ba4a1458c4c625686569f6f5fe9' + '5bee1b53acb909b2fa70235b98a985e937032eeaa6034aa4d3b9c760d74ae005' 'SKIP' '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' @@ -107,8 +105,6 @@ sha256sums=('cb72559aa9774f2c13e8fa78391d8f30f3c6f02e3fd83b2311bd643a5cdde49c' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2' '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6' - 'd649a07b38af95e9012633e71829fef3001e8a5830544ce7e91856df27f69c4b' - 'a769b0e093a58a0d2b681a1ce4aec2c763157f27b82c86e8644e2055cf5f8e99' '77214ebc425916990ed80e9508572fd1d565412e1f8c2289424457e3d9bcbc79') prepare() { @@ -138,8 +134,6 @@ prepare() { ARCH_FLAGS="$ARCH_FLAGS $i" done - # fix build with poppler 0.83 - patch -p1 -i ../libreoffice-poppler-0.83.patch # fix build with updated system liborcus/mdds; patch taken from Fedora patch -Np1 -i ../0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch }