summarylogtreecommitdiffstats
path: root/0001-Cairo-backend-added-to-Qt5-wrapper.patch
diff options
context:
space:
mode:
authorPaul Gideon Dann2020-03-10 10:13:41 +0000
committerPaul Gideon Dann2020-03-10 10:13:41 +0000
commit51ddf906d3c554b41cbb3e6c865fc355616b4bb0 (patch)
tree31d16a6e08d751bb927bda7acfe07ecfa403665d /0001-Cairo-backend-added-to-Qt5-wrapper.patch
parentbb9fe259ba0c5df3b1ac4d023dd7f6b20b82da5d (diff)
downloadaur-51ddf906d3c554b41cbb3e6c865fc355616b4bb0.tar.gz
Update for Poppler 0.86.1
Diffstat (limited to '0001-Cairo-backend-added-to-Qt5-wrapper.patch')
-rw-r--r--0001-Cairo-backend-added-to-Qt5-wrapper.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/0001-Cairo-backend-added-to-Qt5-wrapper.patch b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
index 89b8a895da02..4ce0d539dee9 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From 0324a49e026627849372bde9c578decc6c594e7f Mon Sep 17 00:00:00 2001
+From d722d75b5418708aa994a12785e7351606de04f0 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,10 +52,10 @@ index f7c99248..301adcb3 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 bff01205..6c25e42e 100644
+index e1b8d05b..3e7c0428 100644
--- a/qt5/src/poppler-document.cc
+++ b/qt5/src/poppler-document.cc
-@@ -707,6 +707,9 @@ namespace Poppler {
+@@ -708,6 +708,9 @@ namespace Poppler {
ret << Document::SplashBackend;
#endif
ret << Document::ArthurBackend;
@@ -66,10 +66,10 @@ index bff01205..6c25e42e 100644
}
diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
-index 9e08134a..7459f30c 100644
+index 30e03509..6b4c3c9e 100644
--- a/qt5/src/poppler-page.cc
+++ b/qt5/src/poppler-page.cc
-@@ -48,6 +48,7 @@
+@@ -49,6 +49,7 @@
#include <QtGui/QPainter>
#include <config.h>
@@ -77,7 +77,7 @@ index 9e08134a..7459f30c 100644
#include <PDFDoc.h>
#include <Catalog.h>
#include <Form.h>
-@@ -61,6 +62,9 @@
+@@ -62,6 +63,9 @@
#include <SplashOutputDev.h>
#include <splash/SplashBitmap.h>
#endif
@@ -87,7 +87,7 @@ index 9e08134a..7459f30c 100644
#include "poppler-private.h"
#include "poppler-page-transition-private.h"
-@@ -609,6 +613,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
+@@ -610,6 +614,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w,
img = tmpimg;
break;
}
@@ -158,7 +158,7 @@ index 9e08134a..7459f30c 100644
}
if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload))
-@@ -631,6 +699,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
+@@ -632,6 +700,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);
}
@@ -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.25.0
+2.25.1