summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch')
-rw-r--r--app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch72
1 files changed, 0 insertions, 72 deletions
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch
deleted file mode 100644
index 37b44556219f..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 8ff41a26caf51544699863c89598d37d93dc1b21 Mon Sep 17 00:00:00 2001
-From: Aleksei Nikiforov <darktemplar@basealt.ru>
-Date: Thu, 22 Nov 2018 17:54:00 +0300
-Subject: Fix build with poppler 0.71
-
-Change-Id: I470ece9dc4766e10e1ccb5e99b25a8d8cc4cbf38
-Reviewed-on: https://gerrit.libreoffice.org/63860
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++--
- 3 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 ab74b36..101e3be 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
- printf( "restoreState\n" );
- }
-
-+#if POPPLER_CHECK_VERSION(0, 71, 0)
-+void PDFOutDev::setDefaultCTM(const double *pMat)
-+#else
- void PDFOutDev::setDefaultCTM(double *pMat)
-+#endif
- {
- assert(pMat);
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index a6135fa..98d8ede 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -173,7 +173,11 @@ namespace pdfi
- //----- initialization and control
-
- // Set default transform matrix.
-+#if POPPLER_CHECK_VERSION(0, 71, 0)
-+ virtual void setDefaultCTM(const double *ctm) override;
-+#else
- virtual void setDefaultCTM(double *ctm) override;
-+#endif
-
- // Start a page.
- virtual void startPage(int pageNum, GfxState *state
-diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-index 0f4a35b..b0a6ac4 100644
---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-@@ -69,7 +69,7 @@ int main(int argc, char **argv)
-
- // read config file
- globalParams = new GlobalParams();
-- globalParams->setErrQuiet(gTrue);
-+ globalParams->setErrQuiet(true);
- #if defined(_MSC_VER)
- globalParams->setupBaseFonts(nullptr);
- #endif
-@@ -145,7 +145,7 @@ int main(int argc, char **argv)
- i,
- PDFI_OUTDEV_RESOLUTION,
- PDFI_OUTDEV_RESOLUTION,
-- 0, gTrue, gTrue, gTrue);
-+ 0, true, true, true);
- rDoc.processLinks(&aOutDev, i);
- }
-
---
-cgit v1.1
-