Updating for Poppler 0.46.0

6 files changed, 42 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5146a66b525e..3a12e6d13ea8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Apr 11 15:37:10 UTC 2016
+# Tue Aug  9 13:54:38 UTC 2016
 pkgbase = poppler-qt-lcd
 	pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
-	pkgver = 0.42.0
+	pkgver = 0.46.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.42.0
-	provides = poppler-qt=0.42.0
-	provides = poppler-qt4=0.42.0
+	depends = poppler>=0.46.0
+	provides = poppler-qt=0.46.0
+	provides = poppler-qt4=0.46.0
 	conflicts = poppler-qt
 	conflicts = poppler-qt4
-	source = http://poppler.freedesktop.org/poppler-0.42.0.tar.xz
+	source = http://poppler.freedesktop.org/poppler-0.46.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 = c63efcde7d52b4135bb7463b04790862
-	md5sums = f6fcb96df3dc8fd9896a9315cf55e33f
-	md5sums = 218a06adfe33ea00e587875bc4e9025c
-	md5sums = 7a1f8a5e6bdbe4bfac361c29ef087f79
-	md5sums = 122dafc1c295afbf1d1f181618cc6df2
+	md5sums = a6513d6fe72751c58b501403c3da6ef1
+	md5sums = 1964c4388455d9da02fda267b3bbc0b6
+	md5sums = 6579a7896f9a2e4bb10bb19b552dda6c
+	md5sums = bd9df787addbc9a98f49192732465dc4
+	md5sums = 892694d6cfce9e6c321253cf62fc9001
 
 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 2a08bf9e71b9..fde93712eca0 100644
--- a/0001-Cairo-backend-added-to-Qt4-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt4-wrapper.patch
@@ -1,4 +1,4 @@
-From ca3ee4f73521a939f28fd15183d1997e02d8267a Mon Sep 17 00:00:00 2001
+From bb2a79e89f60366ae3830ed7e7c6bbfb567ec3db 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
@@ -12,7 +12,7 @@ Subject: [PATCH 1/4] Cairo backend added to Qt4 wrapper
  5 files changed, 95 insertions(+), 1 deletion(-)
 
 diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
-index 189eca2..5338b55 100644
+index 2b55e6b..8587f24 100644
 --- a/qt4/src/CMakeLists.txt
 +++ b/qt4/src/CMakeLists.txt
 @@ -6,6 +6,11 @@ include_directories(
@@ -40,7 +40,7 @@ index 189eca2..5338b55 100644
 +endif(HAVE_CAIRO)
  qt4_automoc(${poppler_qt4_SRCS})
  add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
- set_target_properties(poppler-qt4 PROPERTIES VERSION 4.9.0 SOVERSION 4)
+ set_target_properties(poppler-qt4 PROPERTIES VERSION 4.10.0 SOVERSION 4)
  target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
 +if (HAVE_CAIRO)
 +  target_link_libraries(poppler-qt4 ${CAIRO_LIBRARIES})
@@ -49,10 +49,10 @@ index 189eca2..5338b55 100644
  target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
  endif(MSVC)
 diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
-index 94f997d..6decaaf 100644
+index 93f9a0a..260c7a0 100644
 --- a/qt4/src/poppler-document.cc
 +++ b/qt4/src/poppler-document.cc
-@@ -547,6 +547,9 @@ namespace Poppler {
+@@ -698,6 +698,9 @@ namespace Poppler {
          ret << Document::SplashBackend;
  #endif
          ret << Document::ArthurBackend;
@@ -63,10 +63,10 @@ index 94f997d..6decaaf 100644
      }
  
 diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
-index 83bcf4a..df1d344 100644
+index 9e466da..650ad5f 100644
 --- a/qt4/src/poppler-page.cc
 +++ b/qt4/src/poppler-page.cc
-@@ -40,6 +40,7 @@
+@@ -41,6 +41,7 @@
  #include <QtGui/QPainter>
  
  #include <config.h>
@@ -74,7 +74,7 @@ index 83bcf4a..df1d344 100644
  #include <PDFDoc.h>
  #include <Catalog.h>
  #include <Form.h>
-@@ -53,6 +54,9 @@
+@@ -54,6 +55,9 @@
  #include <SplashOutputDev.h>
  #include <splash/SplashBitmap.h>
  #endif
@@ -84,7 +84,7 @@ index 83bcf4a..df1d344 100644
  
  #include "poppler-private.h"
  #include "poppler-page-transition-private.h"
-@@ -405,6 +409,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
+@@ -406,6 +410,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
        img = tmpimg;
        break;
      }
@@ -155,7 +155,7 @@ index 83bcf4a..df1d344 100644
    }
  
    return img;
-@@ -447,6 +515,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
+@@ -448,6 +516,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
           painter->restore();
        return true;
      }
