Update for Poppler 0.76.1

6 files changed, 37 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4aa57b23fb7..8d4452724761 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Apr  2 15:12:07 UTC 2019
+# Mon May 13 12:25:59 UTC 2019
 pkgbase = poppler-qt-lcd
 	pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
-	pkgver = 0.75.0
+	pkgver = 0.76.1
 	pkgrel = 1
 	url = https://github.com/giddie/poppler-cairo-backend
 	arch = i686
@@ -12,22 +12,22 @@ pkgbase = poppler-qt-lcd
 	makedepends = pkgconfig
 	depends = qt5-base
 	depends = cairo
-	depends = poppler>=0.75.0
-	provides = poppler-qt=0.75.0
-	provides = poppler-qt5=0.75.0
+	depends = poppler>=0.76.1
+	provides = poppler-qt=0.76.1
+	provides = poppler-qt5=0.76.1
 	conflicts = poppler-qt
 	conflicts = poppler-qt4
 	conflicts = poppler-qt5
-	source = http://poppler.freedesktop.org/poppler-0.75.0.tar.xz
+	source = http://poppler.freedesktop.org/poppler-0.76.1.tar.xz
 	source = 0001-Cairo-backend-added-to-Qt5-wrapper.patch
 	source = 0002-Setting-default-Qt5-backend-to-Cairo.patch
 	source = 0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
 	source = 0004-Don-t-build-the-main-poppler-library.patch
-	md5sums = 3fb4ca803d989742695ca586c5cc489e
-	md5sums = 556fe5108ffed87382e188742e51d635
-	md5sums = cf06662a9235b98735cab18b5616d105
-	md5sums = 4b947349d303d4c73168c3272b094bb6
-	md5sums = 1f4dbad4f37de180e7c82b181b38da69
+	md5sums = 99f1e6ab4c96d14840e862eb027f0fc0
+	md5sums = edfc1cf0efa68fe5533f05abfbb962a4
+	md5sums = 5ff3715c66c5270532c0fc3996ee42cf
+	md5sums = 8d3cd2fc643130de57ad48cd40865c6d
+	md5sums = 4c62cd1fbf1c82657e79a02f3195b2c3
 
 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 c078a2df839c..b7a33ef6068c 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From 26f50358a11aef57a8bee3ba5e33a22699291f23 Mon Sep 17 00:00:00 2001
+From eb4326d39ed11a5ea9b2e64e155a8f26ecc17b0a 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
@@ -52,10 +52,10 @@ index 340a3e43..86627bb9 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 c0def750..7a658c71 100644
+index 81db4eaf..635e44f9 100644
 --- a/qt5/src/poppler-document.cc
 +++ b/qt5/src/poppler-document.cc
-@@ -694,6 +694,9 @@ namespace Poppler {
+@@ -695,6 +695,9 @@ namespace Poppler {
          ret << Document::SplashBackend;
  #endif
          ret << Document::ArthurBackend;
@@ -66,7 +66,7 @@ index c0def750..7a658c71 100644
      }
  
 diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
-index 1e5e1ae2..e0a131b4 100644
+index 3e750620..04bf2e64 100644
 --- a/qt5/src/poppler-page.cc
 +++ b/qt5/src/poppler-page.cc
 @@ -48,6 +48,7 @@
@@ -87,7 +87,7 @@ index 1e5e1ae2..e0a131b4 100644
  
  #include "poppler-private.h"
  #include "poppler-page-transition-private.h"
-@@ -624,6 +628,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
+@@ -622,6 +626,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
        img = tmpimg;
        break;
      }
@@ -158,7 +158,7 @@ index 1e5e1ae2..e0a131b4 100644
    }
  
    if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload))
-@@ -646,6 +714,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
+@@ -644,6 +712,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);
      }
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index 5d540ecf0bd0..4084abf99831 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From 7ce084163c9b22dab78d77e491539299d188671b Mon Sep 17 00:00:00 2001
+From fe15ba5d37d00c7e56b01f434965112da6021568 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/4] Setting default Qt5 backend to Cairo
@@ -8,10 +8,10 @@ Subject: [PATCH 2/4] 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 0c178a54..0306ae4d 100644
+index e847ed5e..4b58f750 100644
 --- a/qt5/src/poppler-private.cc
 +++ b/qt5/src/poppler-private.cc
