| 1 |
commit: e26d94743f7bd791f371004bd3d61ed9c851711a |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 18 21:59:29 2021 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 18 21:59:29 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e26d9474 |
| 7 |
|
| 8 |
app-office/libreoffice: sync with ::gentoo |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/libreoffice/Manifest | 4 +- |
| 14 |
.../files/libreoffice-7.1.5.2-bison-3.8.patch | 53 ++++++++++++++++++++++ |
| 15 |
...e-7.1.3.2.ebuild => libreoffice-7.1.5.2.ebuild} | 9 ++-- |
| 16 |
3 files changed, 60 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 19 |
index 14a9b2c..ccd6906 100644 |
| 20 |
--- a/app-office/libreoffice/Manifest |
| 21 |
+++ b/app-office/libreoffice/Manifest |
| 22 |
@@ -17,7 +17,7 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d |
| 23 |
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 |
| 24 |
DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743 |
| 25 |
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114 |
| 26 |
-DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72 |
| 27 |
+DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f |
| 28 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
| 29 |
-DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb |
| 30 |
+DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7 |
| 31 |
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d |
| 32 |
|
| 33 |
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 |
| 34 |
new file mode 100644 |
| 35 |
index 0000000..b60b99a |
| 36 |
--- /dev/null |
| 37 |
+++ b/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch |
| 38 |
@@ -0,0 +1,53 @@ |
| 39 |
+From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001 |
| 40 |
+From: Stephan Bergmann <sbergman@××××××.com> |
| 41 |
+Date: Tue, 14 Sep 2021 12:20:48 +0200 |
| 42 |
+Subject: Adapt to Bison 3.8 internal yyn -> yyrule rename |
| 43 |
+ |
| 44 |
+see |
| 45 |
+<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865> |
| 46 |
+"glr2.cc: log the execution of deferred actions" including "Rename argument yyn |
| 47 |
+as yyrule for clarity." |
| 48 |
+ |
| 49 |
+YYBISON was defined as 1 rather than as a representation of the Bison version |
| 50 |
+prior to |
| 51 |
+<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09> |
| 52 |
+"yacc.c: provide the Bison version as an integral macro", which shouldn't be a |
| 53 |
+problem here. And YYBISON is apparently completely undefined with |
| 54 |
+/usr/bin/bison on macOS. |
| 55 |
+ |
| 56 |
+(The preceding comment always mentioned "yyi" and "yyrmap" in apparent mismatch |
| 57 |
+with the actually used "yyn" and "yyr1" ever since |
| 58 |
+c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it |
| 59 |
+untouched.) |
| 60 |
+ |
| 61 |
+Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0 |
| 62 |
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082 |
| 63 |
+Tested-by: Jenkins |
| 64 |
+Reviewed-by: Stephan Bergmann <sbergman@××××××.com> |
| 65 |
+--- |
| 66 |
+ connectivity/source/parse/sqlbison.y | 6 ++++++ |
| 67 |
+ 1 file changed, 6 insertions(+) |
| 68 |
+ |
| 69 |
+diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y |
| 70 |
+index d14f36e7794f..c4be0bc00bd0 100644 |
| 71 |
+--- a/connectivity/source/parse/sqlbison.y |
| 72 |
++++ b/connectivity/source/parse/sqlbison.y |
| 73 |
+@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _newValue, |
| 74 |
+ |
| 75 |
+ // yyi is the internal number of the rule that is currently being reduced |
| 76 |
+ // This can be mapped to external rule number via the yyrmap. |
| 77 |
++#if defined YYBISON && YYBISON >= 30800 |
| 78 |
++#define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyrule]) |
| 79 |
++#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyrule]) |
| 80 |
++#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyrule]) |
| 81 |
++#else |
| 82 |
+ #define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyn]) |
| 83 |
+ #define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyn]) |
| 84 |
+ #define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyn]) |
| 85 |
++#endif |
| 86 |
+ |
| 87 |
+ |
| 88 |
+ extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER; |
| 89 |
+-- |
| 90 |
+cgit v1.2.1 |
| 91 |
+ |
| 92 |
|
| 93 |
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild |
| 94 |
similarity index 98% |
| 95 |
rename from app-office/libreoffice/libreoffice-7.1.3.2.ebuild |
| 96 |
rename to app-office/libreoffice/libreoffice-7.1.5.2.ebuild |
| 97 |
index f45e96d..788fada 100644 |
| 98 |
--- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild |
| 99 |
+++ b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild |
| 100 |
@@ -3,7 +3,7 @@ |
| 101 |
|
| 102 |
EAPI=7 |
| 103 |
|
| 104 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
| 105 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 106 |
PYTHON_REQ_USE="threads(+),xml" |
| 107 |
|
| 108 |
MY_PV="${PV/_alpha/.alpha}" |
| 109 |
@@ -177,7 +177,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 110 |
x11-libs/libXrandr |
| 111 |
x11-libs/libXrender |
| 112 |
accessibility? ( |
| 113 |
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]') |
| 114 |
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]') |
| 115 |
) |
| 116 |
bluetooth? ( |
| 117 |
dev-libs/glib:2 |
| 118 |
@@ -213,7 +213,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 119 |
dev-libs/glib:2 |
| 120 |
dev-libs/gobject-introspection |
| 121 |
gnome-base/dconf |
| 122 |
- media-libs/mesa[egl] |
| 123 |
+ media-libs/mesa[egl(+)] |
| 124 |
x11-libs/gtk+:3[X] |
| 125 |
x11-libs/pango |
| 126 |
) |
| 127 |
@@ -294,7 +294,8 @@ PATCHES=( |
| 128 |
"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch" |
| 129 |
|
| 130 |
# master branch |
| 131 |
- "${FILESDIR}/${P}-bashism.patch" # bug 780432 |
| 132 |
+ "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432 |
| 133 |
+ "${FILESDIR}/${P}-bison-3.8.patch" # bug 812923 |
| 134 |
|
| 135 |
# musl compatibility by AlpineLinux |
| 136 |
"${FILESDIR}/${PN}-6.4.4.2-linux-musl.patch" |
Archives