diff options
| author | Paul Gideon Dann | 2016-12-28 11:23:49 +0000 |
|---|---|---|
| committer | Paul Gideon Dann | 2016-12-28 11:23:49 +0000 |
| commit | 9f0fd95b2da3252c0f1c6dccfc6990e118b744da (patch) | |
| tree | 52e1a9f683ac248e33092b002648bb9f4b3153fd /0001-Cairo-backend-added-to-Qt4-wrapper.patch | |
| parent | c4e5e4f1918ef5177663088e76ac36a68fbdd01f (diff) | |
| download | aur-9f0fd95b2da3252c0f1c6dccfc6990e118b744da.tar.gz | |
Update for Poppler 0.50
Diffstat (limited to '0001-Cairo-backend-added-to-Qt4-wrapper.patch')
| -rw-r--r-- | 0001-Cairo-backend-added-to-Qt4-wrapper.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/0001-Cairo-backend-added-to-Qt4-wrapper.patch b/0001-Cairo-backend-added-to-Qt4-wrapper.patch index 914a19d36bc1..987053903507 100644 --- a/0001-Cairo-backend-added-to-Qt4-wrapper.patch +++ b/0001-Cairo-backend-added-to-Qt4-wrapper.patch @@ -1,4 +1,4 @@ -From fa46f5de2770b40ee79bc4be95030a91657e0f60 Mon Sep 17 00:00:00 2001 +From fbceb64e0eb10b7a3948935e35f4c3c12fc24c27 Mon Sep 17 00:00:00 2001 From: Paul Gideon Dann <pdgiddie@gmail.com> Date: Wed, 20 May 2009 11:42:28 +0100 Subject: [PATCH 1/4] Cairo backend added to Qt4 wrapper @@ -12,7 +12,7 @@ Subject: [PATCH 1/4] Cairo backend added to Qt4 wrapper 5 files changed, 95 insertions(+), 1 deletion(-) diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt -index 2b55e6b..8587f24 100644 +index 18c35f8c..d0c87764 100644 --- a/qt4/src/CMakeLists.txt +++ b/qt4/src/CMakeLists.txt @@ -6,6 +6,11 @@ include_directories( @@ -40,7 +40,7 @@ index 2b55e6b..8587f24 100644 +endif(HAVE_CAIRO) qt4_automoc(${poppler_qt4_SRCS}) add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS}) - set_target_properties(poppler-qt4 PROPERTIES VERSION 4.10.0 SOVERSION 4) + set_target_properties(poppler-qt4 PROPERTIES VERSION 4.11.0 SOVERSION 4) target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY}) +if (HAVE_CAIRO) + target_link_libraries(poppler-qt4 ${CAIRO_LIBRARIES}) @@ -49,7 +49,7 @@ index 2b55e6b..8587f24 100644 target_link_libraries(poppler-qt4 poppler ${poppler_LIBS}) endif(MSVC) diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc -index 7f8abfa..a6b4c8e 100644 +index 7f8abfa7..a6b4c8e0 100644 --- a/qt4/src/poppler-document.cc +++ b/qt4/src/poppler-document.cc @@ -698,6 +698,9 @@ namespace Poppler { @@ -63,7 +63,7 @@ index 7f8abfa..a6b4c8e 100644 } diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc -index 9e466da..650ad5f 100644 +index fb6a036d..58c3412d 100644 --- a/qt4/src/poppler-page.cc +++ b/qt4/src/poppler-page.cc @@ -41,6 +41,7 @@ @@ -84,7 +84,7 @@ index 9e466da..650ad5f 100644 #include "poppler-private.h" #include "poppler-page-transition-private.h" -@@ -406,6 +410,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h, +@@ -415,6 +419,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h, img = tmpimg; break; } @@ -155,7 +155,7 @@ index 9e466da..650ad5f 100644 } return img; -@@ -448,6 +516,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i +@@ -457,6 +525,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i painter->restore(); return true; } @@ -165,7 +165,7 @@ index 9e466da..650ad5f 100644 return false; } diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h -index 1b5afb2..8e3cb26 100644 +index 1b5afb2e..8e3cb26b 100644 --- a/qt4/src/poppler-qt4.h +++ b/qt4/src/poppler-qt4.h @@ -887,7 +887,8 @@ delete it; @@ -179,7 +179,7 @@ index 1b5afb2..8e3cb26 100644 /** diff --git a/qt4/tests/CMakeLists.txt b/qt4/tests/CMakeLists.txt -index bba868f..8c40471 100644 +index bba868f1..8c404716 100644 --- a/qt4/tests/CMakeLists.txt +++ b/qt4/tests/CMakeLists.txt @@ -8,6 +8,11 @@ include_directories( @@ -195,5 +195,5 @@ index bba868f..8c40471 100644 string(REPLACE "-" "" test_name ${exe}) set(${test_name}_SOURCES -- -2.10.2 +2.11.0 |