version 0.63.0

5 files changed, 41 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dcafe07b436e..96b3e51675cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = poppler-qt5-cairo
 	pkgdesc = Poppler Qt5 bindings, with patches to use the Cairo backend instead of Splash
-	pkgver = 0.61.1
+	pkgver = 0.63.0
 	pkgrel = 1
 	arch = i686
 	arch = x86_64
@@ -9,17 +9,17 @@ pkgbase = poppler-qt5-cairo
 	makedepends = pkgconfig
 	depends = qt5-base
 	depends = cairo
-	depends = poppler>=0.61.1
-	provides = poppler-qt5=0.61.1
+	depends = poppler>=0.63.0
+	provides = poppler-qt5=0.63.0
 	conflicts = poppler-qt5
-	source = http://poppler.freedesktop.org/poppler-0.61.1.tar.xz
+	source = http://poppler.freedesktop.org/poppler-0.63.0.tar.xz
 	source = 0001-Cairo-backend-added-to-Qt5-wrapper.patch
 	source = 0002-Setting-default-Qt5-backend-to-Cairo.patch
 	source = 0003-Do-not-build-the-main-poppler-library.patch
-	md5sums = 2d3dcea88d6a814317fac74d2a16c3cd
-	md5sums = c8516ded842a9dfb828ba30365b5b86c
-	md5sums = 9b51024391e2dbd06a89881bab1c855b
-	md5sums = af8a453d358e22cb950be15936f3c86f
+	md5sums = 66a54da4896b1408611699feda5c1821
+	md5sums = 0879e52d77ac583c8efd9f724f4756fa
+	md5sums = f51b0d3f1115d9393dadd5474c32b39f
+	md5sums = d195c70fafbabd334b104bccf6f52a43
 
 pkgname = poppler-qt5-cairo
 
diff --git a/0001-Cairo-backend-added-to-Qt5-wrapper.patch b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
index 482c3cfef632..1194675fb8f3 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,6 +1,6 @@
-From b338ffeaa1cd104dd6c64d2361c3deb981efd0de Mon Sep 17 00:00:00 2001
+From ea2772f97e30f139b65039c0f08cecf5f285a922 Mon Sep 17 00:00:00 2001
 From: Kevin Slagle <kjslag@gmail.com>
-Date: Sat, 31 Mar 2018 14:13:25 -0400
+Date: Sat, 31 Mar 2018 18:27:25 -0400
 Subject: [PATCH 1/3] Cairo backend added to Qt5 wrapper
 
 ---
@@ -12,7 +12,7 @@ Subject: [PATCH 1/3] 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 7993c33b..80a3c054 100644
+index 5ae42f52..04e3fcdf 100644
 --- a/qt5/src/CMakeLists.txt
 +++ b/qt5/src/CMakeLists.txt
 @@ -7,6 +7,11 @@ include_directories(
@@ -38,8 +38,8 @@ index 7993c33b..80a3c054 100644
 +    ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc
 +  )
 +endif(HAVE_CAIRO)
- add_library(poppler-qt5 SHARED ${poppler_qt5_SRCS})
- set_target_properties(poppler-qt5 PROPERTIES VERSION 1.11.0 SOVERSION 1)
+ add_library(poppler-qt5 ${poppler_qt5_SRCS})
+ set_target_properties(poppler-qt5 PROPERTIES VERSION 1.13.0 SOVERSION 1)
  if(MINGW)
 @@ -36,6 +48,9 @@ if(MINGW)
      set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
@@ -52,10 +52,10 @@ index 7993c33b..80a3c054 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 03077f99..8f67ad80 100644
+index 0eeb923f..e1b7a71c 100644
 --- a/qt5/src/poppler-document.cc
 +++ b/qt5/src/poppler-document.cc
-@@ -675,6 +675,9 @@ namespace Poppler {
+@@ -672,6 +672,9 @@ namespace Poppler {
          ret << Document::SplashBackend;
  #endif
          ret << Document::ArthurBackend;
@@ -66,10 +66,10 @@ index 03077f99..8f67ad80 100644
      }
  
 diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
-index 9dcdaad9..2706e83a 100644
+index 381a608b..21e96fe2 100644
 --- a/qt5/src/poppler-page.cc
 +++ b/qt5/src/poppler-page.cc
-@@ -44,6 +44,7 @@
+@@ -45,6 +45,7 @@
  #include <QtGui/QPainter>
  
  #include <config.h>
@@ -77,7 +77,7 @@ index 9dcdaad9..2706e83a 100644
  #include <PDFDoc.h>
  #include <Catalog.h>
  #include <Form.h>
-@@ -57,6 +58,9 @@
+@@ -58,6 +59,9 @@
  #include <SplashOutputDev.h>
  #include <splash/SplashBitmap.h>
  #endif
@@ -87,7 +87,7 @@ index 9dcdaad9..2706e83a 100644
  
  #include "poppler-private.h"
  #include "poppler-page-transition-private.h"
-@@ -440,6 +444,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
+@@ -596,6 +600,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
        img = tmpimg;
        break;
      }
@@ -157,10 +157,10 @@ index 9dcdaad9..2706e83a 100644
 +    }
    }
  
-   return img;
-@@ -499,6 +567,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
-          painter->restore();
-       return true;
+   if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload))
+@@ -618,6 +686,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
+         QImageDumpingArthurOutputDev arthur_output(painter, nullptr);
+         return renderToArthur(&arthur_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags);
      }
 +    case Poppler::Document::CairoBackend:
 +      return false;
@@ -168,10 +168,10 @@ index 9dcdaad9..2706e83a 100644
    return false;
  }
 diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h
