summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--0001-Cairo-backend-added-to-Qt5-wrapper.patch14
-rw-r--r--0002-Setting-default-Qt5-backend-to-Cairo.patch4
-rw-r--r--0003-Apply-subpixel-rendering-in-Cairo-Backend.patch24
-rw-r--r--0004-Don-t-build-the-main-poppler-library.patch10
-rw-r--r--PKGBUILD12
6 files changed, 42 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dd3fbe332c2a..b8b2e60e18ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = poppler-qt-lcd
pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
- pkgver = 0.80.0
+ pkgver = 0.82.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.80.0
- provides = poppler-qt=0.80.0
- provides = poppler-qt5=0.80.0
+ depends = poppler>=0.82.0
+ provides = poppler-qt=0.82.0
+ provides = poppler-qt5=0.82.0
conflicts = poppler-qt
conflicts = poppler-qt4
conflicts = poppler-qt5
- source = http://poppler.freedesktop.org/poppler-0.80.0.tar.xz
+ source = http://poppler.freedesktop.org/poppler-0.82.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 = 8ff9964d1fcc9c334a9c66f6f426ab9c
- md5sums = 6d99057082cc672d29d413d8816f1f20
- md5sums = e84c03ba6bb037d8a33da0f731269435
- md5sums = 90104a3a258e81a2a5b2693f7f78f608
- md5sums = aff14dc9f508062150b6bcfdbec540f9
+ md5sums = 4d6106c2382c5e66072e0b355acc3640
+ md5sums = f31f432315c9312754df0f609178d947
+ md5sums = 5e2a29257eea07ff3372e28e89679433
+ md5sums = 9bdd2b300287685a00f6b4ec63f345ed
+ md5sums = 8ed4526a04b880acd370ca198f5df559
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 2ebecbd80732..9634d3f2ce5a 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From ca21442edf7ec79c8662f6cfadc2fb8b882a9092 Mon Sep 17 00:00:00 2001
+From 3a7e0da0618def03a1913ceb0b1f4543f2ea32ef 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 ca1f2478..af19e065 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 81db4eaf..635e44f9 100644
+index ba9b86cd..d4336d3f 100644
--- a/qt5/src/poppler-document.cc
+++ b/qt5/src/poppler-document.cc
@@ -695,6 +695,9 @@ namespace Poppler {
@@ -66,7 +66,7 @@ index 81db4eaf..635e44f9 100644
}
diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
-index c4d00a6b..92aa0e8a 100644
+index 69006754..8b31ec60 100644
--- a/qt5/src/poppler-page.cc
+++ b/qt5/src/poppler-page.cc
@@ -48,6 +48,7 @@
@@ -87,7 +87,7 @@ index c4d00a6b..92aa0e8a 100644
#include "poppler-private.h"
#include "poppler-page-transition-private.h"
-@@ -622,6 +626,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
+@@ -616,6 +620,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
img = tmpimg;
break;
}
@@ -158,7 +158,7 @@ index c4d00a6b..92aa0e8a 100644
}
if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload))
-@@ -644,6 +712,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
+@@ -638,6 +706,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
QImageDumpingArthurOutputDev arthur_output(painter, nullptr);
return renderToArthur(&arthur_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags);
}
@@ -168,7 +168,7 @@ index c4d00a6b..92aa0e8a 100644
return false;
}
diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h
-index 847671ea..117efa1e 100644
+index 1460690f..96f1b986 100644
--- a/qt5/src/poppler-qt5.h
+++ b/qt5/src/poppler-qt5.h
@@ -1151,7 +1151,8 @@ delete it;
@@ -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.23.0
+2.24.0
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index 3f270cd1c64f..23069a10a73f 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From 362e11628acf1021a3d36b0ecb8d711776dcdb50 Mon Sep 17 00:00:00 2001
+From c82ac5c7d6c1009afbe00a0a62e051e39f40730e 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 6553eb08..93a4e0a2 100644
m_hints = 0;
m_optContentModel = nullptr;
--
-2.23.0
+2.24.0
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index f3bad83b62f7..a7bb1a72ce5e 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,4 +1,4 @@
-From 40e1b18877127d29970a19c95932ec60a3974e66 Mon Sep 17 00:00:00 2001
+From 525a5ce46ce45f3125b2b9e502e7ac680f2672d7 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
@@ -104,7 +104,7 @@ index f99f0920..8ff914f4 100644
/* A rectangle on a page, with coordinates in PDF points. */
#define POPPLER_TYPE_RECTANGLE (poppler_rectangle_get_type ())
diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
-index bf6bd88d..d9e42304 100644
+index bcfa0954..aa05fe12 100644
--- a/poppler/CairoFontEngine.cc
+++ b/poppler/CairoFontEngine.cc
@@ -124,7 +124,7 @@ CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
@@ -135,10 +135,10 @@ index bf6bd88d..d9e42304 100644
if (cairo_font_face_set_user_data (l->font_face,
&_ft_cairo_key,
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
-index 68927636..c21229a7 100644
+index cbfd0bdd..b10b7e32 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
-@@ -205,6 +205,13 @@ void CairoOutputDev::setCairo(cairo_t *c)
+@@ -206,6 +206,13 @@ void CairoOutputDev::setCairo(cairo_t *c)
}
if (c != nullptr) {
cairo = cairo_reference (c);
@@ -152,7 +152,7 @@ index 68927636..c21229a7 100644
/* save the initial matrix so that we can use it for type3 fonts. */
//XXX: is this sufficient? could we miss changes to the matrix somehow?
cairo_get_matrix(cairo, &orig_matrix);
-@@ -1431,6 +1438,7 @@ void CairoOutputDev::drawChar(GfxState *state, double x, double y,
+@@ -1432,6 +1439,7 @@ void CairoOutputDev::drawChar(GfxState *state, double x, double y,
void CairoOutputDev::endString(GfxState *state)
{
int render;
@@ -160,7 +160,7 @@ index 68927636..c21229a7 100644
if (!currentFont)
return;
-@@ -1448,6 +1456,18 @@ void CairoOutputDev::endString(GfxState *state)
+@@ -1449,6 +1457,18 @@ void CairoOutputDev::endString(GfxState *state)
goto finish;
}
@@ -179,7 +179,7 @@ index 68927636..c21229a7 100644
if (!(render & 1)) {
LOG (printf ("fill string\n"));
cairo_set_source (cairo, fill_pattern);
-@@ -1498,6 +1518,10 @@ void CairoOutputDev::endString(GfxState *state)
+@@ -1499,6 +1519,10 @@ void CairoOutputDev::endString(GfxState *state)
}
finish:
@@ -191,10 +191,10 @@ index 68927636..c21229a7 100644
glyphs = nullptr;
if (use_show_text_glyphs) {
diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
-index 47627ad3..d48a4b0c 100644
+index ec2b4b35..8fecd682 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
-@@ -4603,6 +4603,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) {
+@@ -4604,6 +4604,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) {
error(errSyntaxError, getPos(), "Bad image parameters");
}
@@ -243,10 +243,10 @@ index 47627ad3..d48a4b0c 100644
// check the effect of compositing objects as a group:
// look for ExtGState entries with ca != 1 or CA != 1 or BM != normal
diff --git a/poppler/Gfx.h b/poppler/Gfx.h
-index 19462e8d..b0bbd11c 100644
+index e8ff605f..f615d789 100644
--- a/poppler/Gfx.h
+++ b/poppler/Gfx.h
-@@ -192,6 +192,9 @@ public:
+@@ -193,6 +193,9 @@ public:
// Get the current graphics state object.
GfxState *getState() { return state; }
@@ -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.23.0
+2.24.0
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index 1c3c6796069c..e1d15c102cbb 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 1b86415f274e5ec45c226e35d170febfb237c471 Mon Sep 17 00:00:00 2001
+From 28de47991ea5bfe6516d2d746672df0ef272bf92 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 4ec53d92..9fb6be7c 100644
+index 36f65874..546d281d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -492,23 +492,6 @@ if(TIFF_FOUND)
+@@ -491,23 +491,6 @@ if(TIFF_FOUND)
set(poppler_LIBS ${poppler_LIBS} ${TIFF_LIBRARIES})
endif()
@@ -21,7 +21,7 @@ index 4ec53d92..9fb6be7c 100644
-else()
-add_library(poppler ${poppler_SRCS})
-endif()
--set_target_properties(poppler PROPERTIES VERSION 90.0.0 SOVERSION 90)
+-set_target_properties(poppler PROPERTIES VERSION 92.0.0 SOVERSION 92)
-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 4ec53d92..9fb6be7c 100644
install(FILES
poppler/Annot.h
--
-2.23.0
+2.24.0
diff --git a/PKGBUILD b/PKGBUILD
index 0e1cc3681ed7..31156d37a3f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
pkgname=poppler-qt-lcd
-pkgver=0.80.0
+pkgver=0.82.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=('8ff9964d1fcc9c334a9c66f6f426ab9c'
- '6d99057082cc672d29d413d8816f1f20'
- 'e84c03ba6bb037d8a33da0f731269435'
- '90104a3a258e81a2a5b2693f7f78f608'
- 'aff14dc9f508062150b6bcfdbec540f9')
+md5sums=('4d6106c2382c5e66072e0b355acc3640'
+ 'f31f432315c9312754df0f609178d947'
+ '5e2a29257eea07ff3372e28e89679433'
+ '9bdd2b300287685a00f6b4ec63f345ed'
+ '8ed4526a04b880acd370ca198f5df559')
build() {
cd "${srcdir}/poppler-${pkgver}"