Update for Poppler 0.72.0

7 files changed, 42 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9669e483afe2..c99ff471061b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Nov 19 15:23:34 UTC 2018
+# Fri Dec 21 16:01:29 UTC 2018
 pkgbase = poppler-qt-lcd
 	pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
-	pkgver = 0.71.0
+	pkgver = 0.72.0
 	pkgrel = 1
 	url = https://github.com/giddie/poppler-cairo-backend
 	arch = i686
@@ -12,24 +12,22 @@ pkgbase = poppler-qt-lcd
 	makedepends = pkgconfig
 	depends = qt5-base
 	depends = cairo
-	depends = poppler>=0.71.0
-	provides = poppler-qt=0.71.0
-	provides = poppler-qt5=0.71.0
+	depends = poppler>=0.72.0
+	provides = poppler-qt=0.72.0
+	provides = poppler-qt5=0.72.0
 	conflicts = poppler-qt
 	conflicts = poppler-qt4
 	conflicts = poppler-qt5
-	source = http://poppler.freedesktop.org/poppler-0.71.0.tar.xz
+	source = http://poppler.freedesktop.org/poppler-0.72.0.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
-	source = 0005-Work-around-openjpeg2-includes-issue.patch
-	md5sums = b505011e49e922c83f3ffb57ab40bc28
-	md5sums = 9f02368dcbfe5443c685231e2d71006c
-	md5sums = e83270012cd0a839723f6eecdc577106
-	md5sums = a8e7a953f3d26f61189077ebc4eb8cc6
-	md5sums = 78dd2a6709fe4a25f73cf4972aaa1bda
-	md5sums = f25d93ed88065ecb31c099dd5de7ea25
+	md5sums = 5a18b02019daf33559eceb30e5ee2b6b
+	md5sums = 9467d715cee6e03faff8b4501ac9ffe6
+	md5sums = fe4a13e6e240895135210ac274381b97
+	md5sums = 373784b49b3d71a8ae2faa2e1a5dc2d7
+	md5sums = 262ecf9ceb3485b7b24d6c738d7392eb
 
 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 aac389a10ab3..8aa701e5d22e 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From bced35b82a9bd386894f535794fd61feed482525 Mon Sep 17 00:00:00 2001
+From a9dd02eec6b1d6ed4e1fbc90cc865e3fea73bc5b 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/5] Cairo backend added to Qt5 wrapper
@@ -12,10 +12,10 @@ Subject: [PATCH 1/5] 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 6f34054e..70d635ad 100644
+index de565b23..6a482fcc 100644
 --- a/qt5/src/CMakeLists.txt
 +++ b/qt5/src/CMakeLists.txt
-@@ -7,6 +7,11 @@ include_directories(
+@@ -8,6 +8,11 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
  )
  
@@ -27,7 +27,7 @@ index 6f34054e..70d635ad 100644
  set(CMAKE_C_VISIBILITY_PRESET hidden)
  set(CMAKE_CXX_VISIBILITY_PRESET hidden)
  set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-@@ -33,6 +38,13 @@ set(poppler_qt5_SRCS
+@@ -34,6 +39,13 @@ set(poppler_qt5_SRCS
    poppler-media.cc
    ArthurOutputDev.cc
  )
@@ -41,7 +41,7 @@ index 6f34054e..70d635ad 100644
  add_library(poppler-qt5 ${poppler_qt5_SRCS})
  set_target_properties(poppler-qt5 PROPERTIES VERSION 1.17.0 SOVERSION 1)
  if(MINGW)
-@@ -40,6 +52,9 @@ if(MINGW)
+@@ -41,6 +53,9 @@ if(MINGW)
      set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
  endif()
  target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES})
@@ -52,7 +52,7 @@ index 6f34054e..70d635ad 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 c7b90ca9..afad9f5d 100644
+index ea2fd7e6..50bd94f4 100644
 --- a/qt5/src/poppler-document.cc
 +++ b/qt5/src/poppler-document.cc
 @@ -677,6 +677,9 @@ namespace Poppler {
@@ -66,7 +66,7 @@ index c7b90ca9..afad9f5d 100644
      }
  
 diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
