diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0001-Cairo-backend-added-to-Qt5-wrapper.patch | 44 | ||||
| -rw-r--r-- | 0002-Setting-default-Qt5-backend-to-Cairo.patch | 4 | ||||
| -rw-r--r-- | 0003-Don-t-build-the-main-poppler-library.patch | 10 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
5 files changed, 43 insertions, 43 deletions
@@ -1,6 +1,6 @@ pkgbase = poppler-qt-lcd pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo - pkgver = 20.10.0 + pkgver = 20.12.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.10.0 - provides = poppler-qt=20.10.0 - provides = poppler-qt5=20.10.0 + depends = poppler>=20.12.0 + provides = poppler-qt=20.12.0 + provides = poppler-qt5=20.12.0 conflicts = poppler-qt conflicts = poppler-qt4 conflicts = poppler-qt5 - source = http://poppler.freedesktop.org/poppler-20.10.0.tar.xz + source = http://poppler.freedesktop.org/poppler-20.12.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 = 1103acc31277936a138613c97b38b82c - md5sums = 4c11afc9102fdd534f009c2b1bec44ec - md5sums = a73c8311c83992901a3f8aea25e9a41f - md5sums = 7470baf95dcb62c24a31f503469fe328 + md5sums = 813781b450e8ccd4f780b870ff389e53 + md5sums = 9ae7f1fd1296a9bfdf52d7d7c1707f55 + md5sums = c68df6fe48f020a6083ca12aa1fad2b9 + md5sums = 1e8d4e661838657483aa9d2e5a92fa99 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 ef2198c8a88f..f7870de9181e 100644 --- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch +++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch @@ -1,4 +1,4 @@ -From a7ca2281c8b85a842e5a9677dded792135ad121f Mon Sep 17 00:00:00 2001 +From 3ea09a476618ec9c2831449cb668463f47f09e55 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 0247fa3f..f52e4a3b 100644 +index 80f40fca..18059d7a 100644 --- a/qt5/src/CMakeLists.txt +++ b/qt5/src/CMakeLists.txt @@ -8,6 +8,11 @@ include_directories( @@ -28,7 +28,7 @@ index 0247fa3f..f52e4a3b 100644 set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) @@ -39,6 +44,13 @@ set(poppler_qt5_SRCS - ArthurOutputDev.cc + QPainterOutputDev.cc poppler-version.cpp ) +if (HAVE_CAIRO) @@ -39,7 +39,7 @@ index 0247fa3f..f52e4a3b 100644 + ) +endif(HAVE_CAIRO) add_library(poppler-qt5 ${poppler_qt5_SRCS}) - set_target_properties(poppler-qt5 PROPERTIES VERSION 1.25.0 SOVERSION 1) + set_target_properties(poppler-qt5 PROPERTIES VERSION 1.26.0 SOVERSION 1) if(MINGW AND BUILD_SHARED_LIBS) @@ -46,6 +58,9 @@ if(MINGW AND BUILD_SHARED_LIBS) set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") @@ -52,13 +52,13 @@ index 0247fa3f..f52e4a3b 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 6828da4d..37b11229 100644 +index 87aee4cf..ae76325e 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc -@@ -692,6 +692,9 @@ QSet<Document::RenderBackend> Document::availableRenderBackends() - ret << Document::SplashBackend; +@@ -694,6 +694,9 @@ QSet<Document::RenderBackend> Document::availableRenderBackends() #endif - ret << Document::ArthurBackend; + ret << Document::QPainterBackend; + ret << Document::ArthurBackend; // For backward compatibility +#if defined(HAVE_CAIRO) + ret << Document::CairoBackend; +#endif @@ -66,18 +66,18 @@ index 6828da4d..37b11229 100644 } diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc -index af7e4a11..992e6f00 100644 +index 31c60698..94389f9f 100644 --- a/qt5/src/poppler-page.cc +++ b/qt5/src/poppler-page.cc -@@ -50,6 +50,7 @@ - #include <QtGui/QPainter> +@@ -51,6 +51,7 @@ #include <config.h> + #include <poppler-config.h> +#include <math.h> #include <PDFDoc.h> #include <Catalog.h> #include <Form.h> -@@ -63,6 +64,9 @@ +@@ -64,6 +65,9 @@ # include <SplashOutputDev.h> # include <splash/SplashBitmap.h> #endif @@ -87,7 +87,7 @@ index af7e4a11..992e6f00 100644 #include "poppler-private.h" #include "poppler-page-transition-private.h" -@@ -556,6 +560,69 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w, +@@ -564,6 +568,69 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w, img = tmpimg; break; } @@ -157,9 +157,9 @@ index af7e4a11..992e6f00 100644 } if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload)) -@@ -579,6 +646,9 @@ bool Page::renderToPainter(QPainter *painter, double xres, double yres, int x, i +@@ -587,6 +654,9 @@ bool Page::renderToPainter(QPainter *painter, double xres, double yres, int x, i - return renderToArthur(&arthur_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags); + return renderToQPainter(&qpainter_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags); } + case Poppler::Document::CairoBackend: { + return false; @@ -168,21 +168,21 @@ index af7e4a11..992e6f00 100644 return false; } diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h -index 5e78c9e5..386b5562 100644 +index 6c167b65..f1672888 100644 --- a/qt5/src/poppler-qt5.h +++ b/qt5/src/poppler-qt5.h -@@ -1166,7 +1166,8 @@ public: - enum RenderBackend +@@ -1167,7 +1167,8 @@ public: { SplashBackend, ///< Splash backend -- ArthurBackend ///< Arthur (Qt) backend -+ ArthurBackend, ///< Arthur (Qt) backend + ArthurBackend, ///< \deprecated The old name of the QPainter backend +- QPainterBackend = ArthurBackend ///< @since 20.11 ++ QPainterBackend = ArthurBackend, ///< @since 20.11 + CairoBackend ///< Cairo backend }; /** diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt -index b01d0835..561cb5dd 100644 +index b8b5a399..caee9525 100644 --- a/qt5/tests/CMakeLists.txt +++ b/qt5/tests/CMakeLists.txt @@ -11,6 +11,11 @@ include_directories( @@ -198,5 +198,5 @@ index b01d0835..561cb5dd 100644 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}") -- -2.28.0 +2.29.2 diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch index 1e7ec3a64c72..dd24a7e23f6a 100644 --- a/0002-Setting-default-Qt5-backend-to-Cairo.patch +++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch @@ -1,4 +1,4 @@ -From 721498dca4f00f33b6ca9c404c8f1e871737bf45 Mon Sep 17 00:00:00 2001 +From c092ca4d9e63c71d578d25576d1de19c97e8dbc2 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.28.0 +2.29.2 diff --git a/0003-Don-t-build-the-main-poppler-library.patch b/0003-Don-t-build-the-main-poppler-library.patch index a3505ab63d57..4d5d6c828b3d 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 079b86ba750d68b9cf648babcaa2087033435866 Mon Sep 17 00:00:00 2001 +From f012312abb99f90b3ed5edf86b844764b9953d38 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,10 +8,10 @@ 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 2f035b8d..3105ebd5 100644 +index 307b26e8..8dedf6de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -541,23 +541,6 @@ ADD_GPERF_FILE(TimesItalicWidths) +@@ -562,23 +562,6 @@ ADD_GPERF_FILE(TimesItalicWidths) ADD_GPERF_FILE(TimesRomanWidths) ADD_GPERF_FILE(ZapfDingbatsWidths) @@ -21,7 +21,7 @@ index 2f035b8d..3105ebd5 100644 -else() -add_library(poppler ${poppler_SRCS}) -endif() --set_target_properties(poppler PROPERTIES VERSION 103.0.0 SOVERSION 103) +-set_target_properties(poppler PROPERTIES VERSION 105.0.0 SOVERSION 105) -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 2f035b8d..3105ebd5 100644 install(FILES poppler/Annot.h -- -2.28.0 +2.29.2 @@ -2,7 +2,7 @@ # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com> pkgname=poppler-qt-lcd -pkgver=20.10.0 +pkgver=20.12.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=('1103acc31277936a138613c97b38b82c' - '4c11afc9102fdd534f009c2b1bec44ec' - 'a73c8311c83992901a3f8aea25e9a41f' - '7470baf95dcb62c24a31f503469fe328') +md5sums=('813781b450e8ccd4f780b870ff389e53' + '9ae7f1fd1296a9bfdf52d7d7c1707f55' + 'c68df6fe48f020a6083ca12aa1fad2b9' + '1e8d4e661838657483aa9d2e5a92fa99') build() { cd "${srcdir}/poppler-${pkgver}" |