Update for Poppler 0.67.0

6 files changed, 36 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 079a2f1fa826..02fc14fa392b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed May 23 13:38:15 UTC 2018
+# Mon Aug 13 10:53:05 UTC 2018
 pkgbase = poppler-qt-lcd
 	pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
-	pkgver = 0.64.0
+	pkgver = 0.67.0
 	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.64.0
-	provides = poppler-qt=0.64.0
-	provides = poppler-qt5=0.64.0
+	depends = poppler>=0.67.0
+	provides = poppler-qt=0.67.0
+	provides = poppler-qt5=0.67.0
 	conflicts = poppler-qt
 	conflicts = poppler-qt4
 	conflicts = poppler-qt5
-	source = http://poppler.freedesktop.org/poppler-0.64.0.tar.xz
+	source = http://poppler.freedesktop.org/poppler-0.67.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
-	md5sums = f7f687ebb60004f8ad61994575018044
-	md5sums = 912040a5f767a7b28f138238914d81a5
-	md5sums = 4f3a6fb3dc2ca63320720a64a4ce4b3b
-	md5sums = 1a16d27e7b83e7cdfc8e4d1e59035ac5
-	md5sums = ae1a96566ea48135cc83d2f4bbd6d7e0
+	md5sums = bcfbdcaca2a1f72435e4aaa3c06664ca
+	md5sums = 153dfa85e66c0895685198df2aab23f4
+	md5sums = bbbfa1b57a77771bbf5c3cc8a139a598
+	md5sums = 5e2c5ea62d566a78d2f2a76437663095
+	md5sums = 302fad6e739a022fcd4fed159e3008e2
 
 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 533a851da087..7ed3036d1728 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From 2967bef4990c00b014ec02cd18017f0a618c36db Mon Sep 17 00:00:00 2001
+From 658937f5adbf1f77302c07095447b59e607749de 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
@@ -12,7 +12,7 @@ Subject: [PATCH 1/4] 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 7100ebb3..3582fdbb 100644
+index 38bb6b14..e40fd82b 100644
 --- a/qt5/src/CMakeLists.txt
 +++ b/qt5/src/CMakeLists.txt
 @@ -7,6 +7,11 @@ include_directories(
@@ -39,7 +39,7 @@ index 7100ebb3..3582fdbb 100644
 +  )
 +endif(HAVE_CAIRO)
  add_library(poppler-qt5 ${poppler_qt5_SRCS})
- set_target_properties(poppler-qt5 PROPERTIES VERSION 1.14.0 SOVERSION 1)
+ set_target_properties(poppler-qt5 PROPERTIES VERSION 1.15.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}")
@@ -198,5 +198,5 @@ index 1e67e6ec..9131568d 100644
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}")
 -- 
-2.17.0
+2.18.0
 
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index 4cf2f96a6fb1..e8e50d75aea6 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From 4030fb1de971c9d56d7eda0f449f6b29641f6275 Mon Sep 17 00:00:00 2001
+From deaf87c625be17d000dc1d01cf866802cb9e7ffb 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 78751f8e..e0060d5d 100644
+index ca5251df..6b445505 100644
 --- a/qt5/src/poppler-private.cc
 +++ b/qt5/src/poppler-private.cc
-@@ -244,7 +244,7 @@ namespace Debug {
+@@ -262,7 +262,7 @@ namespace Debug {
      
      void DocumentData::init()
      {
@@ -21,5 +21,5 @@ index 78751f8e..e0060d5d 100644
          m_hints = 0;
          m_optContentModel = nullptr;
 -- 
-2.17.0
+2.18.0
 
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index 14fec8ee3ef0..acb379526431 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,4 +1,4 @@
-From 5fb553246687437173e97e68a28118106e723f45 Mon Sep 17 00:00:00 2001
+From c0c4a253390b391e7f7271969a48880faca070da 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
@@ -135,7 +135,7 @@ index 91deac46..aad28564 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 18124b8f..b5ffe071 100644
+index 8e8102e9..a93a7075 100644
 --- a/poppler/CairoOutputDev.cc
 +++ b/poppler/CairoOutputDev.cc
 @@ -214,6 +214,13 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
@@ -191,10 +191,10 @@ index 18124b8f..b5ffe071 100644
    glyphs = nullptr;
    if (use_show_text_glyphs) {
 diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
-index 08132072..dbc822ec 100644
+index 8f2c62d2..473cacb5 100644
 --- a/poppler/Gfx.cc
 +++ b/poppler/Gfx.cc
-@@ -4614,6 +4614,62 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
+@@ -4611,6 +4611,62 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
    error(errSyntaxError, getPos(), "Bad image parameters");
  }
  
@@ -258,7 +258,7 @@ index 08132072..dbc822ec 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 2ea0d9fa..3f0b4ce7 100644
+index 3ac4c929..5cefa0d1 100644
 --- a/poppler/Gfx.h
 +++ b/poppler/Gfx.h
 @@ -195,6 +195,9 @@ public:
@@ -311,5 +311,5 @@ index 7151ee5b..41c1fd75 100644
    Object getAnnotsObject(XRef *xrefA = nullptr) { return annotsObj.fetch(xrefA ? xrefA : xref); }
    // Add a new annotation to the page
 -- 
-2.17.0
+2.18.0
 
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index 76a9e4a112fe..14f43a3533ba 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 02e73aefa8cbca851ffe2f8c0d5fb6829ab1afdf Mon Sep 17 00:00:00 2001
+From 07fde1b2f53a16306401a85264e5728ec510036d 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,10 +8,10 @@ Subject: [PATCH 4/4] Don't build the main poppler library.
  1 file changed, 18 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ac186d53..a3d94e82 100644
+index cdfe7795..001425ce 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -484,24 +484,6 @@ if(TIFF_FOUND)
+@@ -483,24 +483,6 @@ if(TIFF_FOUND)
    set(poppler_LIBS ${poppler_LIBS} ${TIFF_LIBRARIES})
  endif()
  
@@ -22,7 +22,7 @@ index ac186d53..a3d94e82 100644
 -else()
 -add_library(poppler ${poppler_SRCS})
 -endif()
--set_target_properties(poppler PROPERTIES VERSION 75.0.0 SOVERSION 75)
+-set_target_properties(poppler PROPERTIES VERSION 78.0.0 SOVERSION 78)
 -if(MINGW)
 -    get_target_property(POPPLER_SOVERSION poppler SOVERSION)
 -    set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
@@ -37,5 +37,5 @@ index ac186d53..a3d94e82 100644
    install(FILES
      poppler/Annot.h
 -- 
-2.17.0
+2.18.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 73f83047f41d..1b196c8615d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=0.64.0
+pkgver=0.67.0
 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=('f7f687ebb60004f8ad61994575018044'
-         '912040a5f767a7b28f138238914d81a5'
-         '4f3a6fb3dc2ca63320720a64a4ce4b3b'
-         '1a16d27e7b83e7cdfc8e4d1e59035ac5'
-         'ae1a96566ea48135cc83d2f4bbd6d7e0')
+md5sums=('bcfbdcaca2a1f72435e4aaa3c06664ca'
+         '153dfa85e66c0895685198df2aab23f4'
+         'bbbfa1b57a77771bbf5c3cc8a139a598'
+         '5e2c5ea62d566a78d2f2a76437663095'
+         '302fad6e739a022fcd4fed159e3008e2')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"