diff options
author | Paul Dann | 2021-01-11 11:53:22 +0000 |
---|---|---|
committer | Paul Dann | 2021-01-11 11:53:22 +0000 |
commit | 8257ef1304ec603db19e12eab32b1d2674e0af5f (patch) | |
tree | 44f013766376eaceb05ed8632daeda0845f8b269 | |
parent | ef24c7e511be8a3ba404c33e808ccd86eb4a4c3a (diff) | |
download | aur-8257ef1304ec603db19e12eab32b1d2674e0af5f.tar.gz |
Update for Poppler 21.01.0
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | 0001-Cairo-backend-added-to-Qt5-wrapper.patch | 16 | ||||
-rw-r--r-- | 0002-Setting-default-Qt5-backend-to-Cairo.patch | 4 | ||||
-rw-r--r-- | 0003-Don-t-build-the-main-poppler-library.patch | 8 | ||||
-rw-r--r-- | PKGBUILD | 10 |
5 files changed, 28 insertions, 28 deletions
@@ -1,6 +1,6 @@ pkgbase = poppler-qt-lcd pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo - pkgver = 20.12.1 + pkgver = 21.01.0 pkgrel = 1 url = https://github.com/giddie/poppler-cairo-backend arch = i686 @@ -10,20 +10,20 @@ pkgbase = poppler-qt-lcd makedepends = pkgconfig depends = qt5-base depends = cairo - depends = poppler>=20.12.1 - provides = poppler-qt=20.12.1 - provides = poppler-qt5=20.12.1 + depends = poppler>=21.01.0 + provides = poppler-qt=21.01.0 + provides = poppler-qt5=21.01.0 conflicts = poppler-qt conflicts = poppler-qt4 conflicts = poppler-qt5 - source = http://poppler.freedesktop.org/poppler-20.12.1.tar.xz + source = http://poppler.freedesktop.org/poppler-21.01.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 = eb4a8465b03ec58cc6a3277aa7d4fa7b - md5sums = dc21c162a7b880c4a1a161748f9c58aa - md5sums = 29834aaa465ca60f3e9124bab54cbc83 - md5sums = 48e401fdef4c0798c6ae3cffe0e1be1e + md5sums = 948111e6caff71c92b7813a094792f88 + md5sums = fb9d21fae486c2f22cfdde87959d1af9 + md5sums = 31156be0cf60d0067065dbd799ac4641 + md5sums = 91d1909c3110c968ce762547689a6846 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 cc44d2786a24..e63f51776397 100644 --- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch +++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch @@ -1,4 +1,4 @@ -From c9507c38913711b9497b5db03df6ed0eb6627f2f Mon Sep 17 00:00:00 2001 +From 7b9eee38a13275003656b0a625d27786ddc45822 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 ae055a12..8cc1f540 100644 +index afacd2c3..4c9ee018 100644 --- a/qt5/src/CMakeLists.txt +++ b/qt5/src/CMakeLists.txt @@ -5,6 +5,11 @@ include_directories( @@ -39,7 +39,7 @@ index ae055a12..8cc1f540 100644 + ) +endif(HAVE_CAIRO) add_library(poppler-qt5 ${poppler_qt5_SRCS}) - set_target_properties(poppler-qt5 PROPERTIES VERSION 1.26.0 SOVERSION 1) + 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) set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") @@ -52,10 +52,10 @@ index ae055a12..8cc1f540 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 87aee4cf..ae76325e 100644 +index 0a2a6ce4..a6d02fa1 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc -@@ -694,6 +694,9 @@ QSet<Document::RenderBackend> Document::availableRenderBackends() +@@ -696,6 +696,9 @@ QSet<Document::RenderBackend> Document::availableRenderBackends() #endif ret << Document::QPainterBackend; ret << Document::ArthurBackend; // For backward compatibility @@ -168,10 +168,10 @@ index 31c60698..94389f9f 100644 return false; } diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h -index 6c167b65..f1672888 100644 +index f1b64a9e..5828e12d 100644 --- a/qt5/src/poppler-qt5.h +++ b/qt5/src/poppler-qt5.h -@@ -1167,7 +1167,8 @@ public: +@@ -1170,7 +1170,8 @@ public: { SplashBackend, ///< Splash backend ArthurBackend, ///< \deprecated The old name of the QPainter backend @@ -198,5 +198,5 @@ index 82ef2139..56860c32 100644 string(REPLACE "-" "" test_name ${exe}) set(${test_name}_SOURCES -- -2.29.2 +2.30.0 diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch index a0642dfa4544..8e9900627e2b 100644 --- a/0002-Setting-default-Qt5-backend-to-Cairo.patch +++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch @@ -1,4 +1,4 @@ -From 672b770c6ac7fd886e49a528c5d3aff1e99e42d7 Mon Sep 17 00:00:00 2001 +From a00e3989df009cbc88ade4ba5eb551862482486b 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.29.2 +2.30.0 diff --git a/0003-Don-t-build-the-main-poppler-library.patch b/0003-Don-t-build-the-main-poppler-library.patch index b38b8b0b62b6..ba430fb4af09 100644 --- a/0003-Don-t-build-the-main-poppler-library.patch +++ b/0003-Don-t-build-the-main-poppler-library.patch @@ -1,4 +1,4 @@ -From 08758cddd4d5749f2715534b28108420cb167b74 Mon Sep 17 00:00:00 2001 +From f6e09895b65ce46cec39c88c0b057735c7ea17ee 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. @@ -8,7 +8,7 @@ Subject: [PATCH 3/3] Don't build the main poppler library. 1 file changed, 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1573249a..67bd471d 100644 +index cf88eef1..91f9c5e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -564,23 +564,6 @@ ADD_GPERF_FILE(TimesItalicWidths) @@ -21,7 +21,7 @@ index 1573249a..67bd471d 100644 -else() -add_library(poppler ${poppler_SRCS}) -endif() --set_target_properties(poppler PROPERTIES VERSION 105.0.0 SOVERSION 105) +-set_target_properties(poppler PROPERTIES VERSION 106.0.0 SOVERSION 106) -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}") @@ -36,5 +36,5 @@ index 1573249a..67bd471d 100644 install(FILES poppler/Annot.h -- -2.29.2 +2.30.0 @@ -2,7 +2,7 @@ # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com> pkgname=poppler-qt-lcd -pkgver=20.12.1 +pkgver=21.01.0 pkgrel=1 pkgdesc="Poppler Qt bindings, with patches to allow subpixel rendering via Cairo" license=('GPL') @@ -16,10 +16,10 @@ 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=('eb4a8465b03ec58cc6a3277aa7d4fa7b' - 'dc21c162a7b880c4a1a161748f9c58aa' - '29834aaa465ca60f3e9124bab54cbc83' - '48e401fdef4c0798c6ae3cffe0e1be1e') +md5sums=('948111e6caff71c92b7813a094792f88' + 'fb9d21fae486c2f22cfdde87959d1af9' + '31156be0cf60d0067065dbd799ac4641' + '91d1909c3110c968ce762547689a6846') build() { cd "${srcdir}/poppler-${pkgver}" |