Update for Poppler 0.63.0

8 files changed, 136 insertions, 169 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb055f9b6879..d553a74dd97f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,33 @@
 # Generated by mksrcinfo v8
-# Thu Nov 30 11:35:31 UTC 2017
+# Wed Apr  4 15:56:26 UTC 2018
 pkgbase = poppler-qt-lcd
 	pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
-	pkgver = 0.61.1
+	pkgver = 0.63.0
 	pkgrel = 1
-	url = https://github.com/giddie/poppler-qt4-cairo-backend
+	url = https://github.com/giddie/poppler-cairo-backend
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
 	makedepends = pkgconfig
-	depends = qt4
+	depends = qt5-base
 	depends = cairo
-	depends = poppler>=0.61.1
-	provides = poppler-qt=0.61.1
-	provides = poppler-qt4=0.61.1
+	depends = poppler>=0.63.0
+	provides = poppler-qt=0.63.0
+	provides = poppler-qt5=0.63.0
 	conflicts = poppler-qt
 	conflicts = poppler-qt4
-	source = http://poppler.freedesktop.org/poppler-0.61.1.tar.xz
-	source = 0001-Cairo-backend-added-to-Qt4-wrapper.patch
-	source = 0002-Setting-default-Qt4-backend-to-Cairo.patch
+	conflicts = poppler-qt5
+	source = http://poppler.freedesktop.org/poppler-0.63.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 = 2d3dcea88d6a814317fac74d2a16c3cd
-	md5sums = 90d723430b0789645a2ed3b0321682db
-	md5sums = 70d9321df8089c6f91cc2c18995870ec
-	md5sums = c62c09b41f8ef0d2d86a6fc3fa6b65b0
-	md5sums = 305bd77d5e3ea256959df12f22cb0bcd
+	md5sums = 66a54da4896b1408611699feda5c1821
+	md5sums = 45b1cb3f22736d743753b8f343d06087
+	md5sums = 4b41a9385811d24747820dec0b240045
+	md5sums = fe0f21ce215ae3c92917c79b1c9c2cb4
+	md5sums = d6913e1dd7449b271fa2fd296cfda457
 
 pkgname = poppler-qt-lcd
 
diff --git a/0001-Cairo-backend-added-to-Qt4-wrapper.patch b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
index 502780a9ac9a..5f0cfdcff2c6 100644
--- a/0001-Cairo-backend-added-to-Qt4-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,21 +1,21 @@
-From c791b85224237ab10d12cc87ee4052eca09808a8 Mon Sep 17 00:00:00 2001
+From fb0f060b9528e38122026fc5c5074b742a712cd8 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
+Date: Wed, 4 Apr 2018 16:36:56 +0100
+Subject: [PATCH 1/4] Cairo backend added to Qt5 wrapper
 
 ---
- qt4/src/CMakeLists.txt      | 15 ++++++++++
- qt4/src/poppler-document.cc |  3 ++
- qt4/src/poppler-page.cc     | 70 +++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h       |  3 +-
- qt4/tests/CMakeLists.txt    |  5 ++++
+ qt5/src/CMakeLists.txt      | 15 ++++++++++
+ qt5/src/poppler-document.cc |  3 ++
+ qt5/src/poppler-page.cc     | 70 +++++++++++++++++++++++++++++++++++++++++++++
+ qt5/src/poppler-qt5.h       |  3 +-
+ qt5/tests/CMakeLists.txt    |  5 ++++
  5 files changed, 95 insertions(+), 1 deletion(-)
 
-diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
-index f6547726..b0baa84b 100644
---- a/qt4/src/CMakeLists.txt
-+++ b/qt4/src/CMakeLists.txt
-@@ -6,6 +6,11 @@ include_directories(
+diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
+index 5ae42f52..04e3fcdf 100644
+--- a/qt5/src/CMakeLists.txt
++++ b/qt5/src/CMakeLists.txt
+@@ -7,6 +7,11 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
  )
  
@@ -24,38 +24,38 @@ index f6547726..b0baa84b 100644
 +  add_definitions(${CAIRO_CFLAGS})
 +endif (HAVE_CAIRO)
 +
