Update for Poppler 0.55

7 files changed, 79 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 073e783eaa3c..bd286e21043a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Feb 23 11:03:47 UTC 2017
+# Tue Jun 20 09:12:00 UTC 2017
 pkgbase = poppler-qt-lcd
 	pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
-	pkgver = 0.52.0
+	pkgver = 0.55.0
 	pkgrel = 1
 	url = https://github.com/giddie/poppler-qt4-cairo-backend
 	arch = i686
@@ -12,21 +12,23 @@ pkgbase = poppler-qt-lcd
 	makedepends = pkgconfig
 	depends = qt4
 	depends = cairo
-	depends = poppler>=0.52.0
-	provides = poppler-qt=0.52.0
-	provides = poppler-qt4=0.52.0
+	depends = poppler>=0.55.0
+	provides = poppler-qt=0.55.0
+	provides = poppler-qt4=0.55.0
 	conflicts = poppler-qt
 	conflicts = poppler-qt4
-	source = http://poppler.freedesktop.org/poppler-0.52.0.tar.xz
+	source = http://poppler.freedesktop.org/poppler-0.55.0.tar.xz
 	source = 0001-Cairo-backend-added-to-Qt4-wrapper.patch
 	source = 0002-Setting-default-Qt4-backend-to-Cairo.patch
 	source = 0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
-	source = 0004-Don-t-build-the-main-poppler-library.patch
-	md5sums = dfdd55d5df39685bbb82b0c08fa4ef66
-	md5sums = 9425ab6e09e6a1508fb83958bb59bcc0
-	md5sums = b4af67eae3097e4d7234c431e7d69e39
-	md5sums = 557f60f180e4337820c9617f6d0c184a
-	md5sums = 697056834a8786506b2bc882a7dee9c2
+	source = 0004-Don-t-built-qt4-and-qt5-tests-and-demos-in-CMake.patch
+	source = 0005-Don-t-build-the-main-poppler-library.patch
+	md5sums = f7a8230626b6d2061acfdc852930b7dd
+	md5sums = 9e27a60d8ee57d586eb3a9565e2bf657
+	md5sums = 37b7f814b5b031a93f5f793f0c4205f7
+	md5sums = 1e25830964a43bd4866ee67f5016b926
+	md5sums = 9ec71413b6c5a1261adff39cd878677c
+	md5sums = c0355a4a51e4fa239f07341732eb132d
 
 pkgname = poppler-qt-lcd
 
diff --git a/0001-Cairo-backend-added-to-Qt4-wrapper.patch b/0001-Cairo-backend-added-to-Qt4-wrapper.patch
index d1754d19030c..de92b7f3b366 100644
--- a/0001-Cairo-backend-added-to-Qt4-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt4-wrapper.patch
@@ -1,7 +1,7 @@
-From 75f8a39ebbba60297e717e74b8a838bc679719de Mon Sep 17 00:00:00 2001
+From 569c9b01fec248b490e2a8af8b3f273f74bcae6e Mon Sep 17 00:00:00 2001
 From: Paul Gideon Dann <pdgiddie@gmail.com>
 Date: Wed, 20 May 2009 11:42:28 +0100
-Subject: [PATCH 1/4] Cairo backend added to Qt4 wrapper
+Subject: [PATCH 1/5] Cairo backend added to Qt4 wrapper
 
 ---
  qt4/src/CMakeLists.txt      | 15 ++++++++++
