Update for Poppler 0.86.1

6 files changed, 41 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57ab9fe4c8ce..d97bdc361568 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 = 0.85.0
+	pkgver = 0.86.1
 	pkgrel = 1
 	url = https://github.com/giddie/poppler-cairo-backend
 	arch = i686
@@ -10,22 +10,22 @@ pkgbase = poppler-qt-lcd
 	makedepends = pkgconfig
 	depends = qt5-base
 	depends = cairo
-	depends = poppler>=0.85.0
-	provides = poppler-qt=0.85.0
-	provides = poppler-qt5=0.85.0
+	depends = poppler>=0.86.1
+	provides = poppler-qt=0.86.1
+	provides = poppler-qt5=0.86.1
 	conflicts = poppler-qt
 	conflicts = poppler-qt4
 	conflicts = poppler-qt5
-	source = http://poppler.freedesktop.org/poppler-0.85.0.tar.xz
+	source = http://poppler.freedesktop.org/poppler-0.86.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 = 5315084523a4d73e9514f51eef78a332
-	md5sums = 2ab69361db35e81c2f9a425234926dbb
-	md5sums = 3522932d7a0d849e412dcbe972fdf2f8
-	md5sums = 47db63064e2e3819f5e9dd997350a011
-	md5sums = 7c58bbdcb318d03905d0170f2d9518f0
+	md5sums = 2a638739f29e82a0a57b633ea39c87f3
+	md5sums = b0a8ce4115a481b7110051c23f7e37e4
+	md5sums = 0e58a2c64b2e35b4fdc0ec768ee19527
+	md5sums = 98dc56548575def9a65eef7d9e0982db
+	md5sums = c61aba096ec805f4876e8a169a4db2fb
 
 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 89b8a895da02..4ce0d539dee9 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From 0324a49e026627849372bde9c578decc6c594e7f Mon Sep 17 00:00:00 2001
+From d722d75b5418708aa994a12785e7351606de04f0 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 f7c99248..301adcb3 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 bff01205..6c25e42e 100644
+index e1b8d05b..3e7c0428 100644
 --- a/qt5/src/poppler-document.cc
 +++ b/qt5/src/poppler-document.cc
-@@ -707,6 +707,9 @@ namespace Poppler {
+@@ -708,6 +708,9 @@ namespace Poppler {
          ret << Document::SplashBackend;
  #endif
          ret << Document::ArthurBackend;
@@ -66,10 +66,10 @@ index bff01205..6c25e42e 100644
      }
  
 diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
-index 9e08134a..7459f30c 100644
+index 30e03509..6b4c3c9e 100644
 --- a/qt5/src/poppler-page.cc
 +++ b/qt5/src/poppler-page.cc
-@@ -48,6 +48,7 @@
+@@ -49,6 +49,7 @@
  #include <QtGui/QPainter>
  
  #include <config.h>
@@ -77,7 +77,7 @@ index 9e08134a..7459f30c 100644
  #include <PDFDoc.h>
  #include <Catalog.h>
  #include <Form.h>
-@@ -61,6 +62,9 @@
+@@ -62,6 +63,9 @@
  #include <SplashOutputDev.h>
  #include <splash/SplashBitmap.h>
  #endif
@@ -87,7 +87,7 @@ index 9e08134a..7459f30c 100644
  
  #include "poppler-private.h"
  #include "poppler-page-transition-private.h"
-@@ -609,6 +613,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
+@@ -610,6 +614,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
        img = tmpimg;
        break;
      }
@@ -158,7 +158,7 @@ index 9e08134a..7459f30c 100644
    }
  
    if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload))
-@@ -631,6 +699,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
+@@ -632,6 +700,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);
      }
@@ -198,5 +198,5 @@ index 5abcbc45..99c12b9f 100644
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}")
 -- 
-2.25.0
+2.25.1
 
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index 9d9528489c42..dfe88905425e 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From 3dc1acd1f1c9af81a0add270517e1948b0db0425 Mon Sep 17 00:00:00 2001
+From 1588a27cdf73beba1f00141639bb61dd0adb43a8 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 81af2bed..4ef06515 100644
+index 02fb96e6..8e3ed4a6 100644
 --- a/qt5/src/poppler-private.cc
 +++ b/qt5/src/poppler-private.cc