- set(poppler_qt4_SRCS
+ set(poppler_qt5_SRCS
    poppler-annotation.cc
    poppler-document.cc
-@@ -28,6 +33,13 @@ set(poppler_qt4_SRCS
+@@ -29,6 +34,13 @@ set(poppler_qt5_SRCS
    poppler-media.cc
    ArthurOutputDev.cc
  )
 +if (HAVE_CAIRO)
-+  set(poppler_qt4_SRCS ${poppler_qt4_SRCS}
++  set(poppler_qt5_SRCS ${poppler_qt5_SRCS}
 +    ${CMAKE_SOURCE_DIR}/poppler/CairoOutputDev.cc
 +    ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
 +    ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc
 +  )
 +endif(HAVE_CAIRO)
- qt4_automoc(${poppler_qt4_SRCS})
- add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
- set_target_properties(poppler-qt4 PROPERTIES VERSION 4.11.0 SOVERSION 4)
+ add_library(poppler-qt5 ${poppler_qt5_SRCS})
+ set_target_properties(poppler-qt5 PROPERTIES VERSION 1.13.0 SOVERSION 1)
+ if(MINGW)
 @@ -36,6 +48,9 @@ if(MINGW)
-     set_target_properties(poppler-qt4 PROPERTIES SUFFIX "-${POPPLER_QT4_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+     set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
  endif()
- target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
+ target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES})
 +if (HAVE_CAIRO)
-+  target_link_libraries(poppler-qt4 ${CAIRO_LIBRARIES})
++  target_link_libraries(poppler-qt5 ${CAIRO_LIBRARIES})
 +endif (HAVE_CAIRO)
  if(MSVC)
- target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
+ target_link_libraries(poppler-qt5 poppler ${poppler_LIBS})
  endif()
-diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
-index d6e2fbf7..c1f293ad 100644
---- a/qt4/src/poppler-document.cc
-+++ b/qt4/src/poppler-document.cc
-@@ -694,6 +694,9 @@ namespace Poppler {
+diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc
+index 0eeb923f..e1b7a71c 100644
+--- a/qt5/src/poppler-document.cc
++++ b/qt5/src/poppler-document.cc
+@@ -672,6 +672,9 @@ namespace Poppler {
          ret << Document::SplashBackend;
  #endif
          ret << Document::ArthurBackend;
@@ -65,11 +65,11 @@ index d6e2fbf7..c1f293ad 100644
          return ret;
      }
  
-diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
-index ffe6e99c..084c4a6b 100644
---- a/qt4/src/poppler-page.cc
-+++ b/qt4/src/poppler-page.cc
-@@ -42,6 +42,7 @@
+diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
+index 381a608b..21e96fe2 100644
+--- a/qt5/src/poppler-page.cc
++++ b/qt5/src/poppler-page.cc
+@@ -45,6 +45,7 @@
  #include <QtGui/QPainter>
  
  #include <config.h>
@@ -77,7 +77,7 @@ index ffe6e99c..084c4a6b 100644
  #include <PDFDoc.h>
  #include <Catalog.h>
  #include <Form.h>
-@@ -55,6 +56,9 @@
+@@ -58,6 +59,9 @@
  #include <SplashOutputDev.h>
  #include <splash/SplashBitmap.h>
  #endif
@@ -87,7 +87,7 @@ index ffe6e99c..084c4a6b 100644
  
  #include "poppler-private.h"
  #include "poppler-page-transition-private.h"
-@@ -416,6 +420,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
+@@ -596,6 +600,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
        img = tmpimg;
        break;
      }
@@ -157,36 +157,36 @@ index ffe6e99c..084c4a6b 100644
 +    }
    }
  
-   return img;
-@@ -458,6 +526,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
-          painter->restore();
-       return true;
+   if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload))
+@@ -618,6 +686,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
+         QImageDumpingArthurOutputDev arthur_output(painter, nullptr);
+         return renderToArthur(&arthur_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags);
      }
 +    case Poppler::Document::CairoBackend:
 +      return false;
    }
    return false;
  }
-diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
-index 1b5afb2e..8e3cb26b 100644
---- a/qt4/src/poppler-qt4.h
-+++ b/qt4/src/poppler-qt4.h
-@@ -887,7 +887,8 @@ delete it;
+diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h
+index 3adbf02f..5422482a 100644
+--- a/qt5/src/poppler-qt5.h
++++ b/qt5/src/poppler-qt5.h
+@@ -1054,7 +1054,8 @@ delete it;
  	*/
  	enum RenderBackend {
  	    SplashBackend,   ///< Splash backend
--	    ArthurBackend   ///< Arthur (Qt4) backend
-+	    ArthurBackend,   ///< Arthur (Qt4) backend
+-	    ArthurBackend   ///< Arthur (Qt) backend
++	    ArthurBackend,   ///< Arthur (Qt) backend
 +	    CairoBackend     ///< Cairo backend
  	};
  
  	/**
-diff --git a/qt4/tests/CMakeLists.txt b/qt4/tests/CMakeLists.txt
-index a01a638a..69ce63bc 100644
---- a/qt4/tests/CMakeLists.txt
-+++ b/qt4/tests/CMakeLists.txt
-@@ -8,6 +8,11 @@ include_directories(
-   ${QT4_INCLUDE_DIR}
+diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt
+index 1e67e6ec..9131568d 100644
+--- a/qt5/tests/CMakeLists.txt
++++ b/qt5/tests/CMakeLists.txt
+@@ -11,6 +11,11 @@ include_directories(
+   ${Qt5Widgets_INCLUDE_DIRS}
  )
  
 +if (HAVE_CAIRO)
@@ -194,9 +194,9 @@ index a01a638a..69ce63bc 100644
 +  add_definitions(${CAIRO_CFLAGS})
 +endif (HAVE_CAIRO)
 +
- macro(QT4_ADD_SIMPLETEST exe source)
-   string(REPLACE "-" "" test_name ${exe})
-   set(${test_name}_SOURCES
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}")
 -- 
-2.15.1
+2.16.3
 
diff --git a/0002-Setting-default-Qt4-backend-to-Cairo.patch b/0002-Setting-default-Qt4-backend-to-Cairo.patch
deleted file mode 100644
index 68e2763c14f5..000000000000
--- a/0002-Setting-default-Qt4-backend-to-Cairo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 719e3795d57d8652bacea947277abac0458f51da 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
-
----
- qt4/src/poppler-private.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qt4/src/poppler-private.cc b/qt4/src/poppler-private.cc
-index 1338a185..b6ca064a 100644
---- a/qt4/src/poppler-private.cc
-+++ b/qt4/src/poppler-private.cc
-@@ -245,7 +245,7 @@ namespace Debug {
-     void DocumentData::init()
-     {
-         m_fontInfoIterator = 0;
--        m_backend = Document::SplashBackend;
-+        m_backend = Document::CairoBackend;
-         paperColor = Qt::white;
-         m_hints = 0;
-         m_optContentModel = 0;
--- 
-2.15.1
-
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
new file mode 100644
index 000000000000..ffa2db435be9
--- /dev/null
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -0,0 +1,25 @@
+From cced8f3763d151f3876689e8efee568c9404e1b0 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
+
+---
+ qt5/src/poppler-private.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt5/src/poppler-private.cc b/qt5/src/poppler-private.cc
+index e3a540ab..6fcccf29 100644
+--- a/qt5/src/poppler-private.cc
++++ b/qt5/src/poppler-private.cc
+@@ -243,7 +243,7 @@ namespace Debug {
+     
+     void DocumentData::init()
+     {
+-        m_backend = Document::SplashBackend;
++        m_backend = Document::CairoBackend;
+         paperColor = Qt::white;
+         m_hints = 0;
+         m_optContentModel = nullptr;
+-- 
+2.16.3
+
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index ba08f79e9a9a..31e95086b211 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,4 +1,4 @@
-From 2c81fe47d02e3bb2745f819d06db001b68b918df Mon Sep 17 00:00:00 2001
+From a5b9c280ba0870c8e61f7068b08f4b0353b1387e 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
@@ -74,7 +74,7 @@ index 78d24bb5..d482ceb5 100644
          g_timer_stop (timer);
  
 diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
-index a44edac6..9cb85271 100644
+index 6b511692..8f08307d 100644
 --- a/glib/poppler-page.cc
 +++ b/glib/poppler-page.cc
 @@ -2419,3 +2419,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage      *page,
@@ -104,7 +104,7 @@ index fdbfd38e..0f02a3af 100644
  /* A rectangle on a page, with coordinates in PDF points. */
  #define POPPLER_TYPE_RECTANGLE             (poppler_rectangle_get_type ())
 diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