-@@ -265,7 +265,7 @@ namespace Debug {
+@@ -253,7 +253,7 @@ namespace Debug {
      
      void DocumentData::init()
      {
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index b2e7c6c27a5b..15c9f76b7425 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,4 +1,4 @@
-From 9d3df285e6f1b833b637c12c8b059f3b82bab217 Mon Sep 17 00:00:00 2001
+From 21f2167b9776d0766f805c506629b6d045464314 Mon Sep 17 00:00:00 2001
 From: Paul Gideon Dann <pdgiddie@gmail.com>
 Date: Tue, 9 Aug 2016 15:02:53 +0100
 Subject: [PATCH 3/4] Apply subpixel rendering in Cairo Backend
@@ -74,10 +74,10 @@ index 78d24bb5..d482ceb5 100644
          g_timer_stop (timer);
  
 diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
-index a635f398..6b80f62d 100644
+index dc82afc4..622e2954 100644
 --- a/glib/poppler-page.cc
 +++ b/glib/poppler-page.cc
-@@ -2420,3 +2420,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage      *page,
+@@ -2413,3 +2413,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage      *page,
  
    return g_list_reverse(attributes);
  }
@@ -104,7 +104,7 @@ index f99f0920..8ff914f4 100644
  /* A rectangle on a page, with coordinates in PDF points. */
  #define POPPLER_TYPE_RECTANGLE             (poppler_rectangle_get_type ())
 diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
-index e29898a9..314925a8 100644
+index bf6bd88d..d9e42304 100644
 --- a/poppler/CairoFontEngine.cc
 +++ b/poppler/CairoFontEngine.cc
 @@ -124,7 +124,7 @@ CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
@@ -191,10 +191,10 @@ index d2769a22..f1bb39fc 100644
    glyphs = nullptr;
    if (use_show_text_glyphs) {
 diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
-index 9244b044..e459a13f 100644
+index 5fba4c72..a5e5e963 100644
 --- a/poppler/Gfx.cc
 +++ b/poppler/Gfx.cc
-@@ -4605,6 +4605,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) {
+@@ -4607,6 +4607,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) {
    error(errSyntaxError, getPos(), "Bad image parameters");
  }
  
@@ -243,7 +243,7 @@ index 9244b044..e459a13f 100644
    // check the effect of compositing objects as a group:
    // look for ExtGState entries with ca != 1 or CA != 1 or BM != normal
 diff --git a/poppler/Gfx.h b/poppler/Gfx.h
-index 47ae0153..9df0d18d 100644
+index 19462e8d..b0bbd11c 100644
 --- a/poppler/Gfx.h
 +++ b/poppler/Gfx.h
 @@ -192,6 +192,9 @@ public:
@@ -257,7 +257,7 @@ index 47ae0153..9df0d18d 100644
  
    void drawForm(Object *str, Dict *resDict, const double *matrix, const double *bbox,
 diff --git a/poppler/Page.cc b/poppler/Page.cc
-index 2cb75146..cd42b656 100644
+index d137ec4b..5950b964 100644
 --- a/poppler/Page.cc
 +++ b/poppler/Page.cc
 @@ -336,6 +336,19 @@ Dict *Page::getResourceDictCopy(XRef *xrefA) {
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index 25c25c09f202..f580a6f0fca0 100644
--- a/0004-Don-t-build-the-main-poppler-library.patch
+++ b/0004-Don-t-build-the-main-poppler-library.patch
@@ -1,4 +1,4 @@
-From 19661939fe1d03ac29ac3db43aa7fd04d29adc0c Mon Sep 17 00:00:00 2001
+From f65dca308474f0ee56075b1319afb71a78eda971 Mon Sep 17 00:00:00 2001
 From: Paul Gideon Dann <pdgiddie@gmail.com>
 Date: Tue, 20 Oct 2009 18:32:35 +0100
 Subject: [PATCH 4/4] Don't build the main poppler library.
@@ -8,7 +8,7 @@ Subject: [PATCH 4/4] Don't build the main poppler library.
  1 file changed, 17 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e3b8e8d9..d9632ebb 100644
+index 4b107479..8ea0625a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -485,23 +485,6 @@ if(TIFF_FOUND)
@@ -21,7 +21,7 @@ index e3b8e8d9..d9632ebb 100644
 -else()
 -add_library(poppler ${poppler_SRCS})
 -endif()
--set_target_properties(poppler PROPERTIES VERSION 86.0.0 SOVERSION 86)
+-set_target_properties(poppler PROPERTIES VERSION 87.0.0 SOVERSION 87)
 -if(MINGW AND BUILD_SHARED_LIBS)
 -    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 f448fba5dcc1..7b3aae3406cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=0.75.0
+pkgver=0.76.1
 pkgrel=1
 pkgdesc="Poppler Qt bindings, with patches to allow subpixel rendering via Cairo"
 license=('GPL')
@@ -17,11 +17,11 @@ source=(http://poppler.freedesktop.org/poppler-${pkgver}.tar.xz
         0002-Setting-default-Qt5-backend-to-Cairo.patch
         0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
         0004-Don-t-build-the-main-poppler-library.patch)
-md5sums=('3fb4ca803d989742695ca586c5cc489e'
-         '556fe5108ffed87382e188742e51d635'
-         'cf06662a9235b98735cab18b5616d105'
-         '4b947349d303d4c73168c3272b094bb6'
-         '1f4dbad4f37de180e7c82b181b38da69')
+md5sums=('99f1e6ab4c96d14840e862eb027f0fc0'
+         'edfc1cf0efa68fe5533f05abfbb962a4'
+         '5ff3715c66c5270532c0fc3996ee42cf'
+         '8d3cd2fc643130de57ad48cd40865c6d'
+         '4c62cd1fbf1c82657e79a02f3195b2c3')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"