| 1 |
commit: 6fd18438a7e0fe384b4cf4ebb9ae8bdb17351334 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 28 22:24:11 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 29 10:40:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd18438 |
| 7 |
|
| 8 |
app-office/libreoffice: Update skia tarball |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 11 |
Thanks-to: Jason A. Donenfeld <zx2c4 <AT> gentoo.org> |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-office/libreoffice/Manifest | 2 +- |
| 15 |
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++--- |
| 16 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 19 |
index bd974fb80fb..77502cb3e9f 100644 |
| 20 |
--- a/app-office/libreoffice/Manifest |
| 21 |
+++ b/app-office/libreoffice/Manifest |
| 22 |
@@ -22,4 +22,4 @@ DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a54 |
| 23 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
| 24 |
DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501 |
| 25 |
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3 |
| 26 |
-DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb |
| 27 |
+DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1 |
| 28 |
|
| 29 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 30 |
index a4e55bc7595..0b84974d047 100644 |
| 31 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 32 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 33 |
@@ -47,8 +47,8 @@ ADDONS_SRC=( |
| 34 |
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c |
| 35 |
"${ADDONS_URI}/dtoa-20180411.tgz" |
| 36 |
# not packaged in Gentoo, https://skia.org/ |
| 37 |
- "${ADDONS_URI}/skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz" |
| 38 |
- # QR code generating library for >=libreoffice-6.4 |
| 39 |
+ "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz" |
| 40 |
+ # QR code generating library for >=libreoffice-6.4, bug #691740 |
| 41 |
"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz" |
| 42 |
"base? ( |
| 43 |
${ADDONS_URI}/commons-logging-1.2-src.tar.gz |
| 44 |
@@ -396,7 +396,7 @@ src_configure() { |
| 45 |
# --without-system-sane: just sane.h header that is used for scan in writer, |
| 46 |
# not linked or anything else, worthless to depend on |
| 47 |
# --disable-pdfium: not yet packaged |
| 48 |
- # --without-system-qrencode: has no real build system and LO is the only user |
| 49 |
+ # --without-system-qrcodegen: has no real build system and LO is the only user |
| 50 |
local myeconfargs=( |
| 51 |
--with-system-dicts |
| 52 |
--with-system-epoxy |
Archives