diff options
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | 0001-Cairo-backend-added-to-Qt5-wrapper.patch | 6 | ||||
-rw-r--r-- | 0002-Setting-default-Qt5-backend-to-Cairo.patch | 4 | ||||
-rw-r--r-- | 0003-Apply-subpixel-rendering-in-Cairo-Backend.patch | 10 | ||||
-rw-r--r-- | 0004-Don-t-build-the-main-poppler-library.patch | 10 | ||||
-rw-r--r-- | PKGBUILD | 12 |
6 files changed, 32 insertions, 32 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Feb 18 12:53:50 UTC 2019 +# Tue Apr 2 15:12:07 UTC 2019 pkgbase = poppler-qt-lcd pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo - pkgver = 0.74.0 + pkgver = 0.75.0 pkgrel = 1 url = https://github.com/giddie/poppler-cairo-backend arch = i686 @@ -12,22 +12,22 @@ pkgbase = poppler-qt-lcd makedepends = pkgconfig depends = qt5-base depends = cairo - depends = poppler>=0.74.0 - provides = poppler-qt=0.74.0 - provides = poppler-qt5=0.74.0 + depends = poppler>=0.75.0 + provides = poppler-qt=0.75.0 + provides = poppler-qt5=0.75.0 conflicts = poppler-qt conflicts = poppler-qt4 conflicts = poppler-qt5 - source = http://poppler.freedesktop.org/poppler-0.74.0.tar.xz + source = http://poppler.freedesktop.org/poppler-0.75.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 = 1ce581bde2f23fa55bee13d8c61ac0df - md5sums = 61b4a63750f1f75a05f6d18f60aee313 - md5sums = 52870cfa3614b26fa3b1826414535ed2 - md5sums = cff4ae843a6a58c2076a57d6965ab1b1 - md5sums = 60cc41e01433beef90d4ee03a46a0b06 + md5sums = 3fb4ca803d989742695ca586c5cc489e + md5sums = 556fe5108ffed87382e188742e51d635 + md5sums = cf06662a9235b98735cab18b5616d105 + md5sums = 4b947349d303d4c73168c3272b094bb6 + md5sums = 1f4dbad4f37de180e7c82b181b38da69 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 96834f924ddc..c078a2df839c 100644 --- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch +++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch @@ -1,4 +1,4 @@ -From 1e2d2eede51ed070e58a7acde663fd06b6361eb3 Mon Sep 17 00:00:00 2001 +From 26f50358a11aef57a8bee3ba5e33a22699291f23 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/4] Cairo backend added to Qt5 wrapper @@ -52,7 +52,7 @@ index 340a3e43..86627bb9 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 0aa5bed4..8fbe9ddf 100644 +index c0def750..7a658c71 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc @@ -694,6 +694,9 @@ namespace Poppler { @@ -198,5 +198,5 @@ index 5abcbc45..99c12b9f 100644 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}") -- -2.20.1 +2.21.0 diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch index ac2b4167b1fa..5d540ecf0bd0 100644 --- a/0002-Setting-default-Qt5-backend-to-Cairo.patch +++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch @@ -1,4 +1,4 @@ -From fe836d9509d001c6d01d40b613a68772564759cd Mon Sep 17 00:00:00 2001 +From 7ce084163c9b22dab78d77e491539299d188671b 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 @@ -21,5 +21,5 @@ index 0c178a54..0306ae4d 100644 m_hints = 0; m_optContentModel = nullptr; -- -2.20.1 +2.21.0 diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch index 96d7d1eeb5fe..b2e7c6c27a5b 100644 --- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch +++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch @@ -1,4 +1,4 @@ -From 15b6154f7d637f961bc8e9d348605df79a490641 Mon Sep 17 00:00:00 2001 +From 9d3df285e6f1b833b637c12c8b059f3b82bab217 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 @@ -191,10 +191,10 @@ index d2769a22..f1bb39fc 100644 glyphs = nullptr; if (use_show_text_glyphs) { diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc -index 8dc2dc93..c3f2355c 100644 +index 9244b044..e459a13f 100644 --- a/poppler/Gfx.cc +++ b/poppler/Gfx.cc -@@ -4607,6 +4607,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) { +@@ -4605,6 +4605,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) { error(errSyntaxError, getPos(), "Bad image parameters"); } @@ -257,7 +257,7 @@ index 47ae0153..9df0d18d 100644 void drawForm(Object *str, Dict *resDict, const double *matrix, const double *bbox, diff --git a/poppler/Page.cc b/poppler/Page.cc -index 9aa25dfc..285874d0 100644 +index 2cb75146..cd42b656 100644 --- a/poppler/Page.cc +++ b/poppler/Page.cc @@ -336,6 +336,19 @@ Dict *Page::getResourceDictCopy(XRef *xrefA) { @@ -295,5 +295,5 @@ index 01f056f9..d6547a79 100644 Object getAnnotsObject(XRef *xrefA = nullptr) { return annotsObj.fetch(xrefA ? xrefA : xref); } // Add a new annotation to the page -- -2.20.1 +2.21.0 diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch index 4197d293cee5..25c25c09f202 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 b54dc4769396eafd03b3c975dbe1a745ebb12b9a Mon Sep 17 00:00:00 2001 +From 19661939fe1d03ac29ac3db43aa7fd04d29adc0c 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, 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6d49721c..a81aa29b 100644 +index e3b8e8d9..d9632ebb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -483,23 +483,6 @@ if(TIFF_FOUND) +@@ -485,23 +485,6 @@ if(TIFF_FOUND) set(poppler_LIBS ${poppler_LIBS} ${TIFF_LIBRARIES}) endif() @@ -21,7 +21,7 @@ index 6d49721c..a81aa29b 100644 -else() -add_library(poppler ${poppler_SRCS}) -endif() --set_target_properties(poppler PROPERTIES VERSION 85.0.0 SOVERSION 85) +-set_target_properties(poppler PROPERTIES VERSION 86.0.0 SOVERSION 86) -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 6d49721c..a81aa29b 100644 install(FILES poppler/Annot.h -- -2.20.1 +2.21.0 @@ -2,7 +2,7 @@ # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com> pkgname=poppler-qt-lcd -pkgver=0.74.0 +pkgver=0.75.0 pkgrel=1 pkgdesc="Poppler Qt bindings, with patches to allow subpixel rendering via Cairo" license=('GPL') @@ -17,11 +17,11 @@ source=(http://poppler.freedesktop.org/poppler-${pkgver}.tar.xz 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=('1ce581bde2f23fa55bee13d8c61ac0df' - '61b4a63750f1f75a05f6d18f60aee313' - '52870cfa3614b26fa3b1826414535ed2' - 'cff4ae843a6a58c2076a57d6965ab1b1' - '60cc41e01433beef90d4ee03a46a0b06') +md5sums=('3fb4ca803d989742695ca586c5cc489e' + '556fe5108ffed87382e188742e51d635' + 'cf06662a9235b98735cab18b5616d105' + '4b947349d303d4c73168c3272b094bb6' + '1f4dbad4f37de180e7c82b181b38da69') build() { cd "${srcdir}/poppler-${pkgver}" |