| 1 |
commit: 32a6a0e837f901c0cdeab1b9765030aaea916ba5 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 7 18:08:31 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 7 18:28:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a6a0e8 |
| 7 |
|
| 8 |
app-office/libreoffice: Switch to bundled libcmis-0.5.2 |
| 9 |
|
| 10 |
Fixes >=7.1.6.2 build error due to incompatible patches: |
| 11 |
https://github.com/tdf/libcmis/pull/43 |
| 12 |
|
| 13 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
app-office/libreoffice/Manifest | 1 + |
| 17 |
app-office/libreoffice/libreoffice-7.1.9999.ebuild | 4 ++++ |
| 18 |
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++++ |
| 19 |
3 files changed, 9 insertions(+) |
| 20 |
|
| 21 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 22 |
index 639c9655e71..bbb1df88721 100644 |
| 23 |
--- a/app-office/libreoffice/Manifest |
| 24 |
+++ b/app-office/libreoffice/Manifest |
| 25 |
@@ -17,6 +17,7 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d |
| 26 |
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 |
| 27 |
DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743 |
| 28 |
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114 |
| 29 |
+DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b |
| 30 |
DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72 |
| 31 |
DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f |
| 32 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
| 33 |
|
| 34 |
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild |
| 35 |
index 7ce776f6f00..229e39b60b6 100644 |
| 36 |
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild |
| 37 |
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild |
| 38 |
@@ -44,6 +44,9 @@ unset DEV_URI |
| 39 |
# These are bundles that can't be removed for now due to huge patchsets. |
| 40 |
# If you want them gone, patches are welcome. |
| 41 |
ADDONS_SRC=( |
| 42 |
+ # broken against latest upstream release, too many patches on top: |
| 43 |
+ # https://github.com/tdf/libcmis/pull/43 |
| 44 |
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz" |
| 45 |
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c |
| 46 |
"${ADDONS_URI}/dtoa-20180411.tgz" |
| 47 |
# not packaged in Gentoo, https://skia.org/ |
| 48 |
@@ -507,6 +510,7 @@ src_configure() { |
| 49 |
--with-system-gpgmepp |
| 50 |
--without-system-jfreereport |
| 51 |
--without-system_apache_commons |
| 52 |
+ --without-system-libcmis |
| 53 |
--without-system-sane |
| 54 |
--without-system-qrcodegen |
| 55 |
$(use_enable base report-builder) |
| 56 |
|
| 57 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 58 |
index 6ca28c7797e..48469b754b1 100644 |
| 59 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 60 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 61 |
@@ -44,6 +44,9 @@ unset DEV_URI |
| 62 |
# These are bundles that can't be removed for now due to huge patchsets. |
| 63 |
# If you want them gone, patches are welcome. |
| 64 |
ADDONS_SRC=( |
| 65 |
+ # broken against latest upstream release, too many patches on top: |
| 66 |
+ # https://github.com/tdf/libcmis/pull/43 |
| 67 |
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz" |
| 68 |
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c |
| 69 |
"${ADDONS_URI}/dtoa-20180411.tgz" |
| 70 |
# not packaged in Gentoo, https://skia.org/ |
| 71 |
@@ -504,6 +507,7 @@ src_configure() { |
| 72 |
--with-system-gpgmepp |
| 73 |
--without-system-jfreereport |
| 74 |
--without-system_apache_commons |
| 75 |
+ --without-system-libcmis |
| 76 |
--without-system-sane |
| 77 |
$(use_enable base report-builder) |
| 78 |
$(use_enable bluetooth sdremote-bluetooth) |
Archives