| 1 |
scarabeus 12/11/02 12:22:25 |
| 2 |
|
| 3 |
Added: libreoffice-3.6.3.2-fix-poppler.patch |
| 4 |
Log: |
| 5 |
Bump to latest to fix sec issue #440922, 3.5 straing to stable, not much stuff else to break shit up. Also fix the poppler crash with pdf import filter #430670. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8EEE3BE8) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-office/libreoffice/files/libreoffice-3.6.3.2-fix-poppler.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.6.3.2-fix-poppler.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.6.3.2-fix-poppler.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libreoffice-3.6.3.2-fix-poppler.patch |
| 16 |
=================================================================== |
| 17 |
From 1296db324d5962ff904c0ed488a62132dd36a66f Mon Sep 17 00:00:00 2001 |
| 18 |
From: Rene Engelhard <rene@××××××.org> |
| 19 |
Date: Wed, 31 Oct 2012 17:00:18 +0000 |
| 20 |
Subject: fix sdext build with poppler >= 0.19.x |
| 21 |
|
| 22 |
Conflicts: |
| 23 |
|
| 24 |
configure.ac |
| 25 |
|
| 26 |
Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a |
| 27 |
Signed-off-by: Tomas Chvatal <tchvatal@××××.cz> |
| 28 |
--- |
| 29 |
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
| 30 |
index 87c0ab2..9d38e9b 100644 |
| 31 |
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
| 32 |
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
| 33 |
@@ -497,7 +497,9 @@ void PDFOutDev::endPage() |
| 34 |
printf("endPage\n"); |
| 35 |
} |
| 36 |
|
| 37 |
-#if POPPLER_CHECK_VERSION(0, 17, 0) |
| 38 |
+#if POPPLER_CHECK_VERSION(0, 19, 0) |
| 39 |
+void PDFOutDev::processLink(AnnotLink *link) |
| 40 |
+#elif POPPLER_CHECK_VERSION(0, 17, 0) |
| 41 |
void PDFOutDev::processLink(AnnotLink *link, Catalog *) |
| 42 |
#else |
| 43 |
void PDFOutDev::processLink(Link* link, Catalog*) |
| 44 |
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
| 45 |
index bba8f58..1911d57 100644 |
| 46 |
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
| 47 |
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |
| 48 |
@@ -201,10 +201,12 @@ namespace pdfi |
| 49 |
// virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); |
| 50 |
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); |
| 51 |
|
| 52 |
- #if POPPLER_CHECK_VERSION(0, 17, 0) |
| 53 |
- virtual void processLink(AnnotLink *link, Catalog *catalog); |
| 54 |
- #else |
| 55 |
//----- link borders |
| 56 |
+ #if POPPLER_CHECK_VERSION(0, 19, 0) |
| 57 |
+ virtual void processLink(AnnotLink *link); |
| 58 |
+ #elif POPPLER_CHECK_VERSION(0, 17, 0) |
| 59 |
+ virtual void processLink(AnnotLink *link, Catalog *catalog); |
| 60 |
+ #else |
| 61 |
virtual void processLink(Link *link, Catalog *catalog); |
| 62 |
#endif |
| 63 |
|
| 64 |
-- |
| 65 |
cgit v0.9.0.2-2-gbebe |
Archives