mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
extra/libreoffice-still to 7.1.7-1
This commit is contained in:
David Beauchamp
parent
5cc780248a
commit
48af0d5665
2 changed files with 6 additions and 61 deletions
|
|
@ -18,9 +18,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
|
|||
|
||||
pkgbase=libreoffice-still
|
||||
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
|
||||
_LOver=7.1.6.2
|
||||
pkgver=7.1.6
|
||||
pkgrel=3
|
||||
_LOver=7.1.7.2
|
||||
pkgver=7.1.7
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
license=('LGPL3')
|
||||
url="https://www.libreoffice.org/"
|
||||
|
|
@ -67,7 +67,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
|
|||
${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
|
||||
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
make-pyuno-work-with-system-wide-module-install.diff
|
||||
bison-3.8.patch
|
||||
soffice-template.desktop.in
|
||||
libreoffice-still.sh libreoffice-still.csh)
|
||||
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
|
|
@ -90,11 +89,11 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
|||
185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
)
|
||||
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
|
||||
sha256sums=('18a312994b5afa173a5744a8f3730c13018f843c2a038086ec41cdfeaaa536bc'
|
||||
sha256sums=('4fdf0809d8803388bd13ace2b3457f0a6ab9f9ef7c98d6f46cc640fffc5e94ba'
|
||||
'SKIP'
|
||||
'616cf35c83dd2b201643b8de32feee11da9351893aba6edf17a65bb71fee48ac'
|
||||
'8c016b3b847238d84f1f71f9416d122fc21de776c1bc9ec063148db4b846e2b4'
|
||||
'SKIP'
|
||||
'630693d71eff62bc70c7b44b1e388061340959856fd6ce4dfa17306d1977744d'
|
||||
'83cb249b4d91e67472174f596cbf6426a33146a690d007e995eb432b70008209'
|
||||
'SKIP'
|
||||
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
|
||||
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
|
||||
|
|
@ -116,7 +115,6 @@ sha256sums=('18a312994b5afa173a5744a8f3730c13018f843c2a038086ec41cdfeaaa536bc'
|
|||
'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
|
||||
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
|
||||
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
|
||||
'e1f46d84deb0c4e7ddbd1c5422e015940aa5ae43a5e2b8f10e88a0317aaa4ed0'
|
||||
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
|
||||
'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
|
||||
'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1')
|
||||
|
|
@ -140,9 +138,6 @@ prepare() {
|
|||
# fix not upstreamable pyuno paths - FS#54250
|
||||
patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
|
||||
|
||||
# fix build with bison 3.8
|
||||
patch -Np1 -i "${srcdir}"/bison-3.8.patch
|
||||
|
||||
#use the CFLAGS but remove the LibO overridden ones
|
||||
for i in $CFLAGS; do
|
||||
case "$i" in
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Bergmann <sbergman@redhat.com>
|
||||
Date: Tue, 14 Sep 2021 12:20:48 +0200
|
||||
Subject: [PATCH] Adapt to Bison 3.8 internal yyn -> yyrule rename
|
||||
|
||||
see
|
||||
<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865>
|
||||
"glr2.cc: log the execution of deferred actions" including "Rename argument yyn
|
||||
as yyrule for clarity."
|
||||
|
||||
YYBISON was defined as 1 rather than as a representation of the Bison version
|
||||
prior to
|
||||
<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09>
|
||||
"yacc.c: provide the Bison version as an integral macro", which shouldn't be a
|
||||
problem here. And YYBISON is apparently completely undefined with
|
||||
/usr/bin/bison on macOS.
|
||||
|
||||
(The preceding comment always mentioned "yyi" and "yyrmap" in apparent mismatch
|
||||
with the actually used "yyn" and "yyr1" ever since
|
||||
c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it
|
||||
untouched.)
|
||||
|
||||
Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082
|
||||
Tested-by: Jenkins
|
||||
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
||||
---
|
||||
connectivity/source/parse/sqlbison.y | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
|
||||
index d14f36e7794f0..c4be0bc00bd04 100644
|
||||
--- a/connectivity/source/parse/sqlbison.y
|
||||
+++ b/connectivity/source/parse/sqlbison.y
|
||||
@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _newValue,
|
||||
|
||||
// yyi is the internal number of the rule that is currently being reduced
|
||||
// This can be mapped to external rule number via the yyrmap.
|
||||
+#if defined YYBISON && YYBISON >= 30800
|
||||
+#define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyrule])
|
||||
+#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyrule])
|
||||
+#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyrule])
|
||||
+#else
|
||||
#define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyn])
|
||||
#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyn])
|
||||
#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyn])
|
||||
+#endif
|
||||
|
||||
|
||||
extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
|
||||
Loading…
Reference in a new issue