summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Dann2020-12-11 11:08:06 +0000
committerPaul Dann2020-12-11 11:08:06 +0000
commitef24c7e511be8a3ba404c33e808ccd86eb4a4c3a (patch)
treea92672f8d0684ee09026b5e3197633200bf3e6e4
parent94fce9fade067f1c069bdc9211f53e64fff9d284 (diff)
downloadaur-ef24c7e511be8a3ba404c33e808ccd86eb4a4c3a.tar.gz
Update for Poppler 20.12.1
-rw-r--r--.SRCINFO18
-rw-r--r--0001-Cairo-backend-added-to-Qt5-wrapper.patch24
-rw-r--r--0002-Setting-default-Qt5-backend-to-Cairo.patch2
-rw-r--r--0003-Don-t-build-the-main-poppler-library.patch6
-rw-r--r--PKGBUILD10
5 files changed, 30 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c8a683557729..877436102476 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 = 20.12.0
+ pkgver = 20.12.1
pkgrel = 1
url = https://github.com/giddie/poppler-cairo-backend
arch = i686
@@ -10,20 +10,20 @@ pkgbase = poppler-qt-lcd
makedepends = pkgconfig
depends = qt5-base
depends = cairo
- depends = poppler>=20.12.0
- provides = poppler-qt=20.12.0
- provides = poppler-qt5=20.12.0
+ depends = poppler>=20.12.1
+ provides = poppler-qt=20.12.1
+ provides = poppler-qt5=20.12.1
conflicts = poppler-qt
conflicts = poppler-qt4
conflicts = poppler-qt5
- source = http://poppler.freedesktop.org/poppler-20.12.0.tar.xz
+ source = http://poppler.freedesktop.org/poppler-20.12.1.tar.xz
source = 0001-Cairo-backend-added-to-Qt5-wrapper.patch
source = 0002-Setting-default-Qt5-backend-to-Cairo.patch
source = 0003-Don-t-build-the-main-poppler-library.patch
- md5sums = 813781b450e8ccd4f780b870ff389e53
- md5sums = 9ae7f1fd1296a9bfdf52d7d7c1707f55
- md5sums = c68df6fe48f020a6083ca12aa1fad2b9
- md5sums = 1e8d4e661838657483aa9d2e5a92fa99
+ md5sums = eb4a8465b03ec58cc6a3277aa7d4fa7b
+ md5sums = dc21c162a7b880c4a1a161748f9c58aa
+ md5sums = 29834aaa465ca60f3e9124bab54cbc83
+ md5sums = 48e401fdef4c0798c6ae3cffe0e1be1e
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 f7870de9181e..cc44d2786a24 100644
--- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch
+++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch
@@ -1,4 +1,4 @@
-From 3ea09a476618ec9c2831449cb668463f47f09e55 Mon Sep 17 00:00:00 2001
+From c9507c38913711b9497b5db03df6ed0eb6627f2f 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/3] Cairo backend added to Qt5 wrapper
@@ -12,10 +12,10 @@ Subject: [PATCH 1/3] 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 80f40fca..18059d7a 100644
+index ae055a12..8cc1f540 100644
--- a/qt5/src/CMakeLists.txt
+++ b/qt5/src/CMakeLists.txt
-@@ -8,6 +8,11 @@ include_directories(
+@@ -5,6 +5,11 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
@@ -27,7 +27,7 @@ index 80f40fca..18059d7a 100644
set(CMAKE_C_VISIBILITY_PRESET hidden)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-@@ -39,6 +44,13 @@ set(poppler_qt5_SRCS
+@@ -36,6 +41,13 @@ set(poppler_qt5_SRCS
QPainterOutputDev.cc
poppler-version.cpp
)
@@ -41,10 +41,10 @@ index 80f40fca..18059d7a 100644
add_library(poppler-qt5 ${poppler_qt5_SRCS})
set_target_properties(poppler-qt5 PROPERTIES VERSION 1.26.0 SOVERSION 1)
if(MINGW AND BUILD_SHARED_LIBS)
-@@ -46,6 +58,9 @@ if(MINGW AND BUILD_SHARED_LIBS)
+@@ -43,6 +55,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})
+ target_link_libraries(poppler-qt5 poppler Qt5::Core Qt5::Gui Qt5::Xml ${FREETYPE_LIBRARIES})
+if (HAVE_CAIRO)
+ target_link_libraries(poppler-qt5 ${CAIRO_LIBRARIES})
+endif (HAVE_CAIRO)
@@ -182,11 +182,11 @@ index 6c167b65..f1672888 100644
/**
diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt
-index b8b5a399..caee9525 100644
+index 82ef2139..56860c32 100644
--- a/qt5/tests/CMakeLists.txt
+++ b/qt5/tests/CMakeLists.txt
-@@ -11,6 +11,11 @@ include_directories(
- ${Qt5Widgets_INCLUDE_DIRS}
+@@ -6,6 +6,11 @@ include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
)
+if (HAVE_CAIRO)
@@ -194,9 +194,9 @@ index b8b5a399..caee9525 100644
+ add_definitions(${CAIRO_CFLAGS})
+endif (HAVE_CAIRO)
+
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}")
+ macro(QT5_ADD_SIMPLETEST exe source)
+ string(REPLACE "-" "" test_name ${exe})
+ set(${test_name}_SOURCES
--
2.29.2
diff --git a/0002-Setting-default-Qt5-backend-to-Cairo.patch b/0002-Setting-default-Qt5-backend-to-Cairo.patch
index dd24a7e23f6a..a0642dfa4544 100644
--- a/0002-Setting-default-Qt5-backend-to-Cairo.patch
+++ b/0002-Setting-default-Qt5-backend-to-Cairo.patch
@@ -1,4 +1,4 @@
-From c092ca4d9e63c71d578d25576d1de19c97e8dbc2 Mon Sep 17 00:00:00 2001
+From 672b770c6ac7fd886e49a528c5d3aff1e99e42d7 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/3] Setting default Qt5 backend to Cairo
diff --git a/0003-Don-t-build-the-main-poppler-library.patch b/0003-Don-t-build-the-main-poppler-library.patch
index 4d5d6c828b3d..b38b8b0b62b6 100644
--- a/0003-Don-t-build-the-main-poppler-library.patch
+++ b/0003-Don-t-build-the-main-poppler-library.patch
@@ -1,4 +1,4 @@
-From f012312abb99f90b3ed5edf86b844764b9953d38 Mon Sep 17 00:00:00 2001
+From 08758cddd4d5749f2715534b28108420cb167b74 Mon Sep 17 00:00:00 2001
From: Paul Gideon Dann <pdgiddie@gmail.com>
Date: Tue, 1 Sep 2020 12:22:28 +0100
Subject: [PATCH 3/3] Don't build the main poppler library.
@@ -8,10 +8,10 @@ Subject: [PATCH 3/3] Don't build the main poppler library.
1 file changed, 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 307b26e8..8dedf6de 100644
+index 1573249a..67bd471d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -562,23 +562,6 @@ ADD_GPERF_FILE(TimesItalicWidths)
+@@ -564,23 +564,6 @@ ADD_GPERF_FILE(TimesItalicWidths)
ADD_GPERF_FILE(TimesRomanWidths)
ADD_GPERF_FILE(ZapfDingbatsWidths)
diff --git a/PKGBUILD b/PKGBUILD
index a99535f6389c..53acc072df39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Paul Gideon Dann <pdgiddie_at_gmail.com>
pkgname=poppler-qt-lcd
-pkgver=20.12.0
+pkgver=20.12.1
pkgrel=1
pkgdesc="Poppler Qt bindings, with patches to allow subpixel rendering via Cairo"
license=('GPL')
@@ -16,10 +16,10 @@ source=(http://poppler.freedesktop.org/poppler-${pkgver}.tar.xz
0001-Cairo-backend-added-to-Qt5-wrapper.patch
0002-Setting-default-Qt5-backend-to-Cairo.patch
0003-Don-t-build-the-main-poppler-library.patch)
-md5sums=('813781b450e8ccd4f780b870ff389e53'
- '9ae7f1fd1296a9bfdf52d7d7c1707f55'
- 'c68df6fe48f020a6083ca12aa1fad2b9'
- '1e8d4e661838657483aa9d2e5a92fa99')
+md5sums=('eb4a8465b03ec58cc6a3277aa7d4fa7b'
+ 'dc21c162a7b880c4a1a161748f9c58aa'
+ '29834aaa465ca60f3e9124bab54cbc83'
+ '48e401fdef4c0798c6ae3cffe0e1be1e')
build() {
cd "${srcdir}/poppler-${pkgver}"