commit: bb92360d332e021a36ed663263ef01e565a9e529 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Sep 14 13:04:49 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Sep 14 13:39:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb92360d
app-office/libreoffice: Fix build with >=sys-devel/bison-3.8 Revert sys-devel/bison upper bound. See also: https://lists.freedesktop.org/archives/libreoffice/2021-September/087852.html Upstream commit 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Closes: https://bugs.gentoo.org/812923 Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/libreoffice-7.1.5.2-bison-3.8.patch | 53 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-7.1.5.2.ebuild | 1 + app-office/libreoffice/libreoffice-7.1.6.2.ebuild | 4 +- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch b/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch new file mode 100644 index 00000000000..b60b99a6c6c --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch @@ -0,0 +1,53 @@ +From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <[email protected]> +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 <[email protected]> +--- + 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 + diff --git a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild index c44dee00e18..08d09ea8bd9 100644 --- a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild @@ -295,6 +295,7 @@ PATCHES=( # master branch "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432 + "${FILESDIR}/${P}-bison-3.8.patch" # bug 812923 ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild index ec8c361bf6c..f2d42758311 100644 --- a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild @@ -107,10 +107,9 @@ SLOT="0" [[ ${MY_PV} == *9999* ]] || \ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" -# Bison upper bound due to bug #812923 BDEPEND=" dev-util/intltool - <sys-devel/bison-3.8.1 + sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig @@ -302,6 +301,7 @@ PATCHES=( # master branch "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432 + "${FILESDIR}/${PN}-7.1.5.2-bison-3.8.patch" # bug 812923 ) S="${WORKDIR}/${PN}-${MY_PV}"