@@ -195,5 +195,5 @@ index bba868f1..8c404716 100644
    string(REPLACE "-" "" test_name ${exe})
    set(${test_name}_SOURCES
 -- 
-2.11.1
+2.13.1
 
diff --git a/0002-Setting-default-Qt4-backend-to-Cairo.patch b/0002-Setting-default-Qt4-backend-to-Cairo.patch
index 49b3ebefdc51..c978309be278 100644
--- a/0002-Setting-default-Qt4-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt4-backend-to-Cairo.patch
@@ -1,7 +1,7 @@
-From 292dabbacdc63bc1743d2eac7a92cc87d767465f Mon Sep 17 00:00:00 2001
+From 3153628b079598ff928a72f7d64005e698d37765 Mon Sep 17 00:00:00 2001
 From: Paul Gideon Dann <pdgiddie@gmail.com>
 Date: Wed, 20 May 2009 13:17:29 +0100
-Subject: [PATCH 2/4] Setting default Qt4 backend to Cairo
+Subject: [PATCH 2/5] Setting default Qt4 backend to Cairo
 
 ---
  qt4/src/poppler-private.cc | 2 +-
@@ -21,5 +21,5 @@ index 6c4d782e..8cfba6f6 100644
          m_hints = 0;
          m_optContentModel = 0;
 -- 
-2.11.1
+2.13.1
 
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index 3d6561ff65c6..5ea583c435fa 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,7 +1,7 @@
-From f713e421685ace6ac6515a347910fc51773f874c Mon Sep 17 00:00:00 2001
+From ebd6c3a630b4a773182b50ddcc5c0efed809cb33 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
+Subject: [PATCH 3/5] Apply subpixel rendering in Cairo Backend
 
 Source:
 https://github.com/zhou13/poppler-subpixel/blob/master/poppler/poppler-subpixel.patch
@@ -135,7 +135,7 @@ index 6676f898..3c8fe815 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 89d0c996..b06f0da5 100644
+index 2946c924..78f85c0b 100644
 --- a/poppler/CairoOutputDev.cc
 +++ b/poppler/CairoOutputDev.cc
 @@ -204,6 +204,13 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
@@ -191,10 +191,10 @@ index 89d0c996..b06f0da5 100644
    glyphs = NULL;
    if (use_show_text_glyphs) {
 diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
-index a8f5be95..0ca1940a 100644
+index 37220280..1ae46f40 100644
 --- a/poppler/Gfx.cc
 +++ b/poppler/Gfx.cc
-@@ -4728,6 +4728,62 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
+@@ -4730,6 +4730,62 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
    error(errSyntaxError, getPos(), "Bad image parameters");
  }
  
@@ -311,5 +311,5 @@ index 2aaabae9..a49d34f1 100644
    Object *getAnnots(Object *obj, XRef *xrefA = NULL) { return annotsObj.fetch((xrefA == NULL) ? xref : xrefA, obj); }
    // Add a new annotation to the page
 -- 
-2.11.1
+2.13.1
 
diff --git a/0004-Don-t-built-qt4-and-qt5-tests-and-demos-in-CMake.patch b/0004-Don-t-built-qt4-and-qt5-tests-and-demos-in-CMake.patch
new file mode 100644
index 000000000000..282541c48483
--- /dev/null
+++ b/0004-Don-t-built-qt4-and-qt5-tests-and-demos-in-CMake.patch
@@ -0,0 +1,38 @@
+From 5d61d46ebde65ed37c5c7f11925f11438c55dc27 Mon Sep 17 00:00:00 2001
+From: Paul Gideon Dann <pdgiddie@gmail.com>
+Date: Tue, 20 Jun 2017 09:59:20 +0100
+Subject: [PATCH 4/5] Don't built qt4 and qt5 tests and demos in CMake
+
+Hopefully they'll be fixed by the next Poppler release.
+---
+ qt4/CMakeLists.txt | 4 ++--
+ qt5/CMakeLists.txt | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/qt4/CMakeLists.txt b/qt4/CMakeLists.txt
+index 4d345681..567ff26e 100644
+--- a/qt4/CMakeLists.txt
++++ b/qt4/CMakeLists.txt
+@@ -2,5 +2,5 @@
+ string(REPLACE "-Wsuggest-override" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ 
+ add_subdirectory(src)
+-add_subdirectory(tests)
+-add_subdirectory(demos)
++# add_subdirectory(tests)
++# add_subdirectory(demos)
+diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
+index 6bd7a6be..d7f09a72 100644
+--- a/qt5/CMakeLists.txt
++++ b/qt5/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ set(CMAKE_AUTOMOC ON)
+ 
+ add_subdirectory(src)
+-add_subdirectory(tests)
+-add_subdirectory(demos)
++# add_subdirectory(tests)
++# add_subdirectory(demos)
+-- 
+2.13.1
+
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0005-Don-t-build-the-main-poppler-library.patch
index 0bdc5e701bc4..30f0f129a43c 100644
--- a/0004-Don-t-build-the-main-poppler-library.patch
+++ b/0005-Don-t-build-the-main-poppler-library.patch
@@ -1,17 +1,17 @@
-From 4df1504f9a4920f45442a7bb32e07d05c4e10a85 Mon Sep 17 00:00:00 2001
+From 64a87f3f7f8058fa386a9a7becc8b6c522d5f3a9 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.
+Subject: [PATCH 5/5] Don't build the main poppler library.
 
 ---
  CMakeLists.txt | 11 -----------
  1 file changed, 11 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d36e06e3..a9132454 100644
+index a79db356..7d1fe48e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -495,17 +495,6 @@ if(HAVE_PTHREAD)
+@@ -530,17 +530,6 @@ if(HAVE_PTHREAD)
    set(poppler_LIBS ${poppler_LIBS} ${CMAKE_THREAD_LIBS_INIT})
  endif()
  
@@ -22,7 +22,7 @@ index d36e06e3..a9132454 100644
 -else(MSVC)
 -add_library(poppler SHARED ${poppler_SRCS})
 -endif(MSVC)
--set_target_properties(poppler PROPERTIES VERSION 66.0.0 SOVERSION 66)
+-set_target_properties(poppler PROPERTIES VERSION 67.0.0 SOVERSION 67)
 -target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
 -install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
 -
@@ -30,5 +30,5 @@ index d36e06e3..a9132454 100644
    install(FILES
      poppler/Annot.h
 -- 
-2.11.1
+2.13.1
 
diff --git a/PKGBUILD b/PKGBUILD
index f58373cf3829..a7ce0a083156 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=0.52.0
+pkgver=0.55.0
 pkgrel=1
 pkgdesc="Poppler Qt bindings, with patches to allow subpixel rendering via Cairo"
 license=('GPL')
@@ -16,12 +16,14 @@ source=(http://poppler.freedesktop.org/poppler-${pkgver}.tar.xz
         0001-Cairo-backend-added-to-Qt4-wrapper.patch
         0002-Setting-default-Qt4-backend-to-Cairo.patch
         0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
-        0004-Don-t-build-the-main-poppler-library.patch)
-md5sums=('dfdd55d5df39685bbb82b0c08fa4ef66'
-         '9425ab6e09e6a1508fb83958bb59bcc0'
-         'b4af67eae3097e4d7234c431e7d69e39'
-         '557f60f180e4337820c9617f6d0c184a'
-         '697056834a8786506b2bc882a7dee9c2')
+        0004-Don-t-built-qt4-and-qt5-tests-and-demos-in-CMake.patch
+        0005-Don-t-build-the-main-poppler-library.patch)
+md5sums=('f7a8230626b6d2061acfdc852930b7dd'
+         '9e27a60d8ee57d586eb3a9565e2bf657'
+         '37b7f814b5b031a93f5f793f0c4205f7'
+         '1e25830964a43bd4866ee67f5016b926'
+         '9ec71413b6c5a1261adff39cd878677c'
+         'c0355a4a51e4fa239f07341732eb132d')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"