Author: krejzi Date: Tue Jul 30 10:48:00 2013 New Revision: 2679 Log: add l-o patch.
Added: trunk/libreoffice/libreoffice-4.1.0.4-system_poppler-1.patch Added: trunk/libreoffice/libreoffice-4.1.0.4-system_poppler-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libreoffice/libreoffice-4.1.0.4-system_poppler-1.patch Tue Jul 30 10:48:00 2013 (r2679) @@ -0,0 +1,56 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2013-07-30 +Initial Package Version: 4.1.0.4 +Upstream Status: Fixed Upstream +Origin: Upstream +Description: Fixes building when using Poppler 0.24.x + +From 1d9a5ff666e0b458af58e337eddb81da670c6834 Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmla...@suse.cz> +Date: Tue, 16 Jul 2013 14:45:31 +0000 +Subject: fix build with system poppler-0.23.0 + +XRef *xref parameter has been added to the OutputDev::startPage method, see +http://cgit.freedesktop.org/poppler/poppler/commit/?id=8eb489c355d734a72e140ce7e32470d048362499 + +Change-Id: I7ad875bf58f6998e639c740f0dac3795738cd1db +Reviewed-on: https://gerrit.libreoffice.org/4939 +Reviewed-by: Andras Timar <ati...@suse.com> +Tested-by: Andras Timar <ati...@suse.com> +--- +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index 4ee6a59..9d9b841 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) ++ , 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..12ae281 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) ++ , XRef *xref ++#endif ++ ) SAL_OVERRIDE; + + // End a page. + virtual void endPage() SAL_OVERRIDE; +-- +cgit v0.9.0.2-2-gbebe -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
