diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2023-11-21 21:39:38 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-11-21 23:19:55 +0100 |
| commit | 843bdb95b1c4ffa74c35a5f5100dd90c224195fb (patch) | |
| tree | ddecca116a0acb4e5605fa1c71db246f2a02e43a /app-office | |
| parent | dev-cpp/libcmis: Fix build with dev-libs/libxml2-2.12.0 (diff) | |
| download | gentoo-843bdb95b1c4ffa74c35a5f5100dd90c224195fb.tar.gz gentoo-843bdb95b1c4ffa74c35a5f5100dd90c224195fb.tar.bz2 gentoo-843bdb95b1c4ffa74c35a5f5100dd90c224195fb.zip | |
app-office/libreoffice: Update dev-cpp/libcmis min version/slot op
Closes: https://bugs.gentoo.org/915608
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch | 39 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild (renamed from app-office/libreoffice/libreoffice-7.5.8.2-r1.ebuild) | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 2 |
3 files changed, 45 insertions, 2 deletions
diff --git a/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch b/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch new file mode 100644 index 000000000000..ae029a3c9a2c --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch @@ -0,0 +1,39 @@ +From e9320e567d6bca32783d0f716f386761d03a875a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com> +Date: Mon, 13 Nov 2023 10:13:50 +0000 +Subject: upgrade libcmis +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change-Id: Ie2d5f3f8208f9952db5be10905b5905cd03b91de +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159366 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> +(cherry picked from commit 3368447e826d4204086e4d8bfe59af4412c16233) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159454 +Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> +(cherry picked from commit 25b159729f1202ca2a42de5e76f22718d68400c8) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159589 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +(limited to 'configure.ac') + +diff --git a/configure.ac b/configure.ac +index a88c81646c40..bdd08abeeeb5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7532,7 +7532,7 @@ AC_SUBST(GPERF) + dnl =================================================================== + dnl Check for system libcmis + dnl =================================================================== +-libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.2],enabled) ++libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.6 >= 0.6.1],enabled) + + dnl =================================================================== + dnl C++11 +-- +cgit v1.2.1 + diff --git a/app-office/libreoffice/libreoffice-7.5.8.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild index 71f73d7ece24..855040bd7842 100644 --- a/app-office/libreoffice/libreoffice-7.5.8.2-r1.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.5.2-r2:= dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] @@ -351,6 +351,10 @@ 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 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index a24e522bc074..a706f71b5698 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -127,7 +127,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] |