diff options
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | 0001-Cairo-backend-added-to-Qt5-wrapper.patch | 26 | ||||
-rw-r--r-- | 0002-Setting-default-Qt5-backend-to-Cairo.patch | 4 | ||||
-rw-r--r-- | 0003-Apply-subpixel-rendering-in-Cairo-Backend.patch | 20 | ||||
-rw-r--r-- | 0004-Don-t-build-the-main-poppler-library.patch | 10 | ||||
-rw-r--r-- | PKGBUILD | 12 |
6 files changed, 46 insertions, 46 deletions
@@ -1,6 +1,6 @@ pkgbase = poppler-qt-lcd pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo - pkgver = 0.87.0 + pkgver = 0.88.0 pkgrel = 1 url = https://github.com/giddie/poppler-cairo-backend arch = i686 @@ -10,22 +10,22 @@ pkgbase = poppler-qt-lcd makedepends = pkgconfig depends = qt5-base depends = cairo - depends = poppler>=0.87.0 - provides = poppler-qt=0.87.0 - provides = poppler-qt5=0.87.0 + depends = poppler>=0.88.0 + provides = poppler-qt=0.88.0 + provides = poppler-qt5=0.88.0 conflicts = poppler-qt conflicts = poppler-qt4 conflicts = poppler-qt5 - source = http://poppler.freedesktop.org/poppler-0.87.0.tar.xz + source = http://poppler.freedesktop.org/poppler-0.88.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 = fc1300ea104893f21926c7f1eb7a18ac - md5sums = 4241991eaa98811895b21a1c29e72441 - md5sums = 41c49943f81cd1f936a7a00ebfb3320e - md5sums = e8949a63c6c777efb3749ca28e4e5de4 - md5sums = 538f4fcc52873d7aac8186b6447cabca + md5sums = d9aafddce4c079c9ebc7405e42ac25ba + md5sums = 509c1fe07f26f42fdd99b0e458d6f27b + md5sums = 0eccec2fea8406c4b5a24a2c895e2685 + md5sums = 324828a54029ddcd040f602675a96a53 + md5sums = 68bb39cdc915e614267115054ec764cc 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 5fda69c56442..be0d58866e38 100644 --- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch +++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch @@ -1,4 +1,4 @@ -From 307aacb24bfaa333e4fd0703c4dfe2c396ca8c4c Mon Sep 17 00:00:00 2001 +From 42db0fc6f3eab00c3eb2ba1589a5ca8d792a2c56 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 @@ -12,7 +12,7 @@ Subject: [PATCH 1/4] 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 69715d53..ba880846 100644 +index e75b5730..23ec62e8 100644 --- a/qt5/src/CMakeLists.txt +++ b/qt5/src/CMakeLists.txt @@ -8,6 +8,11 @@ include_directories( @@ -39,7 +39,7 @@ index 69715d53..ba880846 100644 + ) +endif(HAVE_CAIRO) add_library(poppler-qt5 ${poppler_qt5_SRCS}) - set_target_properties(poppler-qt5 PROPERTIES VERSION 1.23.0 SOVERSION 1) + set_target_properties(poppler-qt5 PROPERTIES VERSION 1.24.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,10 +52,10 @@ index 69715d53..ba880846 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 e1b8d05b..3e7c0428 100644 +index cba9da39..89607ca5 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc -@@ -708,6 +708,9 @@ namespace Poppler { +@@ -709,6 +709,9 @@ namespace Poppler { ret << Document::SplashBackend; #endif ret << Document::ArthurBackend; @@ -66,7 +66,7 @@ index e1b8d05b..3e7c0428 100644 } diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc -index 30e03509..6b4c3c9e 100644 +index 35bec6c9..b19cd692 100644 --- a/qt5/src/poppler-page.cc +++ b/qt5/src/poppler-page.cc @@ -49,6 +49,7 @@ @@ -87,7 +87,7 @@ index 30e03509..6b4c3c9e 100644 #include "poppler-private.h" #include "poppler-page-transition-private.h" -@@ -610,6 +614,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w, +@@ -626,6 +630,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w, img = tmpimg; break; } @@ -158,8 +158,8 @@ index 30e03509..6b4c3c9e 100644 } if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload)) -@@ -632,6 +700,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i - QImageDumpingArthurOutputDev arthur_output(painter, nullptr); +@@ -651,6 +719,8 @@ 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); } + case Poppler::Document::CairoBackend: @@ -168,10 +168,10 @@ index 30e03509..6b4c3c9e 100644 return false; } diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h -index d32ffa3b..aa71aca9 100644 +index 665f98a4..1f1eb5de 100644 --- a/qt5/src/poppler-qt5.h +++ b/qt5/src/poppler-qt5.h -@@ -1152,7 +1152,8 @@ delete it; +@@ -1153,7 +1153,8 @@ delete it; */ enum RenderBackend { SplashBackend, ///< Splash backend @@ -182,7 +182,7 @@ index d32ffa3b..aa71aca9 100644 /** diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt -index 5abcbc45..99c12b9f 100644 +index b01d0835..561cb5dd 100644 --- a/qt5/tests/CMakeLists.txt +++ b/qt5/tests/CMakeLists.txt @@ -11,6 +11,11 @@ include_directories( @@ -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.26.0 +2.26.2 diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch index 4c31845fc7ff..08d1fe2dc50d 100644 --- a/0002-Setting-default-Qt5-backend-to-Cairo.patch +++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch @@ -1,4 +1,4 @@ -From 5d22881cb34ee520e3edef3011a759420e46a64c Mon Sep 17 00:00:00 2001 +From d409a937a8bd240c5e20b4dc8a96295fe01e6522 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 02fb96e6..8e3ed4a6 100644 m_hints = 0; m_optContentModel = nullptr; -- -2.26.0 +2.26.2 diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch index 7f5ccf428717..fc221619355f 100644 --- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch +++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch @@ -1,4 +1,4 @@ -From 408b1ebfee8614f999ecf85301bb6e67ec54226a Mon Sep 17 00:00:00 2001 +From 1fd8b739df535d27f6e1ea7f6b4ad6d528741496 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 @@ -74,10 +74,10 @@ index 78d24bb5..d482ceb5 100644 g_timer_stop (timer); diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc -index 322f2d48..9218e90d 100644 +index 7723af16..b08c0e5b 100644 --- a/glib/poppler-page.cc +++ b/glib/poppler-page.cc -@@ -2495,3 +2495,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage *page, +@@ -2565,3 +2565,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage *page, return g_list_reverse(attributes); } @@ -92,10 +92,10 @@ index 322f2d48..9218e90d 100644 + return page->page->supportSubpixelRendering(output_dev); +} diff --git a/glib/poppler-page.h b/glib/poppler-page.h -index f99f0920..8ff914f4 100644 +index 0ffc50c6..6fc75d92 100644 --- a/glib/poppler-page.h +++ b/glib/poppler-page.h -@@ -147,6 +147,7 @@ void poppler_page_free_text_attributes (GList *li +@@ -150,6 +150,7 @@ void poppler_page_free_text_attributes (GList *li POPPLER_PUBLIC GList * poppler_page_get_text_attributes_for_area (PopplerPage *page, PopplerRectangle *area); @@ -257,10 +257,10 @@ index e8ff605f..f615d789 100644 void drawForm(Object *str, Dict *resDict, const double *matrix, const double *bbox, diff --git a/poppler/Page.cc b/poppler/Page.cc -index 024fe3da..fb3b9459 100644 +index 670768ab..5b87fdc3 100644 --- a/poppler/Page.cc +++ b/poppler/Page.cc -@@ -337,6 +337,19 @@ Dict *Page::getResourceDictCopy(XRef *xrefA) { +@@ -341,6 +341,19 @@ Dict *Page::getResourceDictCopy(XRef *xrefA) { return dict ? dict->copy(xrefA) : nullptr; } @@ -281,10 +281,10 @@ index 024fe3da..fb3b9459 100644 Dict *pageDict = pageObj.getDict()->copy(xrefA); xref = xrefA; diff --git a/poppler/Page.h b/poppler/Page.h -index 3e4b341a..51f21928 100644 +index 2b19a089..57ead29c 100644 --- a/poppler/Page.h +++ b/poppler/Page.h -@@ -185,6 +185,9 @@ public: +@@ -187,6 +187,9 @@ public: Object *getResourceDictObject(); Dict *getResourceDictCopy(XRef *xrefA); @@ -295,5 +295,5 @@ index 3e4b341a..51f21928 100644 Object getAnnotsObject(XRef *xrefA = nullptr) { return annotsObj.fetch(xrefA ? xrefA : xref); } // Add a new annotation to the page -- -2.26.0 +2.26.2 diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch index ab20b4b5966d..1d4901163764 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 b1cb06e777e904bdebd09723ead710e1b6573f05 Mon Sep 17 00:00:00 2001 +From 83f742559e9aa85de9d57c92b653232c922d2394 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 28d46c4d..f888fe99 100644 +index 45d89346..7d92acb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -527,23 +527,6 @@ ADD_GPERF_FILE(TimesItalicWidths) +@@ -528,23 +528,6 @@ ADD_GPERF_FILE(TimesItalicWidths) ADD_GPERF_FILE(TimesRomanWidths) ADD_GPERF_FILE(ZapfDingbatsWidths) @@ -21,7 +21,7 @@ index 28d46c4d..f888fe99 100644 -else() -add_library(poppler ${poppler_SRCS}) -endif() --set_target_properties(poppler PROPERTIES VERSION 98.0.0 SOVERSION 98) +-set_target_properties(poppler PROPERTIES VERSION 99.0.0 SOVERSION 99) -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 28d46c4d..f888fe99 100644 install(FILES poppler/Annot.h -- -2.26.0 +2.26.2 @@ -2,7 +2,7 @@ # Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com> pkgname=poppler-qt-lcd -pkgver=0.87.0 +pkgver=0.88.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=('fc1300ea104893f21926c7f1eb7a18ac' - '4241991eaa98811895b21a1c29e72441' - '41c49943f81cd1f936a7a00ebfb3320e' - 'e8949a63c6c777efb3749ca28e4e5de4' - '538f4fcc52873d7aac8186b6447cabca') +md5sums=('d9aafddce4c079c9ebc7405e42ac25ba' + '509c1fe07f26f42fdd99b0e458d6f27b' + '0eccec2fea8406c4b5a24a2c895e2685' + '324828a54029ddcd040f602675a96a53' + '68bb39cdc915e614267115054ec764cc') build() { cd "${srcdir}/poppler-${pkgver}" |