1 |
commit: ecdea30cd4b1c5df9e7642921f0004f5137607a5 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 30 21:21:27 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 30 21:21:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecdea30c |
7 |
|
8 |
app-text/poppler: backport jpeg buildfix, bug #670252 |
9 |
|
10 |
jpeg-9c defines TRUE and FALSE as 'enum' values not compatible to bool. |
11 |
|
12 |
Reported-by: Toralf Förster |
13 |
Closes: https://bugs.gentoo.org/670252 |
14 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
15 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
16 |
|
17 |
app-text/poppler/files/poppler-0.68.0-bool.patch | 36 ++++++++++++++++++++++++ |
18 |
app-text/poppler/poppler-0.68.0.ebuild | 1 + |
19 |
2 files changed, 37 insertions(+) |
20 |
|
21 |
diff --git a/app-text/poppler/files/poppler-0.68.0-bool.patch b/app-text/poppler/files/poppler-0.68.0-bool.patch |
22 |
new file mode 100644 |
23 |
index 00000000000..a2d8ba7bd40 |
24 |
--- /dev/null |
25 |
+++ b/app-text/poppler/files/poppler-0.68.0-bool.patch |
26 |
@@ -0,0 +1,36 @@ |
27 |
+https://bugs.gentoo.org/670252 |
28 |
+ |
29 |
+From de34900993bff73c8da651319027b2fa8c490172 Mon Sep 17 00:00:00 2001 |
30 |
+From: Ed Porras <ed@×××××××××.com> |
31 |
+Date: Sun, 26 Aug 2018 20:24:23 +0200 |
32 |
+Subject: [PATCH] fix macOS compilation due to boolean define in jpeglib |
33 |
+ |
34 |
+typedef enum { FALSE = 0, TRUE = 1 } boolean; |
35 |
+--- |
36 |
+ goo/JpegWriter.cc | 3 ++- |
37 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
38 |
+ |
39 |
+diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc |
40 |
+index 16c97afe..26fa77a7 100644 |
41 |
+--- a/goo/JpegWriter.cc |
42 |
++++ b/goo/JpegWriter.cc |
43 |
+@@ -11,6 +11,7 @@ |
44 |
+ // Copyright (C) 2013 Peter Breitenlohner <peb@×××××××××.de> |
45 |
+ // Copyright (C) 2017, 2018 Albert Astals Cid <aacid@×××.org> |
46 |
+ // Copyright (C) 2018 Martin Packman <gzlist@××××××××××.com> |
47 |
++// Copyright (C) 2018 Ed Porras <ed@×××××××××.com> |
48 |
+ // |
49 |
+ //======================================================================== |
50 |
+ |
51 |
+@@ -143,7 +144,7 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI) |
52 |
+ } |
53 |
+ |
54 |
+ // Set whether to compute optimal Huffman coding tables |
55 |
+- priv->cinfo.optimize_coding = priv->optimize; |
56 |
++ priv->cinfo.optimize_coding = static_cast<boolean>(priv->optimize); |
57 |
+ |
58 |
+ // Get ready for data |
59 |
+ jpeg_start_compress(&priv->cinfo, TRUE); |
60 |
+-- |
61 |
+2.20.1 |
62 |
+ |
63 |
|
64 |
diff --git a/app-text/poppler/poppler-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild |
65 |
index 16588ae074d..e2839fc0c54 100644 |
66 |
--- a/app-text/poppler/poppler-0.68.0.ebuild |
67 |
+++ b/app-text/poppler/poppler-0.68.0.ebuild |
68 |
@@ -61,6 +61,7 @@ PATCHES=( |
69 |
"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" |
70 |
"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" |
71 |
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" |
72 |
+ "${FILESDIR}/${PN}-0.68.0-bool.patch" |
73 |
) |
74 |
|
75 |
src_prepare() { |