-index fcfe2d31..1da12e9b 100644
+index 3adbf02f..5422482a 100644
 --- a/qt5/src/poppler-qt5.h
 +++ b/qt5/src/poppler-qt5.h
-@@ -878,7 +878,8 @@ delete it;
+@@ -1054,7 +1054,8 @@ delete it;
  	*/
  	enum RenderBackend {
  	    SplashBackend,   ///< Splash backend
@@ -182,7 +182,7 @@ index fcfe2d31..1da12e9b 100644
  
  	/**
 diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt
-index 01a1a970..d6d241c6 100644
+index 1e67e6ec..9131568d 100644
 --- a/qt5/tests/CMakeLists.txt
 +++ b/qt5/tests/CMakeLists.txt
 @@ -11,6 +11,11 @@ include_directories(
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index 10a08a5ba096..ceae9678a1cf 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,6 +1,6 @@
-From e9918b20d84716799866535c1bf3d6df5db904de Mon Sep 17 00:00:00 2001
+From 72639d30f175b01ca22548c67ec4098163bf34f0 Mon Sep 17 00:00:00 2001
 From: Kevin Slagle <kjslag@gmail.com>
-Date: Sat, 31 Mar 2018 14:14:18 -0400
+Date: Sat, 31 Mar 2018 18:27:25 -0400
 Subject: [PATCH 2/3] Setting default Qt5 backend to Cairo
 
 ---
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] Setting default Qt5 backend to Cairo
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qt5/src/poppler-private.cc b/qt5/src/poppler-private.cc
-index 23fb8466..451c7f7b 100644
+index e3a540ab..6fcccf29 100644
 --- a/qt5/src/poppler-private.cc
 +++ b/qt5/src/poppler-private.cc
 @@ -243,7 +243,7 @@ namespace Debug {
@@ -19,7 +19,7 @@ index 23fb8466..451c7f7b 100644
 +        m_backend = Document::CairoBackend;
          paperColor = Qt::white;
          m_hints = 0;
-         m_optContentModel = 0;
+         m_optContentModel = nullptr;
 -- 
 2.16.2
 
diff --git a/0003-Do-not-build-the-main-poppler-library.patch b/0003-Do-not-build-the-main-poppler-library.patch
index a7fdb1c90346..fccb3094125d 100644
--- a/0003-Do-not-build-the-main-poppler-library.patch
+++ b/0003-Do-not-build-the-main-poppler-library.patch
@@ -1,6 +1,6 @@
-From bb4a8ad27a054694eca6c9735661820cf8d043e0 Mon Sep 17 00:00:00 2001
+From 83b36ebe1038ea951308093d6bd3e2c4d42960d7 Mon Sep 17 00:00:00 2001
 From: Kevin Slagle <kjslag@gmail.com>
-Date: Sat, 31 Mar 2018 14:15:38 -0400
+Date: Sat, 31 Mar 2018 18:27:27 -0400
 Subject: [PATCH 3/3] Do not build the main poppler library
 
 ---
@@ -8,10 +8,10 @@ Subject: [PATCH 3/3] Do not build the main poppler library
  1 file changed, 18 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f181fdec..dff4dc9f 100644
+index eecd41fb..c300e69f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -537,24 +537,6 @@ if(TIFF_FOUND)
+@@ -476,24 +476,6 @@ if(TIFF_FOUND)
    set(poppler_LIBS ${poppler_LIBS} ${TIFF_LIBRARIES})
  endif()
  
@@ -22,7 +22,7 @@ index f181fdec..dff4dc9f 100644
 -else()
 -add_library(poppler ${poppler_SRCS})
 -endif()
--set_target_properties(poppler PROPERTIES VERSION 72.0.0 SOVERSION 72)
+-set_target_properties(poppler PROPERTIES VERSION 74.0.0 SOVERSION 74)
 -if(MINGW)
 -    get_target_property(POPPLER_SOVERSION poppler SOVERSION)
 -    set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
diff --git a/PKGBUILD b/PKGBUILD
index b5181a222492..b1d9d19e0896 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@
 # https://github.com/giddie/poppler-qt4-cairo-backend
 
 pkgname=poppler-qt5-cairo
-pkgver=0.61.1
+pkgver=0.63.0
 pkgrel=1
 pkgdesc="Poppler Qt5 bindings, with patches to use the Cairo backend instead of Splash"
 license=('GPL')
@@ -28,10 +28,10 @@ source=(http://poppler.freedesktop.org/poppler-${pkgver}.tar.xz
         0001-Cairo-backend-added-to-Qt5-wrapper.patch
         0002-Setting-default-Qt5-backend-to-Cairo.patch
         0003-Do-not-build-the-main-poppler-library.patch)
-md5sums=('2d3dcea88d6a814317fac74d2a16c3cd'
-         'c8516ded842a9dfb828ba30365b5b86c'
-         '9b51024391e2dbd06a89881bab1c855b'
-         'af8a453d358e22cb950be15936f3c86f')
+md5sums=('66a54da4896b1408611699feda5c1821'
+         '0879e52d77ac583c8efd9f724f4756fa'
+         'f51b0d3f1115d9393dadd5474c32b39f'
+         'd195c70fafbabd334b104bccf6f52a43')
 
 prepare() {
   mkdir build
@@ -52,7 +52,7 @@ build() {
     -DENABLE_UTILS=OFF \
     -DENABLE_CPP=OFF \
     -DENABLE_GLIB=OFF \
-    -DENABLE_QT4=OFF
+    -DBUILD_QT5_TESTS=OFF
   make poppler-qt5
 }