Fri Oct 1 11:32:50 2021 UTC ()
libreoffice: fix build with bison 3.8

using an upstream patch.


(wiz)
diff -r1.118 -r1.119 pkgsrc/misc/libreoffice/distinfo
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-connectivity_source_parse_sqlbison.y
cvs diff -r1.118 -r1.119 pkgsrc/misc/libreoffice/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/distinfo 2021/09/07 09:49:05 1.118
+++ pkgsrc/misc/libreoffice/distinfo 2021/10/01 11:32:50 1.119
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.118 2021/09/07 09:49:05 nia Exp $ 1$NetBSD: distinfo,v 1.119 2021/10/01 11:32:50 wiz Exp $
2 2
3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b 4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes 6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes
7SHA1 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = eb99dfe3b37e36f55f4b2053bcf6eb3e3b4ac72a 7SHA1 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = eb99dfe3b37e36f55f4b2053bcf6eb3e3b4ac72a
8RMD160 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 8e3d713fc8b515116baebaa0a6904f1371fb96eb 8RMD160 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 8e3d713fc8b515116baebaa0a6904f1371fb96eb
9SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f 9SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f
10Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes 10Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes
11SHA1 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = bdc4350b771c6c23e8a40b2413595d1055cff2ab 11SHA1 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = bdc4350b771c6c23e8a40b2413595d1055cff2ab
12RMD160 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 4d9bcd7680c173333ddbe3fd3b386acc483322c1 12RMD160 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 4d9bcd7680c173333ddbe3fd3b386acc483322c1
13SHA512 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = f5628efe484b6220d0bf8177aa826c28e7a36f0bcca2019e057c20f5915d579057f931377ec686dbfeebef05fcf6453472be77a21ef282bd9d8d0eaf62549a49 13SHA512 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = f5628efe484b6220d0bf8177aa826c28e7a36f0bcca2019e057c20f5915d579057f931377ec686dbfeebef05fcf6453472be77a21ef282bd9d8d0eaf62549a49
14Size (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 5522795 bytes 14Size (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 5522795 bytes
@@ -223,26 +223,27 @@ Size (libreoffice/ttf-kacst_2.01+mry.tar @@ -223,26 +223,27 @@ Size (libreoffice/ttf-kacst_2.01+mry.tar
223SHA1 (libreoffice/xmlsec1-1.2.32.tar.gz) = 01a5e0a1336a7d67ab21968098d2ae0045dafdbe 223SHA1 (libreoffice/xmlsec1-1.2.32.tar.gz) = 01a5e0a1336a7d67ab21968098d2ae0045dafdbe
224RMD160 (libreoffice/xmlsec1-1.2.32.tar.gz) = 7f372ec157dc762f8c78852bd3bea3d570ae1ed4 224RMD160 (libreoffice/xmlsec1-1.2.32.tar.gz) = 7f372ec157dc762f8c78852bd3bea3d570ae1ed4
225SHA512 (libreoffice/xmlsec1-1.2.32.tar.gz) = 39a90e154fe760b9cb01090c0232aa6c88c595fea87a771bebdd7b38ab274e3be719d6314065d9f02b854c7be9c8ec3557e57e0158ff3696413de3424f14389e 225SHA512 (libreoffice/xmlsec1-1.2.32.tar.gz) = 39a90e154fe760b9cb01090c0232aa6c88c595fea87a771bebdd7b38ab274e3be719d6314065d9f02b854c7be9c8ec3557e57e0158ff3696413de3424f14389e
226Size (libreoffice/xmlsec1-1.2.32.tar.gz) = 1989258 bytes 226Size (libreoffice/xmlsec1-1.2.32.tar.gz) = 1989258 bytes
227SHA1 (libreoffice/zxing-cpp-1.1.1.tar.gz) = 56421905cb3cedae153a8d33c348948b9acc513c 227SHA1 (libreoffice/zxing-cpp-1.1.1.tar.gz) = 56421905cb3cedae153a8d33c348948b9acc513c
228RMD160 (libreoffice/zxing-cpp-1.1.1.tar.gz) = 0b972156af90af67d8572979b7bd0e8ebf59459d 228RMD160 (libreoffice/zxing-cpp-1.1.1.tar.gz) = 0b972156af90af67d8572979b7bd0e8ebf59459d
229SHA512 (libreoffice/zxing-cpp-1.1.1.tar.gz) = c7d97df147602e31e58eede54413814378895e9710cf266de984b22965a9a3f4c67648a0bf936a8bc8b213b45def59d1e5b34d6ce516265333dd2c0430554dc7 229SHA512 (libreoffice/zxing-cpp-1.1.1.tar.gz) = c7d97df147602e31e58eede54413814378895e9710cf266de984b22965a9a3f4c67648a0bf936a8bc8b213b45def59d1e5b34d6ce516265333dd2c0430554dc7
230Size (libreoffice/zxing-cpp-1.1.1.tar.gz) = 128925736 bytes 230Size (libreoffice/zxing-cpp-1.1.1.tar.gz) = 128925736 bytes
231SHA1 (patch-Makefile.in) = c16214631f0e40af4b366c790c7b84e0e11a892e 231SHA1 (patch-Makefile.in) = c16214631f0e40af4b366c790c7b84e0e11a892e
232SHA1 (patch-autogen.sh) = 0fed5f88342112bed0f573d426cc2c3d05ed45c7 232SHA1 (patch-autogen.sh) = 0fed5f88342112bed0f573d426cc2c3d05ed45c7
233SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 2eed9efc4a145687f409ba87806147dac2210c68 233SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 2eed9efc4a145687f409ba87806147dac2210c68
234SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e664faa4044feaafe8214fdf42f7d008b9aa29fc 234SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e664faa4044feaafe8214fdf42f7d008b9aa29fc
235SHA1 (patch-configure.ac) = e2f8ff7ee73e177082e71360c0e153e03b965bc4 235SHA1 (patch-configure.ac) = e2f8ff7ee73e177082e71360c0e153e03b965bc4
 236SHA1 (patch-connectivity_source_parse_sqlbison.y) = f74256cbb6f43387a2a8a8a7401938e5b849d465
236SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c 237SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c
237SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 1c6e8355c473ddb16d25cb4b0ccd367326b1e9eb 238SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 1c6e8355c473ddb16d25cb4b0ccd367326b1e9eb
238SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0a682ef486310474684ccd279e864f96259a3087 239SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0a682ef486310474684ccd279e864f96259a3087
239SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = c8a82ce0c3d293108daa41f81d9cee376ca50a82 240SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = c8a82ce0c3d293108daa41f81d9cee376ca50a82
240SHA1 (patch-external_pdfium_Library__pdfium.mk) = f7c6d5da07cd3d7b2ee327a0df0581e7fe441621 241SHA1 (patch-external_pdfium_Library__pdfium.mk) = f7c6d5da07cd3d7b2ee327a0df0581e7fe441621
241SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = b5806e94fd125e900385aa571bccaedba9878b90 242SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = b5806e94fd125e900385aa571bccaedba9878b90
242SHA1 (patch-external_pdfium_pkgsrc.patch.1) = 73caf3d17499cb58cc338c9214b6bafdd79ff7cd 243SHA1 (patch-external_pdfium_pkgsrc.patch.1) = 73caf3d17499cb58cc338c9214b6bafdd79ff7cd
243SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 545a10100e439b996e3f235a8a5dff682fd48879 244SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 545a10100e439b996e3f235a8a5dff682fd48879
244SHA1 (patch-external_skia_Library__skia.mk) = bf97a0724bd8cb5e249b63e60e85e2e7217cfdad 245SHA1 (patch-external_skia_Library__skia.mk) = bf97a0724bd8cb5e249b63e60e85e2e7217cfdad
245SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 670eeb8c9a0fa0b15b1f192e7a3b9a7a749209f7 246SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 670eeb8c9a0fa0b15b1f192e7a3b9a7a749209f7
246SHA1 (patch-external_skia_netbsd.patch.0) = aee67c27c7507003bade1fe93d82bd56d0890840 247SHA1 (patch-external_skia_netbsd.patch.0) = aee67c27c7507003bade1fe93d82bd56d0890840
247SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 014d48574a379f92f2d0afe3c91d2c2956708dd8 248SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 014d48574a379f92f2d0afe3c91d2c2956708dd8
248SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = e871e2096c367e742dc5758fe60ae819846def29 249SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = e871e2096c367e742dc5758fe60ae819846def29
File Added: pkgsrc/misc/libreoffice/patches/Attic/patch-connectivity_source_parse_sqlbison.y
$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;