extra/libreoffice-still to 7.5.9-1

This commit is contained in:
Kevin Mihelich 2023-12-08 00:25:26 +00:00
parent 394fd1d3bd
commit 38c146a25b
3 changed files with 17 additions and 63 deletions

View file

@ -1,6 +1,6 @@
pkgbase = libreoffice-still
pkgver = 7.5.8
pkgrel = 2
pkgver = 7.5.9
pkgrel = 1
url = https://www.libreoffice.org/
arch = x86_64
license = LGPL3
@ -114,12 +114,12 @@ pkgbase = libreoffice-still
noextract = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
noextract = 185d60944ea767075d27247c3162b3bc-unowinreg.dll
options = !lto
source = https://download.documentfoundation.org/libreoffice/src/7.5.8/libreoffice-7.5.8.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/7.5.8/libreoffice-7.5.8.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/7.5.8/libreoffice-help-7.5.8.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/7.5.8/libreoffice-help-7.5.8.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/7.5.8/libreoffice-translations-7.5.8.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/7.5.8/libreoffice-translations-7.5.8.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-7.5.9.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-7.5.9.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-help-7.5.9.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-help-7.5.9.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-translations-7.5.9.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-translations-7.5.9.2.tar.xz.asc
source = https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
source = https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
source = https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@ -143,16 +143,15 @@ pkgbase = libreoffice-still
source = make-pyuno-work-with-system-wide-module-install.diff
source = 623ea5c.diff
source = fix-build-against-system-libxml-2.12.diff
source = libreoffice-7.5.8.2-libcmis-0.6.patch
source = soffice-template.desktop.in
source = libreoffice-still.sh
source = libreoffice-still.csh
validpgpkeys = C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3
sha256sums = b4ea75bba0860d030dd5ac011210e960c8bb579fdfca57df77c9ba99cda1223f
sha256sums = 372a7a131c940d0984c4fdeb5e03adc389a520a6adc397b649d3f267ad1188d6
sha256sums = SKIP
sha256sums = 8ce2bcf6dd8df81ed2bd19e08b6d077d60188acae55679b9b82020b994d8d3e7
sha256sums = a391cb8d546eb0f4c718e9876a8ec2646130b977d592b0e27c467d0de32e31f5
sha256sums = SKIP
sha256sums = 14baf113696b5ce929f91be0fa083fb8f6c77a9c66365aaf7b6d8d2a97123dbb
sha256sums = 67bbfc017a334d93274b969d22f4814f5f29d78af2c386deae627c19d918aff2
sha256sums = SKIP
sha256sums = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
sha256sums = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
@ -177,7 +176,6 @@ pkgbase = libreoffice-still
sha256sums = c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563
sha256sums = 440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5
sha256sums = 793a52abff29b3db51a1db9686b561911b9b3de70bd6dd02bbc1d78fcd960648
sha256sums = 56ef3079ff8829dc4e4ddcca37a808f36a19adee0e017ab4c871c0f466712d6d
sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879
sha256sums = b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e
sha256sums = 66f2cb5d2ff9909ee9633aea73d5306fc8c4ff358fa526f45d9994210d3e23ff

View file

@ -17,9 +17,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
pkgbase=libreoffice-still
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
_LOver=7.5.8.2
pkgver=7.5.8
pkgrel=2
_LOver=7.5.9.2
pkgver=7.5.9
pkgrel=1
arch=('x86_64')
license=('LGPL3')
url="https://www.libreoffice.org/"
@ -68,7 +68,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
make-pyuno-work-with-system-wide-module-install.diff
623ea5c.diff
fix-build-against-system-libxml-2.12.diff
libreoffice-7.5.8.2-libcmis-0.6.patch
soffice-template.desktop.in
libreoffice-still.sh libreoffice-still.csh)
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@ -92,11 +91,11 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
185d60944ea767075d27247c3162b3bc-unowinreg.dll
)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
sha256sums=('b4ea75bba0860d030dd5ac011210e960c8bb579fdfca57df77c9ba99cda1223f'
sha256sums=('372a7a131c940d0984c4fdeb5e03adc389a520a6adc397b649d3f267ad1188d6'
'SKIP'
'8ce2bcf6dd8df81ed2bd19e08b6d077d60188acae55679b9b82020b994d8d3e7'
'a391cb8d546eb0f4c718e9876a8ec2646130b977d592b0e27c467d0de32e31f5'
'SKIP'
'14baf113696b5ce929f91be0fa083fb8f6c77a9c66365aaf7b6d8d2a97123dbb'
'67bbfc017a334d93274b969d22f4814f5f29d78af2c386deae627c19d918aff2'
'SKIP'
'a49a58e8070ec111cc40efc9cdab32e8a1894d6a7788319306ccc461128e87c0'
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@ -121,7 +120,6 @@ sha256sums=('b4ea75bba0860d030dd5ac011210e960c8bb579fdfca57df77c9ba99cda1223f'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
'440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5'
'793a52abff29b3db51a1db9686b561911b9b3de70bd6dd02bbc1d78fcd960648'
'56ef3079ff8829dc4e4ddcca37a808f36a19adee0e017ab4c871c0f466712d6d'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
'b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e'
@ -149,9 +147,6 @@ prepare() {
# fix build - https://gerrit.libreoffice.org/c/core/+/145421
patch -Np1 -i "${srcdir}"/623ea5c.diff
# fix build with libcmis 0.6.x
patch -Np1 -i "${srcdir}"/libreoffice-7.5.8.2-libcmis-0.6.patch
# fix build with libxml2 2.12
patch -Np1 -i "${srcdir}"/fix-build-against-system-libxml-2.12.diff

View file

@ -1,39 +0,0 @@
From e9320e567d6bca32783d0f716f386761d03a875a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
Date: Mon, 13 Nov 2023 10:13:50 +0000
Subject: upgrade libcmis
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Ie2d5f3f8208f9952db5be10905b5905cd03b91de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159366
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit 3368447e826d4204086e4d8bfe59af4412c16233)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159454
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 25b159729f1202ca2a42de5e76f22718d68400c8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159589
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'configure.ac')
diff --git a/configure.ac b/configure.ac
index a88c81646c40..bdd08abeeeb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7532,7 +7532,7 @@ AC_SUBST(GPERF)
dnl ===================================================================
dnl Check for system libcmis
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.2],enabled)
+libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.6 >= 0.6.1],enabled)
dnl ===================================================================
dnl C++11
--
cgit v1.2.1