| 1 |
commit: db869f1cfa8ee0887d6729bcdc29e3865800e64e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 4 23:01:23 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 5 00:34:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db869f1c |
| 7 |
|
| 8 |
app-office/libreoffice: Fix build w/ USE=pdfimport and poppler-0.62 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/642602 |
| 11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 12 |
|
| 13 |
.../files/libreoffice-5.4.4.2-poppler-0.62.patch | 44 ++++++++++++++++++++++ |
| 14 |
app-office/libreoffice/libreoffice-5.4.4.2.ebuild | 3 +- |
| 15 |
2 files changed, 46 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..e6d7dff898d |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch |
| 22 |
@@ -0,0 +1,44 @@ |
| 23 |
+Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version. |
| 24 |
+ |
| 25 |
+--- a/configure.ac 2017-12-12 18:45:07.000000000 +0100 |
| 26 |
++++ b/configure.ac 2018-01-04 23:57:16.410999542 +0100 |
| 27 |
+@@ -10403,7 +10403,7 @@ |
| 28 |
+ if test "$with_system_poppler" = "yes"; then |
| 29 |
+ AC_MSG_RESULT([external]) |
| 30 |
+ SYSTEM_POPPLER=TRUE |
| 31 |
+- PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 ) |
| 32 |
++ PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 ) |
| 33 |
+ AC_LANG_PUSH([C++]) |
| 34 |
+ save_CXXFLAGS=$CXXFLAGS |
| 35 |
+ save_CPPFLAGS=$CPPFLAGS |
| 36 |
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2017-12-12 18:45:07.000000000 +0100 |
| 37 |
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-05 00:29:16.541246738 +0100 |
| 38 |
+@@ -32,13 +32,11 @@ |
| 39 |
+ #pragma warning(push, 1) |
| 40 |
+ #endif |
| 41 |
+ |
| 42 |
+-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 |
| 43 |
+ // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) |
| 44 |
+ // because the internal poppler does not provide poppler-version.h and the macro always returns 0 |
| 45 |
+-#if POPPLER_CHECK_VERSION(0, 21, 1) |
| 46 |
+-#include "UTF8.h" |
| 47 |
+-#elif POPPLER_CHECK_VERSION(0, 21, 0) |
| 48 |
+-#include "UTF.h" |
| 49 |
++// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0 |
| 50 |
++#if POPPLER_CHECK_VERSION(0, 62, 0) |
| 51 |
++#include "UnicodeMapFuncs.h" |
| 52 |
+ #else |
| 53 |
+ #include "UTF8.h" |
| 54 |
+ #endif |
| 55 |
+@@ -918,7 +916,11 @@ |
| 56 |
+ ); |
| 57 |
+ |
| 58 |
+ // silence spurious warning |
| 59 |
++#if POPPLER_CHECK_VERSION(0, 62, 0) |
| 60 |
++ (void)&mapUTF16; |
| 61 |
++#else |
| 62 |
+ (void)&mapUCS2; |
| 63 |
++#endif |
| 64 |
+ |
| 65 |
+ char buf[9]; |
| 66 |
+ for( int i=0; i<uLen; ++i ) |
| 67 |
|
| 68 |
diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild |
| 69 |
index 303d903bcb7..2e4b24caa4b 100644 |
| 70 |
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild |
| 71 |
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild |
| 72 |
@@ -1,4 +1,4 @@ |
| 73 |
-# Copyright 1999-2017 Gentoo Foundation |
| 74 |
+# Copyright 1999-2018 Gentoo Foundation |
| 75 |
# Distributed under the terms of the GNU General Public License v2 |
| 76 |
|
| 77 |
EAPI=6 |
| 78 |
@@ -246,6 +246,7 @@ PATCHES=( |
| 79 |
# TODO: upstream |
| 80 |
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
| 81 |
"${FILESDIR}/${P}-gtk3-no-gtk-build.patch" # bug 641812 |
| 82 |
+ "${FILESDIR}/${P}-poppler-0.62.patch" # bug 642602 |
| 83 |
) |
| 84 |
|
| 85 |
pkg_pretend() { |
Archives