summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gideon Dann2019-09-24 09:07:25 +0100
committerPaul Gideon Dann2019-09-24 09:07:25 +0100
commit41fec94378cf56e456a7d93090a7ef25f6b05d86 (patch)
treead1700ceba018ee6bb2ce8ad8852cddb5bda326a
parentd483972d957f2660628006bd29e280de27f080c8 (diff)
downloadaur-41fec94378cf56e456a7d93090a7ef25f6b05d86.tar.gz
Update for Poppler 0.80.0
-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.patch6
-rw-r--r--0003-Apply-subpixel-rendering-in-Cairo-Backend.patch8
-rw-r--r--0004-Don-t-build-the-main-poppler-library.patch10
-rw-r--r--PKGBUILD13
6 files changed, 35 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index acf465c7cbf8..dd3fbe332c2a 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.79.0
+ pkgver = 0.80.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.79.0
- provides = poppler-qt=0.79.0
- provides = poppler-qt5=0.79.0
+ depends = poppler>=0.80.0
+ provides = poppler-qt=0.80.0
+ provides = poppler-qt5=0.80.0
conflicts = poppler-qt
conflicts = poppler-qt4
conflicts = poppler-qt5
- source = http://poppler.freedesktop.org/poppler-0.79.0.tar.xz
+ source = http://poppler.freedesktop.org/poppler-0.80.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 = 0aac1fcb6466f8b7bdf51871264c7e83
- md5sums = a1e97e4ae4fe55523f5a47b5d1f54815
- md5sums = cbd05ea7d04e6a4cb9e1c9db48707d1f
- md5sums = 79a32a3672b6aa70d985f283a03585d5
- md5sums = a6b675bc087c52771bceaffe5e3a6c46
+ md5sums = 8ff9964d1fcc9c334a9c66f6f426ab9c
+ md5sums = 6d99057082cc672d29d413d8816f1f20
+ md5sums = e84c03ba6bb037d8a33da0f731269435
+ md5sums = 90104a3a258e81a2a5b2693f7f78f608
+ md5sums = aff14dc9f508062150b6bcfdbec540f9
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 b30e86d5d761..2ebecbd80732 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From caf6c676532d5767f7d52d589f2d1569f2554af9 Mon Sep 17 00:00:00 2001
+From ca21442edf7ec79c8662f6cfadc2fb8b882a9092 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 e3b60fcb..a32b6799 100644
+index ca1f2478..af19e065 100644
--- a/qt5/src/CMakeLists.txt
+++ b/qt5/src/CMakeLists.txt
@@ -8,6 +8,11 @@ include_directories(
@@ -39,7 +39,7 @@ index e3b60fcb..a32b6799 100644
+ )
+endif(HAVE_CAIRO)
add_library(poppler-qt5 ${poppler_qt5_SRCS})
- set_target_properties(poppler-qt5 PROPERTIES VERSION 1.20.0 SOVERSION 1)
+ set_target_properties(poppler-qt5 PROPERTIES VERSION 1.21.0 SOVERSION 1)
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}")
@@ -66,7 +66,7 @@ index 81db4eaf..635e44f9 100644
}
diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
-index bf1f8889..592da057 100644
+index c4d00a6b..92aa0e8a 100644
--- a/qt5/src/poppler-page.cc
+++ b/qt5/src/poppler-page.cc
@@ -48,6 +48,7 @@
@@ -168,10 +168,10 @@ index bf1f8889..592da057 100644
return false;
}
diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h
-index ebbc456a..37adf71a 100644
+index 847671ea..117efa1e 100644
--- a/qt5/src/poppler-qt5.h
+++ b/qt5/src/poppler-qt5.h
-@@ -1144,7 +1144,8 @@ delete it;
+@@ -1151,7 +1151,8 @@ delete it;
*/
enum RenderBackend {
SplashBackend, ///< Splash backend
@@ -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.22.0
+2.23.0
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index 686ceecb9f0b..3f270cd1c64f 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From 1bf370f54b720b4e167fa0e1fe90e3ef2ebd66a5 Mon Sep 17 00:00:00 2001
+From 362e11628acf1021a3d36b0ecb8d711776dcdb50 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 a3fbec36..05c6bc96 100644
+index 6553eb08..93a4e0a2 100644
--- a/qt5/src/poppler-private.cc
+++ b/qt5/src/poppler-private.cc
@@ -255,7 +255,7 @@ namespace Debug {
@@ -21,5 +21,5 @@ index a3fbec36..05c6bc96 100644
m_hints = 0;
m_optContentModel = nullptr;
--
-2.22.0
+2.23.0
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index 347e36ef8a62..f3bad83b62f7 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,4 +1,4 @@
-From 1fd38e9b4726d0db9a769176a6464d6a2ae83237 Mon Sep 17 00:00:00 2001
+From 40e1b18877127d29970a19c95932ec60a3974e66 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
@@ -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 a9b93b61..c84a09d5 100644
+index 47627ad3..d48a4b0c 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
-@@ -4610,6 +4610,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) {
+@@ -4603,6 +4603,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) {
error(errSyntaxError, getPos(), "Bad image parameters");
}
@@ -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.22.0
+2.23.0
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index c36587fd1b01..1c3c6796069c 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 82916aaa8af2013196e144b38cad94adaa907276 Mon Sep 17 00:00:00 2001
+From 1b86415f274e5ec45c226e35d170febfb237c471 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 265008a7..0b0d9fb6 100644
+index 4ec53d92..9fb6be7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -485,23 +485,6 @@ if(TIFF_FOUND)
+@@ -492,23 +492,6 @@ if(TIFF_FOUND)
set(poppler_LIBS ${poppler_LIBS} ${TIFF_LIBRARIES})
endif()
@@ -21,7 +21,7 @@ index 265008a7..0b0d9fb6 100644
-else()
-add_library(poppler ${poppler_SRCS})
-endif()
--set_target_properties(poppler PROPERTIES VERSION 89.0.0 SOVERSION 89)
+-set_target_properties(poppler PROPERTIES VERSION 90.0.0 SOVERSION 90)
-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 265008a7..0b0d9fb6 100644
install(FILES
poppler/Annot.h
--
-2.22.0
+2.23.0
diff --git a/PKGBUILD b/PKGBUILD
index e2940a581eff..0e1cc3681ed7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
pkgname=poppler-qt-lcd
-pkgver=0.79.0
+pkgver=0.80.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=('0aac1fcb6466f8b7bdf51871264c7e83'
- 'a1e97e4ae4fe55523f5a47b5d1f54815'
- 'cbd05ea7d04e6a4cb9e1c9db48707d1f'
- '79a32a3672b6aa70d985f283a03585d5'
- 'a6b675bc087c52771bceaffe5e3a6c46')
+md5sums=('8ff9964d1fcc9c334a9c66f6f426ab9c'
+ '6d99057082cc672d29d413d8816f1f20'
+ 'e84c03ba6bb037d8a33da0f731269435'
+ '90104a3a258e81a2a5b2693f7f78f608'
+ 'aff14dc9f508062150b6bcfdbec540f9')
build() {
cd "${srcdir}/poppler-${pkgver}"
@@ -44,6 +44,5 @@ package() {
make DESTDIR="${pkgdir}" -C qt5/src install
msg "Removing unwanted pkg-config files"
- mv "${pkgdir}"/usr/lib{64,}
rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler{,-splash,-cairo}.pc
}