/[gentoo-x86]/app-office/libreoffice/files/libreoffice-3.6.3.2-fix-poppler.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-3.6.3.2-fix-poppler.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Tue Jan 1 10:56:54 2013 UTC (19 months, 2 weeks ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Use python-r1 eclass. Drop 3.5 series as 3.6 seem fine wrt regressions for now.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

1 From 1296db324d5962ff904c0ed488a62132dd36a66f Mon Sep 17 00:00:00 2001
2 From: Rene Engelhard <rene@debian.org>
3 Date: Wed, 31 Oct 2012 17:00:18 +0000
4 Subject: fix sdext build with poppler >= 0.19.x
5
6 Conflicts:
7
8 configure.ac
9
10 Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a
11 Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
12 ---
13 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
14 index 87c0ab2..9d38e9b 100644
15 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
16 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
17 @@ -497,7 +497,9 @@ void PDFOutDev::endPage()
18 printf("endPage\n");
19 }
20
21 -#if POPPLER_CHECK_VERSION(0, 17, 0)
22 +#if POPPLER_CHECK_VERSION(0, 19, 0)
23 +void PDFOutDev::processLink(AnnotLink *link)
24 +#elif POPPLER_CHECK_VERSION(0, 17, 0)
25 void PDFOutDev::processLink(AnnotLink *link, Catalog *)
26 #else
27 void PDFOutDev::processLink(Link* link, Catalog*)
28 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
29 index bba8f58..1911d57 100644
30 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
31 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
32 @@ -201,10 +201,12 @@ namespace pdfi
33 // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
34 // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
35
36 - #if POPPLER_CHECK_VERSION(0, 17, 0)
37 - virtual void processLink(AnnotLink *link, Catalog *catalog);
38 - #else
39 //----- link borders
40 + #if POPPLER_CHECK_VERSION(0, 19, 0)
41 + virtual void processLink(AnnotLink *link);
42 + #elif POPPLER_CHECK_VERSION(0, 17, 0)
43 + virtual void processLink(AnnotLink *link, Catalog *catalog);
44 + #else
45 virtual void processLink(Link *link, Catalog *catalog);
46 #endif
47
48 --
49 cgit v0.9.0.2-2-gbebe

  ViewVC Help
Powered by ViewVC 1.1.20