1 |
commit: 1a60273805cf51fd56385301b250d909df53d8c2 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 16 08:16:19 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 16 08:16:57 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a602738 |
7 |
|
8 |
app-office/libreoffice: Fix build with poppler-0.73 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/675452 |
11 |
Package-Manager: Portage-2.3.55, Repoman-2.3.12 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../files/libreoffice-6.2.0.2-poppler-0.73.patch | 101 +++++++++++++++++++++ |
15 |
app-office/libreoffice/libreoffice-6.2.0.2.ebuild | 1 + |
16 |
2 files changed, 102 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..eb6d597c195 |
21 |
--- /dev/null |
22 |
+++ b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch |
23 |
@@ -0,0 +1,101 @@ |
24 |
+From 9e1522ad1d2c2bd775fa50c2b142eb110a56af72 Mon Sep 17 00:00:00 2001 |
25 |
+From: Michael Stahl <Michael.Stahl@×××.de> |
26 |
+Date: Mon, 14 Jan 2019 15:08:42 +0100 |
27 |
+Subject: sdext: fix build with poppler 0.73 |
28 |
+MIME-Version: 1.0 |
29 |
+Content-Type: text/plain; charset=UTF-8 |
30 |
+Content-Transfer-Encoding: 8bit |
31 |
+ |
32 |
+... which has removed Guchar, Gushort, Guint, Gulong... |
33 |
+ |
34 |
+Change-Id: Ia54ad378031f167f6779f6ffe574b85c1e72f26d |
35 |
+Reviewed-on: https://gerrit.libreoffice.org/66305 |
36 |
+Tested-by: Jenkins |
37 |
+Reviewed-by: Michael Stahl <Michael.Stahl@×××.de> |
38 |
+(cherry picked from commit 50d371ae08c66648d9f32f633b2245e1746e2bb6) |
39 |
+Reviewed-on: https://gerrit.libreoffice.org/66356 |
40 |
+Reviewed-by: Caolán McNamara <caolanm@××××××.com> |
41 |
+Tested-by: Caolán McNamara <caolanm@××××××.com> |
42 |
+--- |
43 |
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++-- |
44 |
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 6 +++++- |
45 |
+ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 6 +++--- |
46 |
+ 3 files changed, 10 insertions(+), 6 deletions(-) |
47 |
+ |
48 |
+(limited to 'sdext/source/pdfimport/xpdfwrapper') |
49 |
+ |
50 |
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
51 |
+index 575a90a..35490a0 100644 |
52 |
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
53 |
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
54 |
+@@ -298,7 +298,7 @@ static void writePpm_( OutputBuffer& o_rOutputBuf, |
55 |
+ o_rOutputBuf.resize(header_size); |
56 |
+ |
57 |
+ // initialize stream |
58 |
+- Guchar *p; |
59 |
++ unsigned char *p; |
60 |
+ GfxRGB rgb; |
61 |
+ std::unique_ptr<ImageStream> imgStr( |
62 |
+ new ImageStream(str, |
63 |
+@@ -401,7 +401,7 @@ static void writeImage_( OutputBuffer& o_rOutputBuf, |
64 |
+ oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) }; |
65 |
+ if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray ) |
66 |
+ { |
67 |
+- Guchar nIndex = 0; |
68 |
++ unsigned char nIndex = 0; |
69 |
+ colorMap->getRGB( &nIndex, &zeroColor ); |
70 |
+ nIndex = 1; |
71 |
+ colorMap->getRGB( &nIndex, &oneColor ); |
72 |
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
73 |
+index da021a2a..443e757 100644 |
74 |
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
75 |
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
76 |
+@@ -267,9 +267,13 @@ extern FILE* g_binary_out; |
77 |
+ |
78 |
+ // note: if you ever change Output_t, please keep in mind that the current code |
79 |
+ // relies on it being of 8 bit size |
80 |
+-typedef Guchar Output_t; |
81 |
++typedef unsigned char Output_t; |
82 |
+ typedef std::vector< Output_t > OutputBuffer; |
83 |
+ |
84 |
++#if !POPPLER_CHECK_VERSION(0, 73, 0) |
85 |
++static_assert(std::is_same_v<Guchar, unsigned char>, "unexpected typedef"); |
86 |
++#endif |
87 |
++ |
88 |
+ #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX |
89 |
+ |
90 |
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |
91 |
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx |
92 |
+index 4d9e3bb..b582856 100644 |
93 |
+--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx |
94 |
++++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx |
95 |
+@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, |
96 |
+ appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image |
97 |
+ |
98 |
+ // initialize stream |
99 |
+- Guchar *p, *pm; |
100 |
++ unsigned char *p, *pm; |
101 |
+ GfxRGB rgb; |
102 |
+ GfxGray alpha; |
103 |
+ std::unique_ptr<ImageStream> imgStr( |
104 |
+@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, |
105 |
+ appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image |
106 |
+ |
107 |
+ // initialize stream |
108 |
+- Guchar *p; |
109 |
++ unsigned char *p; |
110 |
+ GfxRGB rgb; |
111 |
+ std::unique_ptr<ImageStream> imgStr( |
112 |
+ new ImageStream(str, |
113 |
+@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, |
114 |
+ { |
115 |
+ for( int x = 0; x < maskWidth; ++x ) |
116 |
+ { |
117 |
+- Guchar aPixel = 0; |
118 |
++ unsigned char aPixel = 0; |
119 |
+ imgStrMask->getPixel( &aPixel ); |
120 |
+ int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line |
121 |
+ (x*width/maskWidth)*4 + 1 + 3 // mapped column |
122 |
+-- |
123 |
+cgit v1.1 |
124 |
+ |
125 |
|
126 |
diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild |
127 |
index 91afb2dd020..9dc3659a431 100644 |
128 |
--- a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild |
129 |
+++ b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild |
130 |
@@ -256,6 +256,7 @@ PATCHES=( |
131 |
# master branch |
132 |
"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch |
133 |
"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch |
134 |
+ "${FILESDIR}"/${P}-poppler-0.73.patch |
135 |
) |
136 |
|
137 |
S="${WORKDIR}/${PN}-${MY_PV}" |