diff options
| author | root <root@rshg054.dnsready.net> | 2013-08-06 01:53:55 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-08-06 01:53:55 -0700 |
| commit | a2fb8ff517d83749ec3b5543aeba805f07ea257d (patch) | |
| tree | 87eac8f03f062c2c5ab3ff3dd92e04c07fb4e896 /extra/libreoffice/poppler_buildfix.diff | |
| parent | b3923b26c3d37257246fea13bdb1151c96cb2fe4 (diff) | |
Tue Aug 6 01:53:08 PDT 2013
Diffstat (limited to 'extra/libreoffice/poppler_buildfix.diff')
| -rw-r--r-- | extra/libreoffice/poppler_buildfix.diff | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/extra/libreoffice/poppler_buildfix.diff b/extra/libreoffice/poppler_buildfix.diff new file mode 100644 index 000000000..ae11d8b1f --- /dev/null +++ b/extra/libreoffice/poppler_buildfix.diff @@ -0,0 +1,50 @@ +From a7688eff345133147984507c35bf444131cc3d63 Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@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/4940 +Reviewed-by: Andras Timar <atimar@suse.com> +Tested-by: Andras Timar <atimar@suse.com> +--- +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index 03adf89..53a77d3 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -481,7 +481,11 @@ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : + { + } + +-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 c0977cb7..4f3d3a9 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -181,7 +181,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 + |