/[gentoo-x86]/app-office/libreoffice/files/libreoffice-poppler-0.18.0-2.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-poppler-0.18.0-2.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Thu Apr 26 11:53:14 2012 UTC (2 years, 5 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Stable on ppc wrt bug#411449. Cleanup.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

1 From 9540db43f3f1b11d3407a45aefda235d7e78f76b Mon Sep 17 00:00:00 2001
2 From: Caolán McNamara <caolanm@redhat.com>
3 Date: Fri, 02 Sep 2011 12:15:49 +0000
4 Subject: Resolves: rhbz#735182 libreoffice doesn't build with poppler-0.17.3
5
6 ---
7 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
8 index 5022dd5..bd6d721 100644
9 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
10 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
11 @@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer )
12 void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
13 {
14 // dump JPEG file as-is
15 +#if POPPLER_CHECK_VERSION(0, 17, 3)
16 + str = str->getBaseStream();
17 +#else
18 str = ((DCTStream *)str)->getRawStream();
19 +#endif
20 str->reset();
21
22 int c;
23 @@ -490,7 +494,7 @@ void PDFOutDev::endPage()
24 }
25
26 #if POPPLER_CHECK_VERSION(0, 17, 0)
27 -void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
28 +void PDFOutDev::processLink(AnnotLink *link, Catalog *)
29 #else
30 void PDFOutDev::processLink(Link* link, Catalog*)
31 #endif
32 --
33 cgit v0.9.0.2-2-gbebe

  ViewVC Help
Powered by ViewVC 1.1.20