summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO22
-rw-r--r--0001-Cairo-backend-added-to-Qt5-wrapper.patch20
-rw-r--r--0002-Setting-default-Qt5-backend-to-Cairo.patch4
-rw-r--r--0003-Apply-subpixel-rendering-in-Cairo-Backend.patch4
-rw-r--r--0004-Don-t-build-the-main-poppler-library.patch8
-rw-r--r--PKGBUILD12
6 files changed, 35 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9ab451563167..f29553412bdf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Feb 4 11:07:03 UTC 2019
+# Mon Feb 18 12:53:50 UTC 2019
pkgbase = poppler-qt-lcd
pkgdesc = Poppler Qt bindings, with patches to allow subpixel rendering via Cairo
- pkgver = 0.73.0
+ pkgver = 0.74.0
pkgrel = 1
url = https://github.com/giddie/poppler-cairo-backend
arch = i686
@@ -12,22 +12,22 @@ pkgbase = poppler-qt-lcd
makedepends = pkgconfig
depends = qt5-base
depends = cairo
- depends = poppler>=0.73.0
- provides = poppler-qt=0.73.0
- provides = poppler-qt5=0.73.0
+ depends = poppler>=0.74.0
+ provides = poppler-qt=0.74.0
+ provides = poppler-qt5=0.74.0
conflicts = poppler-qt
conflicts = poppler-qt4
conflicts = poppler-qt5
- source = http://poppler.freedesktop.org/poppler-0.73.0.tar.xz
+ source = http://poppler.freedesktop.org/poppler-0.74.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 = 1fc64bd358c9f31d0c88a7f2b0d8b23d
- md5sums = 4dd52808d3d762d0251f78c0adeb0039
- md5sums = c7a114ee4b2ec91e95f1e7e60155ae17
- md5sums = 1a4c6cdaca02633fab8101d3786fbd3e
- md5sums = 93016a3937cf9460b8c39d57a186f396
+ md5sums = 1ce581bde2f23fa55bee13d8c61ac0df
+ md5sums = 61b4a63750f1f75a05f6d18f60aee313
+ md5sums = 52870cfa3614b26fa3b1826414535ed2
+ md5sums = cff4ae843a6a58c2076a57d6965ab1b1
+ md5sums = 60cc41e01433beef90d4ee03a46a0b06
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 589d8845aa43..96834f924ddc 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From 590cf73ca1deb80558c30f7d1bd27c987006e640 Mon Sep 17 00:00:00 2001
+From 1e2d2eede51ed070e58a7acde663fd06b6361eb3 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 c94390c5..2f3d8671 100644
+index 340a3e43..86627bb9 100644
--- a/qt5/src/CMakeLists.txt
+++ b/qt5/src/CMakeLists.txt
@@ -8,6 +8,11 @@ include_directories(
@@ -27,7 +27,7 @@ index c94390c5..2f3d8671 100644
set(CMAKE_C_VISIBILITY_PRESET hidden)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-@@ -37,6 +42,13 @@ set(poppler_qt5_SRCS
+@@ -38,6 +43,13 @@ set(poppler_qt5_SRCS
ArthurOutputDev.cc
poppler-version.cpp
)
@@ -39,9 +39,9 @@ index c94390c5..2f3d8671 100644
+ )
+endif(HAVE_CAIRO)
add_library(poppler-qt5 ${poppler_qt5_SRCS})
- set_target_properties(poppler-qt5 PROPERTIES VERSION 1.18.0 SOVERSION 1)
+ set_target_properties(poppler-qt5 PROPERTIES VERSION 1.19.0 SOVERSION 1)
if(MINGW AND BUILD_SHARED_LIBS)
-@@ -44,6 +56,9 @@ if(MINGW AND BUILD_SHARED_LIBS)
+@@ -45,6 +57,9 @@ if(MINGW AND BUILD_SHARED_LIBS)
set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
endif()
target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES} ${FREETYPE_LIBRARIES})
@@ -52,10 +52,10 @@ index c94390c5..2f3d8671 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 216ef582..65fce04f 100644
+index 0aa5bed4..8fbe9ddf 100644
--- a/qt5/src/poppler-document.cc
+++ b/qt5/src/poppler-document.cc
-@@ -678,6 +678,9 @@ namespace Poppler {
+@@ -694,6 +694,9 @@ namespace Poppler {
ret << Document::SplashBackend;
#endif
ret << Document::ArthurBackend;
@@ -168,10 +168,10 @@ index 1e5e1ae2..e0a131b4 100644
return false;
}
diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h
-index 5373a3a1..a81f4fda 100644
+index c03fec15..b59a93f1 100644
--- a/qt5/src/poppler-qt5.h
+++ b/qt5/src/poppler-qt5.h
-@@ -1065,7 +1065,8 @@ delete it;
+@@ -1144,7 +1144,8 @@ delete it;
*/
enum RenderBackend {
SplashBackend, ///< Splash backend
@@ -182,7 +182,7 @@ index 5373a3a1..a81f4fda 100644
/**
diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt
-index 7fda2687..e117d9d3 100644
+index 5abcbc45..99c12b9f 100644
--- a/qt5/tests/CMakeLists.txt
+++ b/qt5/tests/CMakeLists.txt
@@ -11,6 +11,11 @@ include_directories(
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index 39ed95c84610..ac2b4167b1fa 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From 05002217de0c753dc88d1ca24ec8bc978a2f98ee Mon Sep 17 00:00:00 2001
+From fe836d9509d001c6d01d40b613a68772564759cd 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
@@ -8,7 +8,7 @@ Subject: [PATCH 2/4] Setting default Qt5 backend to Cairo
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qt5/src/poppler-private.cc b/qt5/src/poppler-private.cc
-index 333aafe3..0ca54b2c 100644
+index 0c178a54..0306ae4d 100644
--- a/qt5/src/poppler-private.cc
+++ b/qt5/src/poppler-private.cc
@@ -265,7 +265,7 @@ namespace Debug {
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index dc03315f785b..96d7d1eeb5fe 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,4 +1,4 @@
-From afec9cf5f3d6135e086111a1d0471db3a4fcf717 Mon Sep 17 00:00:00 2001
+From 15b6154f7d637f961bc8e9d348605df79a490641 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
@@ -135,7 +135,7 @@ index e29898a9..314925a8 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 02a6f262..b20ca280 100644
+index d2769a22..f1bb39fc 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -205,6 +205,13 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index a2a92a68c5f4..4197d293cee5 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 2910a658852a3c76a270a8dba26cf2a2be62ba57 Mon Sep 17 00:00:00 2001
+From b54dc4769396eafd03b3c975dbe1a745ebb12b9a 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 8a0ca5cc..be28d65b 100644
+index 6d49721c..a81aa29b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -479,23 +479,6 @@ if(TIFF_FOUND)
+@@ -483,23 +483,6 @@ if(TIFF_FOUND)
set(poppler_LIBS ${poppler_LIBS} ${TIFF_LIBRARIES})
endif()
@@ -21,7 +21,7 @@ index 8a0ca5cc..be28d65b 100644
-else()
-add_library(poppler ${poppler_SRCS})
-endif()
--set_target_properties(poppler PROPERTIES VERSION 84.0.0 SOVERSION 84)
+-set_target_properties(poppler PROPERTIES VERSION 85.0.0 SOVERSION 85)
-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}")
diff --git a/PKGBUILD b/PKGBUILD
index 6eb2887f3f47..98988db3f8f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
pkgname=poppler-qt-lcd
-pkgver=0.73.0
+pkgver=0.74.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=('1fc64bd358c9f31d0c88a7f2b0d8b23d'
- '4dd52808d3d762d0251f78c0adeb0039'
- 'c7a114ee4b2ec91e95f1e7e60155ae17'
- '1a4c6cdaca02633fab8101d3786fbd3e'
- '93016a3937cf9460b8c39d57a186f396')
+md5sums=('1ce581bde2f23fa55bee13d8c61ac0df'
+ '61b4a63750f1f75a05f6d18f60aee313'
+ '52870cfa3614b26fa3b1826414535ed2'
+ 'cff4ae843a6a58c2076a57d6965ab1b1'
+ '60cc41e01433beef90d4ee03a46a0b06')
build() {
cd "${srcdir}/poppler-${pkgver}"