[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0-2-304-g305679d
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit 0de3deabbc675ae2a84c147dc395765a9ca603a9
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jul 31 14:58:01 2013 +0200
fix for poppler>0.23
diff --git a/patches/fix-for-poppler-0.23.diff b/patches/fix-for-poppler-0.23.diff
new file mode 100644
index 0000000..5e90387
--- /dev/null
+++ b/patches/fix-for-poppler-0.23.diff
@@ -0,0 +1,48 @@
+From 26f3411018c412f9173f1278fe9749b884e3d3b1 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Wed, 31 Jul 2013 14:55:24 +0200
+Subject: [PATCH] fix for poppler >0.23
+
+Change-Id: I89a3edce2d84855299d91a5a7142e40002258dcf
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 6 +++++-
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 4ee6a59..a840f03 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -491,7 +491,11 @@ PDFOutDev::~PDFOutDev()
+ delete m_pUtf8Map;
+ }
+
+-void PDFOutDev::startPage(int /*pageNum*/, GfxState* state)
++void PDFOutDev::startPage(int /*pageNum*/, GfxState* state
++#if POPPLER_CHECK_VERSION(0, 23, 0) || POPPLER_CHECK_VERSION(0, 24, 0)
++ , XRef* /*xref*/
++#endif
++)
+ {
+ assert(state);
+ printf("startPage %f %f\n",
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index 2daa5b8..2a6d806 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -178,7 +178,11 @@ namespace pdfi
+ virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE;
+
+ // Start a page.
+- virtual void startPage(int pageNum, GfxState *state) SAL_OVERRIDE;
++ virtual void startPage(int pageNum, GfxState *state
++#if POPPLER_CHECK_VERSION(0, 23, 0) || POPPLER_CHECK_VERSION(0, 24, 0)
++ , XRef* /*xref*/
++#endif
++) SAL_OVERRIDE;
+
+ // End a page.
+ virtual void endPage() SAL_OVERRIDE;
+--
+1.8.3.2
+
diff --git a/patches/series b/patches/series
index 2aec0d1..dc9b528 100644
--- a/patches/series
+++ b/patches/series
@@ -32,3 +32,4 @@ fix-kk-in-lo-xlate-lang.diff
hack-interlck_sparc.diff
#revert-ba6478560792e0eec161142c8cfbc0e08cd7a4f5.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
+fix-for-poppler-0.23.diff
--
LibreOffice packaging repository
Reply to: