commit: de0a360faab26e96b35e811aba21f4d6c41cb010 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Nov 22 23:08:28 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Nov 22 23:10:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0a360f
app-office/libreoffice: Raise minimum dev-cpp/libcmis version to 0.6.2 Made necessary by follow-up patch backported from 7.5.9.1. Closes: https://bugs.gentoo.org/917752 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild index e2f24692185b..58778eaca03c 100644 --- a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild +++ b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild @@ -126,7 +126,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 - >=dev-cpp/libcmis-0.5.2-r2:= + >=dev-cpp/libcmis-0.6.2:0= dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] @@ -299,6 +299,7 @@ PATCHES=( "${FILESDIR}/libreoffice-7.5.8.2-icu-74-compatibility.patch" # 7.5.9.1 + "${FILESDIR}/${P}-libcmis-0.6.patch" # prerequisite for below "${FILESDIR}/${P}-curl-8.3.0-mitigation.patch" # bug 891903(?) # git master @@ -354,10 +355,6 @@ src_unpack() { } src_prepare() { - if has_version '>=dev-cpp/libcmis-0.6.1'; then - PATCHES+=( "${FILESDIR}/${P}-libcmis-0.6.patch" ) # from 7.5.9.1 - fi - default # sandbox violations on many systems, we don't need it. Bug #646406
