Update for Poppler 21.04.0

5 files changed, 27 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 996a57f6c668..c777261fe761 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = poppler-qt-lcd
 	pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
-	pkgver = 21.03.0
+	pkgver = 21.04.0
 	pkgrel = 1
 	url = https://github.com/giddie/poppler-cairo-backend
 	arch = i686
@@ -10,20 +10,18 @@ pkgbase = poppler-qt-lcd
 	makedepends = pkgconfig
 	depends = qt5-base
 	depends = cairo
-	depends = poppler>=21.03.0
-	provides = poppler-qt=21.03.0
-	provides = poppler-qt5=21.03.0
+	depends = poppler>=21.04.0
+	provides = poppler-qt=21.04.0
+	provides = poppler-qt5=21.04.0
 	conflicts = poppler-qt
 	conflicts = poppler-qt4
 	conflicts = poppler-qt5
-	source = http://poppler.freedesktop.org/poppler-21.03.0.tar.xz
+	source = http://poppler.freedesktop.org/poppler-21.04.0.tar.xz
 	source = 0001-Cairo-backend-added-to-Qt5-wrapper.patch
 	source = 0002-Setting-default-Qt5-backend-to-Cairo.patch
-	source = 0003-Don-t-build-the-main-poppler-library.patch
-	md5sums = 641a9f382c4166d5728f1f28f163de58
-	md5sums = 473e1701243f8fac73254a3cd11a23f3
-	md5sums = a549463ba596153c3ed0c76c6eadb685
-	md5sums = fa75be619964205d0f7ffc8cc1b475c1
+	md5sums = c3a76a9ef4625f54718136699c74c9b1
+	md5sums = 6821f4c93ccfa3351450bb8f76b0279d
+	md5sums = 1576c9a81cb4b67caa824f25ccd043c7
 
 pkgname = poppler-qt-lcd
 
diff --git a/0001-Cairo-backend-added-to-Qt5-wrapper.patch b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
index 971d0c33a129..b904d2bd77fc 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From 8c61ead91cca890bd6307428902e28f27dcdabd1 Mon Sep 17 00:00:00 2001
+From e18f0ac0345448e99c9feb10eee62ea03162e6f3 Mon Sep 17 00:00:00 2001
 From: Paul Gideon Dann <pdgiddie@gmail.com>
 Date: Wed, 4 Apr 2018 16:36:56 +0100
 Subject: [PATCH 1/3] Cairo backend added to Qt5 wrapper
@@ -12,7 +12,7 @@ Subject: [PATCH 1/3] Cairo backend added to Qt5 wrapper
  5 files changed, 95 insertions(+), 1 deletion(-)
 
 diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
-index afacd2c3..4c9ee018 100644
+index 1212bb84..3b3db15a 100644
 --- a/qt5/src/CMakeLists.txt
 +++ b/qt5/src/CMakeLists.txt
 @@ -5,6 +5,11 @@ include_directories(
@@ -39,9 +39,9 @@ index afacd2c3..4c9ee018 100644
 +  )
 +endif(HAVE_CAIRO)
  add_library(poppler-qt5 ${poppler_qt5_SRCS})
+ generate_export_header(poppler-qt5 BASE_NAME poppler-qt5 EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
  set_target_properties(poppler-qt5 PROPERTIES VERSION 1.27.0 SOVERSION 1)
- if(MINGW AND BUILD_SHARED_LIBS)
-@@ -43,6 +55,9 @@ if(MINGW AND BUILD_SHARED_LIBS)
+@@ -44,6 +56,9 @@ if(MINGW AND BUILD_SHARED_LIBS)
      set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
  endif()
  target_link_libraries(poppler-qt5 poppler Qt5::Core Qt5::Gui Qt5::Xml ${FREETYPE_LIBRARIES})
@@ -52,7 +52,7 @@ index afacd2c3..4c9ee018 100644
  target_link_libraries(poppler-qt5 poppler ${poppler_LIBS})
  endif()
 diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc
-index 0a2a6ce4..a6d02fa1 100644
+index 762eba9f..64e75a3b 100644
 --- a/qt5/src/poppler-document.cc
 +++ b/qt5/src/poppler-document.cc
 @@ -696,6 +696,9 @@ QSet<Document::RenderBackend> Document::availableRenderBackends()
@@ -66,7 +66,7 @@ index 0a2a6ce4..a6d02fa1 100644
  }
  
 diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
-index 31c60698..94389f9f 100644
+index c433ada4..c2163a23 100644
 --- a/qt5/src/poppler-page.cc
 +++ b/qt5/src/poppler-page.cc
 @@ -51,6 +51,7 @@
@@ -87,7 +87,7 @@ index 31c60698..94389f9f 100644
  
  #include "poppler-private.h"
  #include "poppler-page-transition-private.h"
-@@ -564,6 +568,69 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
+@@ -568,6 +572,69 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
          img = tmpimg;
          break;
      }