-index 34f58053..37b1d06a 100644
+index 68802bab..833126d2 100644
 --- a/qt5/src/poppler-page.cc
 +++ b/qt5/src/poppler-page.cc
 @@ -47,6 +47,7 @@
@@ -182,7 +182,7 @@ index ed189701..2e8ca01f 100644
  
  	/**
 diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt
-index af8de6ef..20df9f4b 100644
+index 7fda2687..e117d9d3 100644
 --- a/qt5/tests/CMakeLists.txt
 +++ b/qt5/tests/CMakeLists.txt
 @@ -11,6 +11,11 @@ include_directories(
@@ -198,5 +198,5 @@ index af8de6ef..20df9f4b 100644
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}")
 -- 
-2.19.1
+2.20.1
 
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index e30452991478..7fe21bcd63cd 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From b8de7641f1dcad5d8c948e740e0ead6fd2aa52a0 Mon Sep 17 00:00:00 2001
+From b191cc41c2809543eb7b8e7165de70b1cf8b433e 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/5] Setting default Qt5 backend to Cairo
@@ -8,7 +8,7 @@ Subject: [PATCH 2/5] 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 edbabe13..4e6f255a 100644
+index 44f2167c..89869795 100644
 --- a/qt5/src/poppler-private.cc
 +++ b/qt5/src/poppler-private.cc
 @@ -262,7 +262,7 @@ namespace Debug {
@@ -21,5 +21,5 @@ index edbabe13..4e6f255a 100644
          m_hints = 0;
          m_optContentModel = nullptr;
 -- 
-2.19.1
+2.20.1
 
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index 48b602904f63..b5191cd8de0f 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,4 +1,4 @@
-From a90586073f306d4598e1be254e617bd4f6ceba34 Mon Sep 17 00:00:00 2001
+From 37343838d358f4719eb8ad8e8bfebaaaadf51ac8 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/5] Apply subpixel rendering in Cairo Backend
@@ -74,7 +74,7 @@ index 78d24bb5..d482ceb5 100644
          g_timer_stop (timer);
  
 diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
-index 6a592fbc..3bd532fa 100644
+index 34a1c77d..4e81a348 100644
 --- a/glib/poppler-page.cc
 +++ b/glib/poppler-page.cc
 @@ -2419,3 +2419,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage      *page,
@@ -104,7 +104,7 @@ index 487b3656..24216aeb 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 4114fa7b..c922c162 100644
+index ad3c39e9..711f1d26 100644
 --- a/poppler/CairoFontEngine.cc
 +++ b/poppler/CairoFontEngine.cc
 @@ -123,7 +123,7 @@ CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
@@ -135,7 +135,7 @@ index 4114fa7b..c922c162 100644
    if (cairo_font_face_set_user_data (l->font_face,
  				     &_ft_cairo_key,
 diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
-index b8a3e491..9490b600 100644
+index 4fc9882c..87e50dd7 100644
 --- a/poppler/CairoOutputDev.cc
 +++ b/poppler/CairoOutputDev.cc
 @@ -205,6 +205,13 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
@@ -191,7 +191,7 @@ index b8a3e491..9490b600 100644
    glyphs = nullptr;
    if (use_show_text_glyphs) {
 diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
-index 3dfc08e8..428a4481 100644
+index 9a117569..f62b96cd 100644
 --- a/poppler/Gfx.cc
 +++ b/poppler/Gfx.cc
 @@ -4604,6 +4604,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) {
@@ -257,7 +257,7 @@ index f966e8f6..3850bc28 100644
  
    void drawForm(Object *str, Dict *resDict, const double *matrix, const double *bbox,
 diff --git a/poppler/Page.cc b/poppler/Page.cc
-index fddb831c..880ee303 100644
+index 6d6d8642..b7fb441d 100644
 --- a/poppler/Page.cc
 +++ b/poppler/Page.cc
 @@ -336,6 +336,19 @@ Dict *Page::getResourceDictCopy(XRef *xrefA) {
@@ -281,7 +281,7 @@ index fddb831c..880ee303 100644
    Object obj1;
    Dict *pageDict = pageObj.getDict()->copy(xrefA);
 diff --git a/poppler/Page.h b/poppler/Page.h
-index 37b59455..bf8e44aa 100644
+index 01f056f9..d6547a79 100644
 --- a/poppler/Page.h
 +++ b/poppler/Page.h
 @@ -183,6 +183,9 @@ public:
@@ -295,5 +295,5 @@ index 37b59455..bf8e44aa 100644
    Object getAnnotsObject(XRef *xrefA = nullptr) { return annotsObj.fetch(xrefA ? xrefA : xref); }
    // Add a new annotation to the page
 -- 
-2.19.1
+2.20.1
 
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index 28810a8e4575..cedf3f9d30ac 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 3bb124da95aba8cbea8625b66b1d10af8dde21bb Mon Sep 17 00:00:00 2001
+From 2572d6812cb492abec9ed228e5e9b0c53f532fcd 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/5] Don't build the main poppler library.
@@ -8,7 +8,7 @@ Subject: [PATCH 4/5] Don't build the main poppler library.
  1 file changed, 17 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 88a53c47..f3abde94 100644
+index fa86ea22..0dbcb4b0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -478,23 +478,6 @@ if(TIFF_FOUND)
@@ -21,7 +21,7 @@ index 88a53c47..f3abde94 100644
 -else()
 -add_library(poppler ${poppler_SRCS})
 -endif()
--set_target_properties(poppler PROPERTIES VERSION 82.0.0 SOVERSION 82)
+-set_target_properties(poppler PROPERTIES VERSION 83.0.0 SOVERSION 83)
 -if(MINGW)
 -    get_target_property(POPPLER_SOVERSION poppler SOVERSION)
 -    set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
@@ -36,5 +36,5 @@ index 88a53c47..f3abde94 100644
    install(FILES
      poppler/Annot.h
 -- 
-2.19.1
+2.20.1
 
diff --git a/0005-Work-around-openjpeg2-includes-issue.patch b/0005-Work-around-openjpeg2-includes-issue.patch
deleted file mode 100644
index f44b5ee7fb62..000000000000
--- a/0005-Work-around-openjpeg2-includes-issue.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From eed96a07bc528a6a30ae1ff317a4fb6f9e779e93 Mon Sep 17 00:00:00 2001
-From: Paul Gideon Dann <pdgiddie@gmail.com>
-Date: Mon, 19 Nov 2018 15:04:47 +0000
-Subject: [PATCH 5/5] Work around openjpeg2 includes issue
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f3abde94..8ac4bc04 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -279,7 +279,7 @@ if(TIFF_FOUND)
-   set(ENABLE_LIBTIFF ON)
- endif()
- if(OpenJPEG_FOUND)
--  include_directories(${OPENJPEG_INCLUDE_DIRS})
-+  include_directories(/usr/lib/openjpeg-2.3)
- endif()
- if(LCMS2_FOUND)
-   include_directories(${LCMS2_INCLUDE_DIR})
--- 
-2.19.1
-
diff --git a/PKGBUILD b/PKGBUILD
index b55c68c2ec6e..b2b2e456e1a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=0.71.0
+pkgver=0.72.0
 pkgrel=1
 pkgdesc="Poppler Qt bindings, with patches to allow subpixel rendering via Cairo"
 license=('GPL')
@@ -16,14 +16,12 @@ 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-Apply-subpixel-rendering-in-Cairo-Backend.patch
-        0004-Don-t-build-the-main-poppler-library.patch
-        0005-Work-around-openjpeg2-includes-issue.patch)
-md5sums=('b505011e49e922c83f3ffb57ab40bc28'
-         '9f02368dcbfe5443c685231e2d71006c'
-         'e83270012cd0a839723f6eecdc577106'
-         'a8e7a953f3d26f61189077ebc4eb8cc6'
-         '78dd2a6709fe4a25f73cf4972aaa1bda'
-         'f25d93ed88065ecb31c099dd5de7ea25')
+        0004-Don-t-build-the-main-poppler-library.patch)
+md5sums=('5a18b02019daf33559eceb30e5ee2b6b'
+         '9467d715cee6e03faff8b4501ac9ffe6'
+         'fe4a13e6e240895135210ac274381b97'
+         '373784b49b3d71a8ae2faa2e1a5dc2d7'
+         '262ecf9ceb3485b7b24d6c738d7392eb')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"