Updating for Poppler 0.40.0

6 files changed, 32 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc0552b1a607..6d6bbac0588a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Dec 31 08:56:13 UTC 2015
+# Thu Feb 18 15:58:03 UTC 2016
 pkgbase = poppler-qt-lcd
 	pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
-	pkgver = 0.39.0
+	pkgver = 0.40.0
 	pkgrel = 1
 	url = https://github.com/giddie/poppler-qt4-cairo-backend
 	arch = i686
@@ -12,21 +12,21 @@ pkgbase = poppler-qt-lcd
 	makedepends = pkgconfig
 	depends = qt4
 	depends = cairo
-	depends = poppler>=0.39.0
-	provides = poppler-qt=0.39.0
-	provides = poppler-qt4=0.39.0
+	depends = poppler>=0.40.0
+	provides = poppler-qt=0.40.0
+	provides = poppler-qt4=0.40.0
 	conflicts = poppler-qt
 	conflicts = poppler-qt4
-	source = http://poppler.freedesktop.org/poppler-0.39.0.tar.xz
+	source = http://poppler.freedesktop.org/poppler-0.40.0.tar.xz
 	source = 0001-Cairo-backend-added-to-Qt4-wrapper.patch
 	source = 0002-Setting-default-Qt4-backend-to-Cairo.patch
 	source = 0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
 	source = 0004-Don-t-build-the-main-poppler-library.patch
-	md5sums = 5100960c61b932430b5d74068d71f530
-	md5sums = 3978c6a264f8dc893cc5c66eea9ca7d6
-	md5sums = 7b9be39282459ad83e707ab8896f1a27
-	md5sums = 4408252825861bda24d3b52bd67c83b2
-	md5sums = 4f200c9c709692cb0f4ed53c456fe326
+	md5sums = 2fec3b2401a1722418b1f5bf64cd00cd
+	md5sums = 120458df7ea827940eb2c781c7d61bb6
+	md5sums = 5e640717442d47cb99ceecc83280104e
+	md5sums = 900c529924cbe37998b55096e9754312
+	md5sums = 4800d60e0fbbcd71467908e9328d9545
 
 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 2c95e103dfbe..e344a409ed47 100644
--- a/0001-Cairo-backend-added-to-Qt4-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt4-wrapper.patch
@@ -1,4 +1,4 @@
-From 6a1a781c67cba9526f60a87d4a5357c497f4eb6a Mon Sep 17 00:00:00 2001
+From 2b951f702e692304f02a7dd1d8e8647a02e61b22 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
@@ -179,7 +179,7 @@ index c0340a4..118f8ba 100644
  
  	/**
 diff --git a/qt4/tests/CMakeLists.txt b/qt4/tests/CMakeLists.txt
-index 4f16f24..2ab3555 100644
+index bba868f..8c40471 100644
 --- a/qt4/tests/CMakeLists.txt
 +++ b/qt4/tests/CMakeLists.txt
 @@ -8,6 +8,11 @@ include_directories(
@@ -195,5 +195,5 @@ index 4f16f24..2ab3555 100644
    string(REPLACE "-" "" test_name ${exe})
    set(${test_name}_SOURCES
 -- 
-2.6.4
+2.7.1
 
diff --git a/0002-Setting-default-Qt4-backend-to-Cairo.patch b/0002-Setting-default-Qt4-backend-to-Cairo.patch
index 1669ea8d549c..d6a06f2eed78 100644
--- a/0002-Setting-default-Qt4-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt4-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From 0c6c90d26e78392ba06b151be8a387d8c5c284c2 Mon Sep 17 00:00:00 2001
+From 9bf18c40578adbf56648f828c852e478a830e146 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
@@ -21,5 +21,5 @@ index cbf21b1..1c7f16c 100644
          m_hints = 0;
          m_optContentModel = 0;
 -- 
-2.6.4
+2.7.1
 
diff --git a/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch b/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
index b363b898dd07..73b7340d57ad 100644
--- a/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
+++ b/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
@@ -1,4 +1,4 @@
-From 711bb8afbf21728fec5de0c5eb18b9647737dd47 Mon Sep 17 00:00:00 2001
+From d1fffd68cca836144e82aefd39eef54b9710ae73 Mon Sep 17 00:00:00 2001
 From: Paul Gideon Dann <pdgiddie@gmail.com>
 Date: Wed, 20 May 2009 13:06:48 +0100
 Subject: [PATCH 3/4] Forcing subpixel rendering in Cairo backend
@@ -8,7 +8,7 @@ Subject: [PATCH 3/4] Forcing subpixel rendering in Cairo backend
  1 file changed, 7 insertions(+)
 
 diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
-index d06f3c7..5ed9411 100644
+index d0d6cb4..50e64f9 100644
 --- a/poppler/CairoOutputDev.cc
 +++ b/poppler/CairoOutputDev.cc
 @@ -203,6 +203,13 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
@@ -26,5 +26,5 @@ index d06f3c7..5ed9411 100644
  	//XXX: is this sufficient? could we miss changes to the matrix somehow?
  	cairo_get_matrix(cairo, &orig_matrix);
 -- 
-2.6.4
+2.7.1
 
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index 79e2e922c1c8..825ef26faad3 100644
--- a/0004-Don-t-build-the-main-poppler-library.patch
+++ b/0004-Don-t-build-the-main-poppler-library.patch
@@ -1,17 +1,17 @@
-From efb9c47f00b2b8b9bb237fa631e8f35f9ed1c631 Mon Sep 17 00:00:00 2001
+From c8dcf94691b9290f10e89eded920ababbfb812f3 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 | 12 ------------
- 1 file changed, 12 deletions(-)
+ CMakeLists.txt | 11 -----------
+ 1 file changed, 11 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a1412d8..201a4e5 100644
+index e58a41d..3977624 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -471,18 +471,6 @@ if(HAVE_PTHREAD)
+@@ -470,17 +470,6 @@ if(HAVE_PTHREAD)
    set(poppler_LIBS ${poppler_LIBS} ${CMAKE_THREAD_LIBS_INIT})
  endif()
  
@@ -23,13 +23,12 @@ index a1412d8..201a4e5 100644
 -add_library(poppler SHARED ${poppler_SRCS})
 -endif(MSVC)
 -set_target_properties(poppler PROPERTIES VERSION 58.0.0 SOVERSION 58)
--target_link_libraries(poppler ${poppler_LIBS})
--target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
+-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.6.4
+2.7.1
 
diff --git a/PKGBUILD b/PKGBUILD
index d74c8415ae8e..674e8a99aeeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=0.39.0
+pkgver=0.40.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-Qt4-backend-to-Cairo.patch
         0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
         0004-Don-t-build-the-main-poppler-library.patch)
-md5sums=('5100960c61b932430b5d74068d71f530'
-         '3978c6a264f8dc893cc5c66eea9ca7d6'
-         '7b9be39282459ad83e707ab8896f1a27'
-         '4408252825861bda24d3b52bd67c83b2'
-         '4f200c9c709692cb0f4ed53c456fe326')
+md5sums=('2fec3b2401a1722418b1f5bf64cd00cd'
+         '120458df7ea827940eb2c781c7d61bb6'
+         '5e640717442d47cb99ceecc83280104e'
+         '900c529924cbe37998b55096e9754312'
+         '4800d60e0fbbcd71467908e9328d9545')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"