Update for Poppler 21.07.0

4 files changed, 26 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a96c41b5eac4..ff9763236be0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = poppler-qt-lcd
 	pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
-	pkgver = 21.06.1
+	pkgver = 21.07.0
 	pkgrel = 1
 	url = https://github.com/giddie/poppler-cairo-backend
 	arch = i686
@@ -10,17 +10,17 @@ pkgbase = poppler-qt-lcd
 	makedepends = pkgconfig
 	depends = qt5-base
 	depends = cairo
-	depends = poppler>=21.06.1
-	provides = poppler-qt=21.06.1
-	provides = poppler-qt5=21.06.1
+	depends = poppler>=21.07.0
+	provides = poppler-qt=21.07.0
+	provides = poppler-qt5=21.07.0
 	conflicts = poppler-qt
 	conflicts = poppler-qt4
 	conflicts = poppler-qt5
-	source = http://poppler.freedesktop.org/poppler-21.06.1.tar.xz
+	source = http://poppler.freedesktop.org/poppler-21.07.0.tar.xz
 	source = 0001-Cairo-backend-added-to-Qt5-wrapper.patch
 	source = 0002-Setting-default-Qt5-backend-to-Cairo.patch
-	md5sums = dbad7032b680720ea6d570fd608b849e
-	md5sums = b8ce03af127002f044d3dd73251421c7
-	md5sums = 7ca7d91edf33a651d3137b9541d33634
+	md5sums = 3c4b500a0af4cf1dc4a1c66fa48b7551
+	md5sums = 20ef6dd8416b1c86f905dd6f37be97da
+	md5sums = 401899119f201c3adb83290e5356a830
 
 pkgname = poppler-qt-lcd
diff --git a/0001-Cairo-backend-added-to-Qt5-wrapper.patch b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
index 4d0f87b2acb1..a7ea71d1366d 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From 5e8da09c84843f940cffb0266c24482132753b83 Mon Sep 17 00:00:00 2001
+From 3b860dec9c5bc36b05676fd55df4fba20d07242b 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/3] Cairo backend added to Qt5 wrapper
@@ -52,11 +52,11 @@ index d80c81f3..39d6f9ae 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 574f2431..dc53dbc2 100644
+index 6118ccdd..67e2ba74 100644
 --- a/qt5/src/poppler-document.cc
 +++ b/qt5/src/poppler-document.cc
-@@ -697,6 +697,9 @@ QSet<Document::RenderBackend> Document::availableRenderBackends()
- #endif
+@@ -696,6 +696,9 @@ QSet<Document::RenderBackend> Document::availableRenderBackends()
+     ret << Document::SplashBackend;
      ret << Document::QPainterBackend;
      ret << Document::ArthurBackend; // For backward compatibility
 +#if defined(HAVE_CAIRO)
@@ -66,10 +66,10 @@ index 574f2431..dc53dbc2 100644
  }
  
 diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
-index bae438b7..f60e2469 100644
+index 65f39bb3..67f54ccf 100644
 --- a/qt5/src/poppler-page.cc
 +++ b/qt5/src/poppler-page.cc
-@@ -52,6 +52,7 @@
+@@ -53,6 +53,7 @@
  #include <config.h>
  #include <cfloat>
  #include <poppler-config.h>
@@ -77,17 +77,17 @@ index bae438b7..f60e2469 100644
  #include <PDFDoc.h>
  #include <Catalog.h>
  #include <Form.h>
-@@ -65,6 +66,9 @@
- #    include <SplashOutputDev.h>
- #    include <splash/SplashBitmap.h>
- #endif
+@@ -64,6 +65,9 @@
+ #include <Rendition.h>
+ #include <SplashOutputDev.h>
+ #include <splash/SplashBitmap.h>
 +#if defined(HAVE_CAIRO)
-+#include <CairoOutputDev.h>
++#    include <CairoOutputDev.h>
 +#endif
  
  #include "poppler-private.h"
  #include "poppler-page-transition-private.h"
-@@ -585,6 +589,69 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
+@@ -582,6 +586,69 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
          img = tmpimg;
          break;
      }
@@ -157,7 +157,7 @@ index bae438b7..f60e2469 100644
      }
  
      if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload))
-@@ -608,6 +675,9 @@ bool Page::renderToPainter(QPainter *painter, double xres, double yres, int x, i
+@@ -605,6 +672,9 @@ bool Page::renderToPainter(QPainter *painter, double xres, double yres, int x, i
  
          return renderToQPainter(&qpainter_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags);
      }
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index 107dd0bbd282..02fef3ec7a48 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From 542d77b854afe360dbbd94d487eb05a21b55eea6 Mon Sep 17 00:00:00 2001
+From fb7e381740fcd66864e3696afddc766068941035 Mon Sep 17 00:00:00 2001
 From: Paul Gideon Dann <pdgiddie@gmail.com>
 Date: Wed, 4 Apr 2018 16:37:38 +0100
 Subject: [PATCH 2/3] Setting default Qt5 backend to Cairo
diff --git a/PKGBUILD b/PKGBUILD
index 972d676daec2..7e853659913d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=21.06.1
+pkgver=21.07.0
 pkgrel=1
 pkgdesc="Poppler Qt bindings, with patches to allow subpixel rendering via Cairo"
 license=('GPL')
@@ -15,9 +15,9 @@ url="https://github.com/giddie/poppler-cairo-backend"
 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)
-md5sums=('dbad7032b680720ea6d570fd608b849e'
-         'b8ce03af127002f044d3dd73251421c7'
-         '7ca7d91edf33a651d3137b9541d33634')
+md5sums=('3c4b500a0af4cf1dc4a1c66fa48b7551'
+         '20ef6dd8416b1c86f905dd6f37be97da'
+         '401899119f201c3adb83290e5356a830')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"