diff options
| author | wiz <wiz@pkgsrc.org> | 2021-10-01 11:32:50 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2021-10-01 11:32:50 +0000 |
| commit | be0f54f5ed78acb9cadfb7b219b2a338e3c3e86f (patch) | |
| tree | 1fcc7c5435409b50a11621fce5663886612cce30 /misc/libreoffice | |
| parent | b31d6b4c3b3555f7ce3d10038baec6883ecc0968 (diff) | |
| download | pkgsrc-be0f54f5ed78acb9cadfb7b219b2a338e3c3e86f.tar.gz | |
libreoffice: fix build with bison 3.8
using an upstream patch.
Diffstat (limited to 'misc/libreoffice')
| -rw-r--r-- | misc/libreoffice/distinfo | 3 | ||||
| -rw-r--r-- | misc/libreoffice/patches/patch-connectivity_source_parse_sqlbison.y | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo index 972cddb78db..ea92ce14679 100644 --- a/misc/libreoffice/distinfo +++ b/misc/libreoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.118 2021/09/07 09:49:05 nia Exp $ +$NetBSD: distinfo,v 1.119 2021/10/01 11:32:50 wiz Exp $ SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b @@ -233,6 +233,7 @@ SHA1 (patch-autogen.sh) = 0fed5f88342112bed0f573d426cc2c3d05ed45c7 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 2eed9efc4a145687f409ba87806147dac2210c68 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e664faa4044feaafe8214fdf42f7d008b9aa29fc SHA1 (patch-configure.ac) = e2f8ff7ee73e177082e71360c0e153e03b965bc4 +SHA1 (patch-connectivity_source_parse_sqlbison.y) = f74256cbb6f43387a2a8a8a7401938e5b849d465 SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 1c6e8355c473ddb16d25cb4b0ccd367326b1e9eb SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0a682ef486310474684ccd279e864f96259a3087 diff --git a/misc/libreoffice/patches/patch-connectivity_source_parse_sqlbison.y b/misc/libreoffice/patches/patch-connectivity_source_parse_sqlbison.y new file mode 100644 index 00000000000..b1e64ca1525 --- /dev/null +++ b/misc/libreoffice/patches/patch-connectivity_source_parse_sqlbison.y @@ -0,0 +1,23 @@ +$NetBSD: patch-connectivity_source_parse_sqlbison.y,v 1.1 2021/10/01 11:32:50 wiz Exp $ + +Compatibility with bison-3.8. +https://gerrit.libreoffice.org/c/core/+/122082 + +--- connectivity/source/parse/sqlbison.y.orig 2021-08-16 19:56:28.000000000 +0000 ++++ connectivity/source/parse/sqlbison.y +@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* n + + // 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; |