-index a375e0af..5f23bba9 100644
+index 91deac46..aad28564 100644
 --- a/poppler/CairoFontEngine.cc
 +++ b/poppler/CairoFontEngine.cc
 @@ -132,7 +132,7 @@ CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
@@ -135,12 +135,12 @@ index a375e0af..5f23bba9 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 cc8a161b..91f4abea 100644
+index f0c4b040..cc26f431 100644
 --- a/poppler/CairoOutputDev.cc
 +++ b/poppler/CairoOutputDev.cc
-@@ -208,6 +208,13 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
+@@ -213,6 +213,13 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
    }
-   if (cairo != NULL) {
+   if (cairo != nullptr) {
      this->cairo = cairo_reference (cairo);
 +    {
 +      cairo_font_options_t *options = cairo_font_options_create ();
@@ -152,7 +152,7 @@ index cc8a161b..91f4abea 100644
  	/* save the initial matrix so that we can use it for type3 fonts. */
  	//XXX: is this sufficient? could we miss changes to the matrix somehow?
  	cairo_get_matrix(cairo, &orig_matrix);
-@@ -1435,6 +1442,7 @@ void CairoOutputDev::drawChar(GfxState *state, double x, double y,
+@@ -1440,6 +1447,7 @@ void CairoOutputDev::drawChar(GfxState *state, double x, double y,
  void CairoOutputDev::endString(GfxState *state)
  {
    int render;
@@ -160,7 +160,7 @@ index cc8a161b..91f4abea 100644
  
    if (!currentFont)
      return;
-@@ -1452,6 +1460,18 @@ void CairoOutputDev::endString(GfxState *state)
+@@ -1457,6 +1465,18 @@ void CairoOutputDev::endString(GfxState *state)
      goto finish;
    }
  
@@ -179,7 +179,7 @@ index cc8a161b..91f4abea 100644
    if (!(render & 1)) {
      LOG (printf ("fill string\n"));
      cairo_set_source (cairo, fill_pattern);
-@@ -1502,6 +1522,10 @@ void CairoOutputDev::endString(GfxState *state)
+@@ -1507,6 +1527,10 @@ void CairoOutputDev::endString(GfxState *state)
    }
  
  finish:
@@ -188,13 +188,13 @@ index cc8a161b..91f4abea 100644
 +      cairo_restore(cairo);
 +  }
    gfree (glyphs);
-   glyphs = NULL;
+   glyphs = nullptr;
    if (use_show_text_glyphs) {
 diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
-index 63346a4c..d051f383 100644
+index 4f6c33f8..22a59256 100644
 --- a/poppler/Gfx.cc
 +++ b/poppler/Gfx.cc
-@@ -4608,6 +4608,62 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
+@@ -4605,6 +4605,62 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
    error(errSyntaxError, getPos(), "Bad image parameters");
  }
  
@@ -258,10 +258,10 @@ index 63346a4c..d051f383 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 293f4551..5dff6fd3 100644
+index 8e2f66cc..62328f8c 100644
 --- a/poppler/Gfx.h
 +++ b/poppler/Gfx.h
-@@ -186,6 +186,9 @@ public:
+@@ -192,6 +192,9 @@ public:
    // Get the current graphics state object.
    GfxState *getState() { return state; }
  
@@ -272,11 +272,11 @@ index 293f4551..5dff6fd3 100644
  
    void drawForm(Object *str, Dict *resDict, double *matrix, double *bbox,
 diff --git a/poppler/Page.cc b/poppler/Page.cc
-index ca4a5a6d..b7acbf04 100644
+index d4799dd1..4a0e559e 100644
 --- a/poppler/Page.cc
 +++ b/poppler/Page.cc
 @@ -348,6 +348,20 @@ Dict *Page::getResourceDictCopy(XRef *xrefA) {
-   return dict ? dict->copy(xrefA) : NULL;
+   return dict ? dict->copy(xrefA) : nullptr;
  }
  
 +GBool Page::supportSubpixelRendering(OutputDev *out) {
@@ -297,10 +297,10 @@ index ca4a5a6d..b7acbf04 100644
    Object obj1;
    Dict *pageDict = pageObj.getDict()->copy(xrefA);
 diff --git a/poppler/Page.h b/poppler/Page.h
-index 97b70a0c..6786b40b 100644
+index 61570791..eb747c8d 100644
 --- a/poppler/Page.h
 +++ b/poppler/Page.h
-@@ -182,6 +182,9 @@ public:
+@@ -185,6 +185,9 @@ public:
    Object *getResourceDictObject();
    Dict *getResourceDictCopy(XRef *xrefA);
  
@@ -311,5 +311,5 @@ index 97b70a0c..6786b40b 100644
    Object getAnnotsObject(XRef *xrefA = nullptr) { return annotsObj.fetch(xrefA ? xrefA : xref); }
    // Add a new annotation to the page
 -- 
-2.15.1
+2.16.3
 
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index e08901ba2b58..a4cef0245072 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 b381d38c86a9adf572bd852d779c6e963888f313 Mon Sep 17 00:00:00 2001
+From a54cc3fc192f46a521086b9f8f76d8496ed7182f 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 f181fdec..dff4dc9f 100644
+index eecd41fb..c300e69f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -537,24 +537,6 @@ if(TIFF_FOUND)
+@@ -476,24 +476,6 @@ if(TIFF_FOUND)
    set(poppler_LIBS ${poppler_LIBS} ${TIFF_LIBRARIES})
  endif()
  
@@ -22,7 +22,7 @@ index f181fdec..dff4dc9f 100644
 -else()
 -add_library(poppler ${poppler_SRCS})
 -endif()
--set_target_properties(poppler PROPERTIES VERSION 72.0.0 SOVERSION 72)
+-set_target_properties(poppler PROPERTIES VERSION 74.0.0 SOVERSION 74)
 -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 f181fdec..dff4dc9f 100644
    install(FILES
      poppler/Annot.h
 -- 
-2.15.1
+2.16.3
 
diff --git a/0005-Don-t-build-the-main-poppler-library.patch b/0005-Don-t-build-the-main-poppler-library.patch
deleted file mode 100644
index 30f0f129a43c..000000000000
--- a/0005-Don-t-build-the-main-poppler-library.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 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 a79db356..7d1fe48e 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/PKGBUILD b/PKGBUILD
index edf216e000f2..ba284f29210d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,26 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=0.61.1
+pkgver=0.63.0
 pkgrel=1
 pkgdesc="Poppler Qt bindings, with patches to allow subpixel rendering via Cairo"
 license=('GPL')
 arch=(i686 x86_64)
-provides=("poppler-qt=${pkgver}" "poppler-qt4=${pkgver}")
-conflicts=('poppler-qt' 'poppler-qt4')
-depends=('qt4' 'cairo' "poppler>=${pkgver}")
+provides=("poppler-qt=${pkgver}" "poppler-qt5=${pkgver}")
+conflicts=('poppler-qt' 'poppler-qt4' 'poppler-qt5')
+depends=('qt5-base' 'cairo' "poppler>=${pkgver}")
 makedepends=('cmake' 'pkgconfig')
-url="https://github.com/giddie/poppler-qt4-cairo-backend"
+url="https://github.com/giddie/poppler-cairo-backend"
 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
+        0001-Cairo-backend-added-to-Qt5-wrapper.patch
+        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=('2d3dcea88d6a814317fac74d2a16c3cd'
-         '90d723430b0789645a2ed3b0321682db'
-         '70d9321df8089c6f91cc2c18995870ec'
-         'c62c09b41f8ef0d2d86a6fc3fa6b65b0'
-         '305bd77d5e3ea256959df12f22cb0bcd')
+md5sums=('66a54da4896b1408611699feda5c1821'
+         '45b1cb3f22736d743753b8f343d06087'
+         '4b41a9385811d24747820dec0b240045'
+         'fe0f21ce215ae3c92917c79b1c9c2cb4'
+         'd6913e1dd7449b271fa2fd296cfda457')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"
@@ -32,18 +32,18 @@ build() {
 
   mkdir -p build
   cd build
-  cmake -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
+  cmake -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DENABLE_CPP=OFF -DENABLE_UTILS=OFF \
         -DWITH_GLIB=OFF \
         ..
-  make poppler-qt4
+  make poppler-qt5
 }
 
 package() {
   cd "${srcdir}/poppler-${pkgver}/build"
 
-  make DESTDIR="${pkgdir}" -C qt4/src install
+  make DESTDIR="${pkgdir}" -C qt5/src install
   msg "Removing unwanted pkg-config files"
   mv "${pkgdir}"/usr/lib{64,}
   rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler{,-splash,-cairo}.pc