Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/
Date: Wed, 16 Jan 2019 16:30:27
Message-Id: 1547655785.8b8159552149ecfff420bb0ba86d5474096ae785.asturm@gentoo
1 commit: 8b8159552149ecfff420bb0ba86d5474096ae785
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 16 16:23:05 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 16 16:23:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b815955
7
8 app-office/libreoffice: Fix build with <poppler-0.73
9
10 Package-Manager: Portage-2.3.56, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16 diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
17 index eb6d597c195..fb9112bc398 100644
18 --- a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
19 +++ b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
20 @@ -59,7 +59,7 @@ index da021a2a..443e757 100644
21 typedef std::vector< Output_t > OutputBuffer;
22
23 +#if !POPPLER_CHECK_VERSION(0, 73, 0)
24 -+static_assert(std::is_same_v<Guchar, unsigned char>, "unexpected typedef");
25 ++static_assert(std::is_same<Guchar, unsigned char>::value, "unexpected typedef");
26 +#endif
27 +
28 #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX