diff options
author | Paul Dann | 2022-05-10 13:45:24 +0100 |
---|---|---|
committer | Paul Dann | 2022-05-10 13:45:24 +0100 |
commit | 7e0aa34e85ac477ff5a18eb1c9ed5c0869c0d0e5 (patch) | |
tree | a0b7dcd04fce32efbb903c1a7ec60ac3c013a3cb | |
parent | 07d27db39451ef73843f34b62ed4935a330a5d63 (diff) | |
download | aur-7e0aa34e85ac477ff5a18eb1c9ed5c0869c0d0e5.tar.gz |
Update for Poppler 22.05.0
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | 0001-Cairo-backend-added-to-Qt5-wrapper.patch | 28 | ||||
-rw-r--r-- | 0002-Setting-default-Qt5-backend-to-Cairo.patch | 8 | ||||
-rw-r--r-- | PKGBUILD | 8 |
4 files changed, 30 insertions, 30 deletions
@@ -1,6 +1,6 @@ pkgbase = poppler-qt-lcd pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo - pkgver = 22.03.0 + pkgver = 22.05.0 pkgrel = 1 url = https://github.com/giddie/poppler-cairo-backend arch = i686 @@ -10,17 +10,17 @@ pkgbase = poppler-qt-lcd makedepends = pkgconfig depends = qt5-base depends = cairo - depends = poppler>=22.03.0 - provides = poppler-qt=22.03.0 - provides = poppler-qt5=22.03.0 + depends = poppler>=22.05.0 + provides = poppler-qt=22.05.0 + provides = poppler-qt5=22.05.0 conflicts = poppler-qt conflicts = poppler-qt4 conflicts = poppler-qt5 - source = http://poppler.freedesktop.org/poppler-22.03.0.tar.xz + source = http://poppler.freedesktop.org/poppler-22.05.0.tar.xz source = 0001-Cairo-backend-added-to-Qt5-wrapper.patch source = 0002-Setting-default-Qt5-backend-to-Cairo.patch - md5sums = 4056aa01aff289d54119bb506b8b75e7 - md5sums = 5196b9b25cbfbaa19b1df5acdb846732 - md5sums = 9a36b06ec601911c7102058829408c47 + md5sums = 43254145ef4cdd9c1dd508a1158f7c5c + md5sums = 8460facbf37c8f776c8d468c833839fe + md5sums = 7cda986c05bebc2e83f453c80e89b1a1 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 c2930a274d57..22971c516868 100644 --- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch +++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch @@ -1,4 +1,4 @@ -From ce29c8af8baf6b6e93c6836436ea20e1ee892899 Mon Sep 17 00:00:00 2001 +From e2e83d1872c64b788d33eea4e64b4c3a150fc6d8 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 55671715..acf8e6a6 100644 +index 638505e6..9fe2c1d4 100644 --- a/qt5/src/CMakeLists.txt +++ b/qt5/src/CMakeLists.txt @@ -5,6 +5,11 @@ include_directories( @@ -48,14 +48,14 @@ index 55671715..acf8e6a6 100644 +if (HAVE_CAIRO) + target_link_libraries(poppler-qt5 ${CAIRO_LIBRARIES}) +endif (HAVE_CAIRO) - if(MSVC) - target_link_libraries(poppler-qt5 poppler ${poppler_LIBS}) + if (ENABLE_NSS3) + target_include_directories(poppler-qt5 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) endif() diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc -index 6ee0a474..d409ba45 100644 +index 6daed698..09d7ac96 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc -@@ -701,6 +701,9 @@ QSet<Document::RenderBackend> Document::availableRenderBackends() +@@ -710,6 +710,9 @@ QSet<Document::RenderBackend> Document::availableRenderBackends() ret << Document::SplashBackend; ret << Document::QPainterBackend; ret << Document::ArthurBackend; // For backward compatibility @@ -66,10 +66,10 @@ index 6ee0a474..d409ba45 100644 } diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc -index eedc580f..1993927f 100644 +index b2cea93b..d28fdfa6 100644 --- a/qt5/src/poppler-page.cc +++ b/qt5/src/poppler-page.cc -@@ -54,6 +54,7 @@ +@@ -55,6 +55,7 @@ #include <config.h> #include <cfloat> #include <poppler-config.h> @@ -77,7 +77,7 @@ index eedc580f..1993927f 100644 #include <PDFDoc.h> #include <Catalog.h> #include <Form.h> -@@ -65,6 +66,9 @@ +@@ -66,6 +67,9 @@ #include <Rendition.h> #include <SplashOutputDev.h> #include <splash/SplashBitmap.h> @@ -87,7 +87,7 @@ index eedc580f..1993927f 100644 #include "poppler-private.h" #include "poppler-page-transition-private.h" -@@ -583,6 +587,69 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w, +@@ -596,6 +600,69 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w, img = tmpimg; break; } @@ -156,8 +156,8 @@ index eedc580f..1993927f 100644 + } } - if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload)) -@@ -606,6 +673,9 @@ bool Page::renderToPainter(QPainter *painter, double xres, double yres, int x, i + if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload)) { +@@ -621,6 +688,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,7 +182,7 @@ index abeb4fdb..380461a3 100644 /** diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt -index 8293a3a1..837c2331 100644 +index baadd428..4f2c1506 100644 --- a/qt5/tests/CMakeLists.txt +++ b/qt5/tests/CMakeLists.txt @@ -7,6 +7,11 @@ include_directories( @@ -198,5 +198,5 @@ index 8293a3a1..837c2331 100644 string(REPLACE "-" "" test_name ${exe}) set(${test_name}_SOURCES -- -2.35.1 +2.36.1 diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch index e36368c2e30a..690ae393521b 100644 --- a/0002-Setting-default-Qt5-backend-to-Cairo.patch +++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch @@ -1,4 +1,4 @@ -From d174b31d5e1695e88f97fd8df2ecfa85b0a0922b Mon Sep 17 00:00:00 2001 +From d3447060518f7569f43ff4501ae0310cd9eec9f2 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 @@ -8,10 +8,10 @@ Subject: [PATCH 2/3] Setting default Qt5 backend to Cairo 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5/src/poppler-private.cc b/qt5/src/poppler-private.cc -index db2fac73..91ab2d7a 100644 +index 228d8e8e..eb219a8e 100644 --- a/qt5/src/poppler-private.cc +++ b/qt5/src/poppler-private.cc -@@ -247,7 +247,7 @@ DocumentData::~DocumentData() +@@ -252,7 +252,7 @@ DocumentData::~DocumentData() void DocumentData::init() { @@ -21,5 +21,5 @@ index db2fac73..91ab2d7a 100644 m_hints = 0; m_optContentModel = nullptr; -- -2.35.1 +2.36.1 @@ -2,7 +2,7 @@ # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com> pkgname=poppler-qt-lcd -pkgver=22.03.0 +pkgver=22.05.0 pkgrel=1 pkgdesc="Poppler Qt bindings, with patches to allow subpixel rendering via Cairo" license=('GPL') @@ -15,9 +15,9 @@ 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) -md5sums=('4056aa01aff289d54119bb506b8b75e7' - '5196b9b25cbfbaa19b1df5acdb846732' - '9a36b06ec601911c7102058829408c47') +md5sums=('43254145ef4cdd9c1dd508a1158f7c5c' + '8460facbf37c8f776c8d468c833839fe' + '7cda986c05bebc2e83f453c80e89b1a1') build() { cd "${srcdir}/poppler-${pkgver}" |