Update for Poppler 0.56

7 files changed, 60 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd286e21043a..49095c539f2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jun 20 09:12:00 UTC 2017
+# Thu Jul  6 11:43:02 UTC 2017
 pkgbase = poppler-qt-lcd
 	pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
-	pkgver = 0.55.0
+	pkgver = 0.56.0
 	pkgrel = 1
 	url = https://github.com/giddie/poppler-qt4-cairo-backend
 	arch = i686
@@ -12,23 +12,21 @@ pkgbase = poppler-qt-lcd
 	makedepends = pkgconfig
 	depends = qt4
 	depends = cairo
-	depends = poppler>=0.55.0
-	provides = poppler-qt=0.55.0
-	provides = poppler-qt4=0.55.0
+	depends = poppler>=0.56.0
+	provides = poppler-qt=0.56.0
+	provides = poppler-qt4=0.56.0
 	conflicts = poppler-qt
 	conflicts = poppler-qt4
-	source = http://poppler.freedesktop.org/poppler-0.55.0.tar.xz
+	source = http://poppler.freedesktop.org/poppler-0.56.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-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
+	source = 0004-Don-t-build-the-main-poppler-library.patch
+	md5sums = 31260c06e139d7270be4567cc8a4af97
+	md5sums = e4167980e2d3e76b0a99539f2ed77d73
+	md5sums = b9a4b76e5150511c92e203c2d107cfbc
+	md5sums = 0d8f664d28aa701a7ae51b71dcb3083f
+	md5sums = 2e884975ff13425e5577a7c7ada26f66
 
 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 de92b7f3b366..20f41477463e 100644
--- a/0001-Cairo-backend-added-to-Qt4-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt4-wrapper.patch
@@ -1,7 +1,7 @@
-From 569c9b01fec248b490e2a8af8b3f273f74bcae6e Mon Sep 17 00:00:00 2001
+From 9c6dc9f928928420f639b349ba0b1eb6f6e39de2 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/5] Cairo backend added to Qt4 wrapper
+Subject: [PATCH 1/4] Cairo backend added to Qt4 wrapper
 
 ---
  qt4/src/CMakeLists.txt      | 15 ++++++++++
diff --git a/0002-Setting-default-Qt4-backend-to-Cairo.patch b/0002-Setting-default-Qt4-backend-to-Cairo.patch
index c978309be278..a4cef2f3d8b5 100644
--- a/0002-Setting-default-Qt4-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt4-backend-to-Cairo.patch
@@ -1,7 +1,7 @@
-From 3153628b079598ff928a72f7d64005e698d37765 Mon Sep 17 00:00:00 2001
+From 5fdf9c604f9766764292ce26ab09ebdf15983b26 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/5] Setting default Qt4 backend to Cairo
+Subject: [PATCH 2/4] Setting default Qt4 backend to Cairo
 
 ---
  qt4/src/poppler-private.cc | 2 +-
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index 5ea583c435fa..1ea983ca07f8 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,7 +1,7 @@
-From ebd6c3a630b4a773182b50ddcc5c0efed809cb33 Mon Sep 17 00:00:00 2001
+From 77ce75d01fbd1b560dffe28de12b175d4338224b 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
+Subject: [PATCH 3/4] Apply subpixel rendering in Cairo Backend
 
 Source:
 https://github.com/zhou13/poppler-subpixel/blob/master/poppler/poppler-subpixel.patch
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
new file mode 100644
index 000000000000..d41152f3dd44
--- /dev/null
+++ b/0004-Don-t-build-the-main-poppler-library.patch
@@ -0,0 +1,34 @@
+From 10b74e97a67520b7405f37cc65b90d8ed0fedbc2 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.
+
+---
+ CMakeLists.txt | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 98d23a61..37aecf7e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -530,17 +530,6 @@ if(HAVE_PTHREAD)
+   set(poppler_LIBS ${poppler_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+ endif()
+ 
+-if(MSVC)
+-add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+-set(CMAKE_CXX_FLAGS "/Zc:wchar_t- ${CMAKE_CXX_FLAGS}")
+-add_library(poppler STATIC ${poppler_SRCS})
+-else(MSVC)
+-add_library(poppler SHARED ${poppler_SRCS})
+-endif(MSVC)
+-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})
+-
+ if(ENABLE_XPDF_HEADERS)
+   install(FILES
+     poppler/Annot.h
+-- 
+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
deleted file mode 100644
index 282541c48483..000000000000
--- a/0004-Don-t-built-qt4-and-qt5-tests-and-demos-in-CMake.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/PKGBUILD b/PKGBUILD
index a7ce0a083156..3aaaf79a83dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=0.55.0
+pkgver=0.56.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-Qt4-wrapper.patch
         0002-Setting-default-Qt4-backend-to-Cairo.patch
         0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
-        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')
+        0004-Don-t-build-the-main-poppler-library.patch)
+md5sums=('31260c06e139d7270be4567cc8a4af97'
+         'e4167980e2d3e76b0a99539f2ed77d73'
+         'b9a4b76e5150511c92e203c2d107cfbc'
+         '0d8f664d28aa701a7ae51b71dcb3083f'
+         '2e884975ff13425e5577a7c7ada26f66')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"
@@ -37,7 +35,7 @@ build() {
   cmake -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DENABLE_CPP=OFF -DENABLE_UTILS=OFF \
-        -DWITH_GLIB=OFF -DBUILD_QT4_TESTS=OFF \
+        -DWITH_GLIB=OFF \
         ..
   make poppler-qt4
 }