summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO22
-rw-r--r--0001-Cairo-backend-added-to-Qt5-wrapper.patch10
-rw-r--r--0002-Setting-default-Qt5-backend-to-Cairo.patch4
-rw-r--r--0003-Apply-subpixel-rendering-in-Cairo-Backend.patch22
-rw-r--r--0004-Don-t-build-the-main-poppler-library.patch8
-rw-r--r--PKGBUILD12
6 files changed, 38 insertions, 40 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8d4452724761..9246425694ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon May 13 12:25:59 UTC 2019
pkgbase = poppler-qt-lcd
pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
- pkgver = 0.76.1
+ pkgver = 0.78.0
pkgrel = 1
url = https://github.com/giddie/poppler-cairo-backend
arch = i686
@@ -12,22 +10,22 @@ pkgbase = poppler-qt-lcd
makedepends = pkgconfig
depends = qt5-base
depends = cairo
- depends = poppler>=0.76.1
- provides = poppler-qt=0.76.1
- provides = poppler-qt5=0.76.1
+ depends = poppler>=0.78.0
+ provides = poppler-qt=0.78.0
+ provides = poppler-qt5=0.78.0
conflicts = poppler-qt
conflicts = poppler-qt4
conflicts = poppler-qt5
- source = http://poppler.freedesktop.org/poppler-0.76.1.tar.xz
+ source = http://poppler.freedesktop.org/poppler-0.78.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 = 99f1e6ab4c96d14840e862eb027f0fc0
- md5sums = edfc1cf0efa68fe5533f05abfbb962a4
- md5sums = 5ff3715c66c5270532c0fc3996ee42cf
- md5sums = 8d3cd2fc643130de57ad48cd40865c6d
- md5sums = 4c62cd1fbf1c82657e79a02f3195b2c3
+ md5sums = f5cc0dc52dbc00c68359036d866978ca
+ md5sums = 368dead63f764cb1f025d150e9a85183
+ md5sums = da38222aad7f5dec4eaad53056a9f8a2
+ md5sums = 349d89a89b0fdc4b8225e47b838b0144
+ md5sums = 97d410ad0eef6b0b8c64a58d46aef3c5
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 b7a33ef6068c..0fcdeff46121 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From eb4326d39ed11a5ea9b2e64e155a8f26ecc17b0a Mon Sep 17 00:00:00 2001
+From facc89e9435bfeedd1f38d05c32c95eaf84122cc 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
@@ -66,7 +66,7 @@ index 81db4eaf..635e44f9 100644
}
diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
-index 3e750620..04bf2e64 100644
+index 4676dcd8..7b952d3a 100644
--- a/qt5/src/poppler-page.cc
+++ b/qt5/src/poppler-page.cc
@@ -48,6 +48,7 @@
@@ -87,7 +87,7 @@ index 3e750620..04bf2e64 100644
#include "poppler-private.h"
#include "poppler-page-transition-private.h"
-@@ -622,6 +626,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
+@@ -622,6 +626,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
img = tmpimg;
break;
}
@@ -145,7 +145,7 @@ index 3e750620..04bf2e64 100644
+
+ m_page->parentDoc->doc->displayPageSlice(
+ output_dev, m_page->index + 1, xres, yres, rotation, false, true,
-+ false, x, y, w, h);
++ false, xPos, yPos, w, h);
+
+ // Clean up
+ output_dev->setCairo(nullptr);
@@ -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.21.0
+2.22.0
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index 4084abf99831..09be9edddab3 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From fe15ba5d37d00c7e56b01f434965112da6021568 Mon Sep 17 00:00:00 2001
+From 0511f83342850452711f148729097d7a19d54e77 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 e847ed5e..4b58f750 100644
m_hints = 0;
m_optContentModel = nullptr;
--
-2.21.0
+2.22.0
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index 15c9f76b7425..96ecd058260c 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,4 +1,4 @@
-From 21f2167b9776d0766f805c506629b6d045464314 Mon Sep 17 00:00:00 2001
+From d87f47f22682b488f2d0e78fc4a56e842a841613 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 dc82afc4..622e2954 100644
+index 8b5b4da0..709b760e 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
-@@ -2413,3 +2413,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage *page,
+@@ -2447,3 +2447,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage *page,
return g_list_reverse(attributes);
}
@@ -135,13 +135,13 @@ 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 d2769a22..f1bb39fc 100644
+index 68927636..c21229a7 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
-@@ -205,6 +205,13 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
+@@ -205,6 +205,13 @@ void CairoOutputDev::setCairo(cairo_t *c)
}
- if (cairo != nullptr) {
- this->cairo = cairo_reference (cairo);
+ if (c != nullptr) {
+ cairo = cairo_reference (c);
+ {
+ cairo_font_options_t *options = cairo_font_options_create ();
+ cairo_get_font_options (cairo, options);
@@ -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 5fba4c72..a5e5e963 100644
+index a9b93b61..c84a09d5 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
-@@ -4607,6 +4607,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) {
+@@ -4610,6 +4610,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) {
error(errSyntaxError, getPos(), "Bad image parameters");
}
@@ -203,7 +203,7 @@ index 5fba4c72..a5e5e963 100644
+ Object args[maxArgs];
+ int numArgs;
+ bool onlyNormalBlendMode;
-+ Parser myParser(xref, new Lexer(xref, str), false);
++ Parser myParser(xref, str, false);
+
+ numArgs = 0;
+ onlyNormalBlendMode = true;
@@ -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.21.0
+2.22.0
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index f580a6f0fca0..b85b497767bf 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 f65dca308474f0ee56075b1319afb71a78eda971 Mon Sep 17 00:00:00 2001
+From e52f2019cd296af14a1a0f84c4029b1d67894dcd 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,7 +8,7 @@ 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 4b107479..8ea0625a 100644
+index 550bd339..4b318c42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -485,23 +485,6 @@ if(TIFF_FOUND)
@@ -21,7 +21,7 @@ index 4b107479..8ea0625a 100644
-else()
-add_library(poppler ${poppler_SRCS})
-endif()
--set_target_properties(poppler PROPERTIES VERSION 87.0.0 SOVERSION 87)
+-set_target_properties(poppler PROPERTIES VERSION 89.0.0 SOVERSION 89)
-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 4b107479..8ea0625a 100644
install(FILES
poppler/Annot.h
--
-2.21.0
+2.22.0
diff --git a/PKGBUILD b/PKGBUILD
index 7b3aae3406cb..f16d05e96efc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
pkgname=poppler-qt-lcd
-pkgver=0.76.1
+pkgver=0.78.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=('99f1e6ab4c96d14840e862eb027f0fc0'
- 'edfc1cf0efa68fe5533f05abfbb962a4'
- '5ff3715c66c5270532c0fc3996ee42cf'
- '8d3cd2fc643130de57ad48cd40865c6d'
- '4c62cd1fbf1c82657e79a02f3195b2c3')
+md5sums=('f5cc0dc52dbc00c68359036d866978ca'
+ '368dead63f764cb1f025d150e9a85183'
+ 'da38222aad7f5dec4eaad53056a9f8a2'
+ '349d89a89b0fdc4b8225e47b838b0144'
+ '97d410ad0eef6b0b8c64a58d46aef3c5')
build() {
cd "${srcdir}/poppler-${pkgver}"