Update for Poppler 0.90.0

1 files changed, 13 insertions, 13 deletions

diff --git a/0001-Cairo-backend-added-to-Qt5-wrapper.patch b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
index be0d58866e38..d27ff02216f3 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From 42db0fc6f3eab00c3eb2ba1589a5ca8d792a2c56 Mon Sep 17 00:00:00 2001
+From 827a4c097a92a60888499d9d5e4f292e5625b038 Mon Sep 17 00:00:00 2001
 From: Paul Gideon Dann <pdgiddie@gmail.com>
 Date: Wed, 4 Apr 2018 16:36:56 +0100
 Subject: [PATCH 1/4] Cairo backend added to Qt5 wrapper
@@ -12,7 +12,7 @@ Subject: [PATCH 1/4] Cairo backend added to Qt5 wrapper
  5 files changed, 95 insertions(+), 1 deletion(-)
 
 diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
-index e75b5730..23ec62e8 100644
+index 0247fa3f..f52e4a3b 100644
 --- a/qt5/src/CMakeLists.txt
 +++ b/qt5/src/CMakeLists.txt
 @@ -8,6 +8,11 @@ include_directories(
@@ -39,7 +39,7 @@ index e75b5730..23ec62e8 100644
 +  )
 +endif(HAVE_CAIRO)
  add_library(poppler-qt5 ${poppler_qt5_SRCS})
- set_target_properties(poppler-qt5 PROPERTIES VERSION 1.24.0 SOVERSION 1)
+ set_target_properties(poppler-qt5 PROPERTIES VERSION 1.25.0 SOVERSION 1)
  if(MINGW AND BUILD_SHARED_LIBS)
 @@ -46,6 +58,9 @@ if(MINGW AND BUILD_SHARED_LIBS)
      set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
@@ -52,10 +52,10 @@ index e75b5730..23ec62e8 100644
  target_link_libraries(poppler-qt5 poppler ${poppler_LIBS})
  endif()
 diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc
-index cba9da39..89607ca5 100644
+index cc6f01ad..882db5c8 100644
 --- a/qt5/src/poppler-document.cc
 +++ b/qt5/src/poppler-document.cc
-@@ -709,6 +709,9 @@ namespace Poppler {
+@@ -721,6 +721,9 @@ namespace Poppler {
          ret << Document::SplashBackend;
  #endif
          ret << Document::ArthurBackend;
@@ -66,10 +66,10 @@ index cba9da39..89607ca5 100644
      }
  
 diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
-index 35bec6c9..b19cd692 100644
+index 3e67fedd..170728a1 100644
 --- a/qt5/src/poppler-page.cc
 +++ b/qt5/src/poppler-page.cc
-@@ -49,6 +49,7 @@
+@@ -50,6 +50,7 @@
  #include <QtGui/QPainter>
  
  #include <config.h>
@@ -77,7 +77,7 @@ index 35bec6c9..b19cd692 100644
  #include <PDFDoc.h>
  #include <Catalog.h>
  #include <Form.h>
-@@ -62,6 +63,9 @@
+@@ -63,6 +64,9 @@
  #include <SplashOutputDev.h>
  #include <splash/SplashBitmap.h>
  #endif
@@ -87,7 +87,7 @@ index 35bec6c9..b19cd692 100644
  
  #include "poppler-private.h"
  #include "poppler-page-transition-private.h"
-@@ -626,6 +630,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
+@@ -639,6 +643,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
        img = tmpimg;
        break;
      }
@@ -158,7 +158,7 @@ index 35bec6c9..b19cd692 100644
    }
  
    if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload))
-@@ -651,6 +719,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
+@@ -664,6 +732,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
  
          return renderToArthur(&arthur_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags);
      }
@@ -168,10 +168,10 @@ index 35bec6c9..b19cd692 100644
    return false;
  }
 diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h
-index 665f98a4..1f1eb5de 100644
+index 06f6d021..35d8cc17 100644
 --- a/qt5/src/poppler-qt5.h
 +++ b/qt5/src/poppler-qt5.h
-@@ -1153,7 +1153,8 @@ delete it;
+@@ -1154,7 +1154,8 @@ delete it;
  	*/
  	enum RenderBackend {
  	    SplashBackend,   ///< Splash backend
@@ -198,5 +198,5 @@ index b01d0835..561cb5dd 100644
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}")
 -- 
-2.26.2
+2.27.0