-@@ -239,7 +239,7 @@ namespace Debug {
+@@ -243,7 +243,7 @@ namespace Debug {
      
      void DocumentData::init()
      {
@@ -21,5 +21,5 @@ index 81af2bed..4ef06515 100644
          m_hints = 0;
          m_optContentModel = nullptr;
 -- 
-2.25.0
+2.25.1
 
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index 956749b914c4..249b2a0e6bb8 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,4 +1,4 @@
-From 16c34ccad8d99ded933daa3d0875369e5b9459bf Mon Sep 17 00:00:00 2001
+From 586c5c40f592f5fe650494a3946e42195881fd40 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 319edc50..71752304 100644
+index 322f2d48..9218e90d 100644
 --- a/glib/poppler-page.cc
 +++ b/glib/poppler-page.cc
-@@ -2438,3 +2438,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage      *page,
+@@ -2495,3 +2495,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage      *page,
  
    return g_list_reverse(attributes);
  }
@@ -257,10 +257,10 @@ index e8ff605f..f615d789 100644
  
    void drawForm(Object *str, Dict *resDict, const double *matrix, const double *bbox,
 diff --git a/poppler/Page.cc b/poppler/Page.cc
-index 87621ca2..87039190 100644
+index 024fe3da..fb3b9459 100644
 --- a/poppler/Page.cc
 +++ b/poppler/Page.cc
-@@ -336,6 +336,19 @@ Dict *Page::getResourceDictCopy(XRef *xrefA) {
+@@ -337,6 +337,19 @@ Dict *Page::getResourceDictCopy(XRef *xrefA) {
    return dict ? dict->copy(xrefA) : nullptr;
  }
  
@@ -281,10 +281,10 @@ index 87621ca2..87039190 100644
    Dict *pageDict = pageObj.getDict()->copy(xrefA);
    xref = xrefA;
 diff --git a/poppler/Page.h b/poppler/Page.h
-index 01f056f9..d6547a79 100644
+index 3e4b341a..51f21928 100644
 --- a/poppler/Page.h
 +++ b/poppler/Page.h
-@@ -183,6 +183,9 @@ public:
+@@ -185,6 +185,9 @@ public:
    Object *getResourceDictObject();
    Dict *getResourceDictCopy(XRef *xrefA);
  
@@ -295,5 +295,5 @@ index 01f056f9..d6547a79 100644
    Object getAnnotsObject(XRef *xrefA = nullptr) { return annotsObj.fetch(xrefA ? xrefA : xref); }
    // Add a new annotation to the page
 -- 
-2.25.0
+2.25.1
 
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index d5a7f65b5783..2ca88fe9ee3a 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 94e722b2e2253c987b220d41dcf677f871cf8cb6 Mon Sep 17 00:00:00 2001
+From 78307aa3a3393891c6441cff5ebadbb8b2c21555 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 afad5c78..16ee215a 100644
+index e359288b..99bcdd80 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -527,23 +527,6 @@ ADD_GPERF_FILE(TimesItalicWidths)
@@ -21,7 +21,7 @@ index afad5c78..16ee215a 100644
 -else()
 -add_library(poppler ${poppler_SRCS})
 -endif()
--set_target_properties(poppler PROPERTIES VERSION 95.0.0 SOVERSION 95)
+-set_target_properties(poppler PROPERTIES VERSION 97.0.0 SOVERSION 97)
 -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}")
@@ -36,5 +36,5 @@ index afad5c78..16ee215a 100644
    install(FILES
      poppler/Annot.h
 -- 
-2.25.0
+2.25.1
 
diff --git a/PKGBUILD b/PKGBUILD
index da3bee538c12..c4e84f57a4b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=0.85.0
+pkgver=0.86.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=('5315084523a4d73e9514f51eef78a332'
-         '2ab69361db35e81c2f9a425234926dbb'
-         '3522932d7a0d849e412dcbe972fdf2f8'
-         '47db63064e2e3819f5e9dd997350a011'
-         '7c58bbdcb318d03905d0170f2d9518f0')
+md5sums=('2a638739f29e82a0a57b633ea39c87f3'
+         'b0a8ce4115a481b7110051c23f7e37e4'
+         '0e58a2c64b2e35b4fdc0ec768ee19527'
+         '98dc56548575def9a65eef7d9e0982db'
+         'c61aba096ec805f4876e8a169a4db2fb')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"