@@ -165,10 +165,10 @@ index 83bcf4a..df1d344 100644
    return false;
  }
 diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
-index c0340a4..118f8ba 100644
+index 2b518c1..2eaeafc 100644
 --- a/qt4/src/poppler-qt4.h
 +++ b/qt4/src/poppler-qt4.h
-@@ -886,7 +886,8 @@ delete it;
+@@ -887,7 +887,8 @@ delete it;
  	*/
  	enum RenderBackend {
  	    SplashBackend,   ///< Splash backend
@@ -195,5 +195,5 @@ index bba868f..8c40471 100644
    string(REPLACE "-" "" test_name ${exe})
    set(${test_name}_SOURCES
 -- 
-2.8.0
+2.9.2
 
diff --git a/0002-Setting-default-Qt4-backend-to-Cairo.patch b/0002-Setting-default-Qt4-backend-to-Cairo.patch
index 5a8782088959..04252a6fde55 100644
--- a/0002-Setting-default-Qt4-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt4-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From 1c3e9ef4ad66c0326c32e22402694399997f61a4 Mon Sep 17 00:00:00 2001
+From ace47a614fce2654b51f7f02c3f3ed71526e90c0 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
@@ -8,10 +8,10 @@ Subject: [PATCH 2/4] Setting default Qt4 backend to Cairo
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qt4/src/poppler-private.cc b/qt4/src/poppler-private.cc
-index cbf21b1..1c7f16c 100644
+index d64dca6..2697517 100644
 --- a/qt4/src/poppler-private.cc
 +++ b/qt4/src/poppler-private.cc
-@@ -236,7 +236,7 @@ namespace Debug {
+@@ -245,7 +245,7 @@ namespace Debug {
      void DocumentData::init()
      {
          m_fontInfoIterator = 0;
@@ -21,5 +21,5 @@ index cbf21b1..1c7f16c 100644
          m_hints = 0;
          m_optContentModel = 0;
 -- 
-2.8.0
+2.9.2
 
diff --git a/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch b/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
index 0481848f3f70..b4285003ab9e 100644
--- a/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
+++ b/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
@@ -1,4 +1,4 @@
-From 1b9c60f0c26ad4a1e114836a6ef4ad6bfe1dcaaa Mon Sep 17 00:00:00 2001
+From c935463856b48d307ca766a676be573e242525a9 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 d0d6cb4..50e64f9 100644
+index bd18cde..3a563eb 100644
 --- a/poppler/CairoOutputDev.cc
 +++ b/poppler/CairoOutputDev.cc
 @@ -203,6 +203,13 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
@@ -26,5 +26,5 @@ index d0d6cb4..50e64f9 100644
  	//XXX: is this sufficient? could we miss changes to the matrix somehow?
  	cairo_get_matrix(cairo, &orig_matrix);
 -- 
-2.8.0
+2.9.2
 
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index 0f108c640626..ee6f611d0874 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 f92820594da3886cb45d797259591ec8305a815f Mon Sep 17 00:00:00 2001
+From 8a3d08351ebedd4efdfc90944911c52845097514 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, 11 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d385893..388d21a 100644
+index c90d0e8..4ba7bdd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -494,17 +494,6 @@ if(HAVE_PTHREAD)
+@@ -495,17 +495,6 @@ if(HAVE_PTHREAD)
    set(poppler_LIBS ${poppler_LIBS} ${CMAKE_THREAD_LIBS_INIT})
  endif()
  
@@ -22,7 +22,7 @@ index d385893..388d21a 100644
 -else(MSVC)
 -add_library(poppler SHARED ${poppler_SRCS})
 -endif(MSVC)
--set_target_properties(poppler PROPERTIES VERSION 59.0.0 SOVERSION 59)
+-set_target_properties(poppler PROPERTIES VERSION 63.0.0 SOVERSION 63)
 -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 d385893..388d21a 100644
    install(FILES
      poppler/Annot.h
 -- 
-2.8.0
+2.9.2
 
diff --git a/PKGBUILD b/PKGBUILD
index 0b60cda6b9b2..c2e981e4f43b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=0.42.0
+pkgver=0.46.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=('c63efcde7d52b4135bb7463b04790862'
-         'f6fcb96df3dc8fd9896a9315cf55e33f'
-         '218a06adfe33ea00e587875bc4e9025c'
-         '7a1f8a5e6bdbe4bfac361c29ef087f79'
-         '122dafc1c295afbf1d1f181618cc6df2')
+md5sums=('a6513d6fe72751c58b501403c3da6ef1'
+         '1964c4388455d9da02fda267b3bbc0b6'
+         '6579a7896f9a2e4bb10bb19b552dda6c'
+         'bd9df787addbc9a98f49192732465dc4'
+         '892694d6cfce9e6c321253cf62fc9001')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"