1 |
commit: bb92360d332e021a36ed663263ef01e565a9e529 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 14 13:04:49 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 14 13:39:15 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb92360d |
7 |
|
8 |
app-office/libreoffice: Fix build with >=sys-devel/bison-3.8 |
9 |
|
10 |
Revert sys-devel/bison upper bound. |
11 |
|
12 |
See also: |
13 |
https://lists.freedesktop.org/archives/libreoffice/2021-September/087852.html |
14 |
|
15 |
Upstream commit 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 |
16 |
|
17 |
Closes: https://bugs.gentoo.org/812923 |
18 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
19 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
20 |
|
21 |
.../files/libreoffice-7.1.5.2-bison-3.8.patch | 53 ++++++++++++++++++++++ |
22 |
app-office/libreoffice/libreoffice-7.1.5.2.ebuild | 1 + |
23 |
app-office/libreoffice/libreoffice-7.1.6.2.ebuild | 4 +- |
24 |
3 files changed, 56 insertions(+), 2 deletions(-) |
25 |
|
26 |
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 |
27 |
new file mode 100644 |
28 |
index 00000000000..b60b99a6c6c |
29 |
--- /dev/null |
30 |
+++ b/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch |
31 |
@@ -0,0 +1,53 @@ |
32 |
+From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001 |
33 |
+From: Stephan Bergmann <sbergman@××××××.com> |
34 |
+Date: Tue, 14 Sep 2021 12:20:48 +0200 |
35 |
+Subject: Adapt to Bison 3.8 internal yyn -> yyrule rename |
36 |
+ |
37 |
+see |
38 |
+<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865> |
39 |
+"glr2.cc: log the execution of deferred actions" including "Rename argument yyn |
40 |
+as yyrule for clarity." |
41 |
+ |
42 |
+YYBISON was defined as 1 rather than as a representation of the Bison version |
43 |
+prior to |
44 |
+<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09> |
45 |
+"yacc.c: provide the Bison version as an integral macro", which shouldn't be a |
46 |
+problem here. And YYBISON is apparently completely undefined with |
47 |
+/usr/bin/bison on macOS. |
48 |
+ |
49 |
+(The preceding comment always mentioned "yyi" and "yyrmap" in apparent mismatch |
50 |
+with the actually used "yyn" and "yyr1" ever since |
51 |
+c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it |
52 |
+untouched.) |
53 |
+ |
54 |
+Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0 |
55 |
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082 |
56 |
+Tested-by: Jenkins |
57 |
+Reviewed-by: Stephan Bergmann <sbergman@××××××.com> |
58 |
+--- |
59 |
+ connectivity/source/parse/sqlbison.y | 6 ++++++ |
60 |
+ 1 file changed, 6 insertions(+) |
61 |
+ |
62 |
+diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y |
63 |
+index d14f36e7794f..c4be0bc00bd0 100644 |
64 |
+--- a/connectivity/source/parse/sqlbison.y |
65 |
++++ b/connectivity/source/parse/sqlbison.y |
66 |
+@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _newValue, |
67 |
+ |
68 |
+ // yyi is the internal number of the rule that is currently being reduced |
69 |
+ // This can be mapped to external rule number via the yyrmap. |
70 |
++#if defined YYBISON && YYBISON >= 30800 |
71 |
++#define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyrule]) |
72 |
++#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyrule]) |
73 |
++#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyrule]) |
74 |
++#else |
75 |
+ #define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyn]) |
76 |
+ #define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyn]) |
77 |
+ #define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyn]) |
78 |
++#endif |
79 |
+ |
80 |
+ |
81 |
+ extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER; |
82 |
+-- |
83 |
+cgit v1.2.1 |
84 |
+ |
85 |
|
86 |
diff --git a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild |
87 |
index c44dee00e18..08d09ea8bd9 100644 |
88 |
--- a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild |
89 |
+++ b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild |
90 |
@@ -295,6 +295,7 @@ PATCHES=( |
91 |
|
92 |
# master branch |
93 |
"${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432 |
94 |
+ "${FILESDIR}/${P}-bison-3.8.patch" # bug 812923 |
95 |
) |
96 |
|
97 |
S="${WORKDIR}/${PN}-${MY_PV}" |
98 |
|
99 |
diff --git a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild |
100 |
index ec8c361bf6c..f2d42758311 100644 |
101 |
--- a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild |
102 |
+++ b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild |
103 |
@@ -107,10 +107,9 @@ SLOT="0" |
104 |
[[ ${MY_PV} == *9999* ]] || \ |
105 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" |
106 |
|
107 |
-# Bison upper bound due to bug #812923 |
108 |
BDEPEND=" |
109 |
dev-util/intltool |
110 |
- <sys-devel/bison-3.8.1 |
111 |
+ sys-devel/bison |
112 |
sys-devel/flex |
113 |
sys-devel/gettext |
114 |
virtual/pkgconfig |
115 |
@@ -302,6 +301,7 @@ PATCHES=( |
116 |
|
117 |
# master branch |
118 |
"${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432 |
119 |
+ "${FILESDIR}/${PN}-7.1.5.2-bison-3.8.patch" # bug 812923 |
120 |
) |
121 |
|
122 |
S="${WORKDIR}/${PN}-${MY_PV}" |