From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1572389-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 255A5158099
for <garchives@archives.gentoo.org>; Wed, 22 Nov 2023 23:10:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4E22D2BC01A;
Wed, 22 Nov 2023 23:10:36 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2DC4B2BC01A
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Nov 2023 23:10:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 23C08335D72
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Nov 2023 23:10:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 80A4D13B3
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Nov 2023 23:10:33 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1700694621.de0a360faab26e96b35e811aba21f4d6c41cb010.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
X-VCS-Directories: app-office/libreoffice/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: de0a360faab26e96b35e811aba21f4d6c41cb010
X-VCS-Branch: master
Date: Wed, 22 Nov 2023 23:10:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1447b493-f597-4b07-b901-cee63136832a
X-Archives-Hash: 2e6bcb74b21a53d902695bfe636e0f01
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