summaryrefslogtreecommitdiff
path: root/libreoffice
diff options
context:
space:
mode:
authorTim Biermann <tbier@posteo.de>2021-09-19 12:23:02 +0200
committerTim Biermann <tbier@posteo.de>2021-09-19 12:39:02 +0200
commit0ad1a41c88748b713b3a9a6a44b851b827de5173 (patch)
tree123e2d2829838ddad171c84c9ae524dad5159179 /libreoffice
parent9a45162fbee1e9a3655f37ca803471602de8d96c (diff)
downloadcontrib-0ad1a41c88748b713b3a9a6a44b851b827de5173.tar.gz
contrib-0ad1a41c88748b713b3a9a6a44b851b827de5173.tar.xz
libreoffice: fix build with newer bison
Diffstat (limited to 'libreoffice')
-rw-r--r--libreoffice/Pkgfile5
-rw-r--r--libreoffice/bison.patch53
2 files changed, 57 insertions, 1 deletions
diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile
index b72bfe3bf..45331eb3e 100644
--- a/libreoffice/Pkgfile
+++ b/libreoffice/Pkgfile
@@ -16,7 +16,8 @@ source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/
#https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
https://dev-www.libreoffice.org/src/pdfium-$pdfiumversion.tar.bz2
#https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz
- makefile.in.patch pdfium-use-system-libopenjpeg.diff)
+ makefile.in.patch pdfium-use-system-libopenjpeg.diff
+ bison.patch)
# unpack_source() {{{
unpack_source() {
@@ -50,6 +51,8 @@ build() {
cd $name-$version
patch -Np1 -i $SRC/makefile.in.patch
+ patch -Np1 -i $SRC/bison.patch
+
# https://sources.debian.org/patches/libreoffice/1:7.1.4%7Erc1-1/pdfium-use-system-libopenjpeg.diff/
patch -Np1 -i $SRC/pdfium-use-system-libopenjpeg.diff
diff --git a/libreoffice/bison.patch b/libreoffice/bison.patch
new file mode 100644
index 000000000..b60b99a6c
--- /dev/null
+++ b/libreoffice/bison.patch
@@ -0,0 +1,53 @@
+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: 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 d14f36e7794f..c4be0bc00bd0 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;
+--
+cgit v1.2.1
+

Generated by cgit