@@ -157,7 +157,7 @@ index 31c60698..94389f9f 100644
      }
  
      if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload))
-@@ -587,6 +654,9 @@ bool Page::renderToPainter(QPainter *painter, double xres, double yres, int x, i
+@@ -591,6 +658,9 @@ bool Page::renderToPainter(QPainter *painter, double xres, double yres, int x, i
  
          return renderToQPainter(&qpainter_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags);
      }
@@ -182,11 +182,11 @@ index 2d879f78..cc228b0f 100644
  
      /**
 diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt
-index 82ef2139..56860c32 100644
+index c3decb92..95d7f325 100644
 --- a/qt5/tests/CMakeLists.txt
 +++ b/qt5/tests/CMakeLists.txt
-@@ -6,6 +6,11 @@ include_directories(
-   ${CMAKE_CURRENT_BINARY_DIR}
+@@ -7,6 +7,11 @@ include_directories(
+   ${CMAKE_CURRENT_BINARY_DIR}/../src
  )
  
 +if (HAVE_CAIRO)
@@ -198,5 +198,5 @@ index 82ef2139..56860c32 100644
    string(REPLACE "-" "" test_name ${exe})
    set(${test_name}_SOURCES
 -- 
-2.30.1
+2.31.1
 
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index 83e90509ab13..2f3704135206 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From 91724ec9f6fa160f4142024f98d48b04f74e086e Mon Sep 17 00:00:00 2001
+From 543873cd35289b479598715f604c7a9b5f3e8f90 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/3] Setting default Qt5 backend to Cairo
@@ -21,5 +21,5 @@ index 5b30f19c..197f778b 100644
      m_hints = 0;
      m_optContentModel = nullptr;
 -- 
-2.30.1
+2.31.1
 
diff --git a/0003-Don-t-build-the-main-poppler-library.patch b/0003-Don-t-build-the-main-poppler-library.patch
deleted file mode 100644
index a735d667715f..000000000000
--- a/0003-Don-t-build-the-main-poppler-library.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4e491dd9d5556b221ccc1c05e650c0d1024e5ff0 Mon Sep 17 00:00:00 2001
-From: Paul Gideon Dann <pdgiddie@gmail.com>
-Date: Tue, 1 Sep 2020 12:22:28 +0100
-Subject: [PATCH 3/3] Don't build the main poppler library.
-
----
- CMakeLists.txt | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 949f2353..e63d2f7f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -564,23 +564,6 @@ ADD_GPERF_FILE(TimesItalicWidths)
- ADD_GPERF_FILE(TimesRomanWidths)
- ADD_GPERF_FILE(ZapfDingbatsWidths)
- 
--if(MSVC)
--add_definitions(-D_CRT_SECURE_NO_WARNINGS)
--add_library(poppler STATIC ${poppler_SRCS})
--else()
--add_library(poppler ${poppler_SRCS})
--endif()
--set_target_properties(poppler PROPERTIES VERSION 108.0.0 SOVERSION 108)
--if(MINGW AND BUILD_SHARED_LIBS)
--    get_target_property(POPPLER_SOVERSION poppler SOVERSION)
--    set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
--endif()
--target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
--if(CMAKE_USE_PTHREADS_INIT)
--   target_link_libraries(poppler LINK_PRIVATE Threads::Threads)
--endif()
--install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--
- if(ENABLE_UNSTABLE_API_ABI_HEADERS)
-   install(FILES
-     poppler/Annot.h
--- 
-2.30.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 6e1c1ead5ed5..ca415d9aff4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
 
 pkgname=poppler-qt-lcd
-pkgver=21.03.0
+pkgver=21.04.0
 pkgrel=1
 pkgdesc="Poppler Qt bindings, with patches to allow subpixel rendering via Cairo"
 license=('GPL')
@@ -14,12 +14,10 @@ makedepends=('cmake' 'pkgconfig')
 url="https://github.com/giddie/poppler-cairo-backend"
 source=(http://poppler.freedesktop.org/poppler-${pkgver}.tar.xz
         0001-Cairo-backend-added-to-Qt5-wrapper.patch
-        0002-Setting-default-Qt5-backend-to-Cairo.patch
-        0003-Don-t-build-the-main-poppler-library.patch)
-md5sums=('641a9f382c4166d5728f1f28f163de58'
-         '473e1701243f8fac73254a3cd11a23f3'
-         'a549463ba596153c3ed0c76c6eadb685'
-         'fa75be619964205d0f7ffc8cc1b475c1')
+        0002-Setting-default-Qt5-backend-to-Cairo.patch)
+md5sums=('c3a76a9ef4625f54718136699c74c9b1'
+         '6821f4c93ccfa3351450bb8f76b0279d'
+         '1576c9a81cb4b67caa824f25ccd043c7')
 
 build() {
   cd "${srcdir}/poppler-${pkgver}"