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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

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

1 From 53e66aea4c1b3617363fd138a7903190d964da6b Mon Sep 17 00:00:00 2001
2 From: Tomáš Chvátal <tchvatal@suse.cz>
3 Date: Fri, 30 Sep 2011 09:51:04 +0000
4 Subject: This is merge of f6f8f67460bba296c49f794d14621b7313df4f7d.
5
6 It is not posible to git-am due to merge to core/ repository.
7 It had one minor collision on pdfioutdev_gpl.hxx.
8
9 Orginal header:
10 From f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001
11 From: Caolán McNamara <caolanm@redhat.com>
12 Date: Tue, 19 Jul 2011 07:54:07 +0000
13 Subject: poppler 0.17.0 changed its api for no some reason or other
14 ---
15 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
16 index f7741b4..5022dd5 100644
17 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
18 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
19 @@ -489,7 +489,11 @@ void PDFOutDev::endPage()
20 printf("endPage\n");
21 }
22
23 +#if POPPLER_CHECK_VERSION(0, 17, 0)
24 +void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
25 +#else
26 void PDFOutDev::processLink(Link* link, Catalog*)
27 +#endif
28 {
29 assert(link);
30
31 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
32 index 3ac0f49..8a1708c 100644
33 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
34 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
35 @@ -65,7 +65,10 @@ class GfxPath;
36 class GfxFont;
37 class PDFDoc;
38 #ifndef SYSTEM_POPPLER
39 +#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
40 typedef GString GooString;
41 +#else
42 +#include <glib/poppler-features.h>
43 #endif
44
45 namespace pdfi
46 @@ -193,9 +196,13 @@ namespace pdfi
47 // Convert between device and user coordinates.
48 // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
49 // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
50 -
51 +
52 + #if POPPLER_CHECK_VERSION(0, 17, 0)
53 + virtual void processLink(AnnotLink *link, Catalog *catalog);
54 + #else
55 //----- link borders
56 virtual void processLink(Link *link, Catalog *catalog);
57 + #endif
58
59 //----- save/restore graphics state
60 virtual void saveState(GfxState *state);
61 --
62 cgit v0.9.0.2-2-gbebe

  ViewVC Help
Powered by ViewVC 1.1.20