1 |
scarabeus 11/09/29 13:42:10 |
2 |
|
3 |
Added: libreoffice-poppler-0.18.0.patch |
4 |
Log: |
5 |
Add patch to make libreoffice build with poppler-0.18. |
6 |
|
7 |
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: libreoffice-poppler-0.18.0.patch |
16 |
=================================================================== |
17 |
From 91313fc05abbfe35ee1e0c2464a28dd580780f07 Mon Sep 17 00:00:00 2001 |
18 |
From: Caolán McNamara <caolanm@××××××.com> |
19 |
Date: Fri, 02 Sep 2011 12:15:49 +0000 |
20 |
Subject: Resolves: rhbz#735182 libreoffice doesn't build with poppler-0.17.3 |
21 |
|
22 |
--- |
23 |
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
24 |
index cf28922..3f1261c 100644 |
25 |
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
26 |
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
27 |
@@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer ) |
28 |
void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) |
29 |
{ |
30 |
// dump JPEG file as-is |
31 |
+#if POPPLER_CHECK_VERSION(0, 17, 3) |
32 |
+ str = str->getBaseStream(); |
33 |
+#else |
34 |
str = ((DCTStream *)str)->getRawStream(); |
35 |
+#endif |
36 |
str->reset(); |
37 |
|
38 |
int c; |
39 |
@@ -490,7 +494,7 @@ void PDFOutDev::endPage() |
40 |
} |
41 |
|
42 |
#if POPPLER_CHECK_VERSION(0, 17, 0) |
43 |
-void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog) |
44 |
+void PDFOutDev::processLink(AnnotLink *link, Catalog *) |
45 |
#else |
46 |
void PDFOutDev::processLink(Link* link, Catalog*) |
47 |
#endif |
48 |
-- |
49 |
cgit v0.9.0.2-2-gbebe |