summarylogtreecommitdiffstats
path: root/0004-Don-t-build-the-main-poppler-library.patch
diff options
context:
space:
mode:
authorPaul Gideon Dann2018-11-19 15:23:42 +0000
committerPaul Gideon Dann2018-11-19 15:23:42 +0000
commit5cb347b9130a9865ef152b6e23d7c4e47e1d5d01 (patch)
treecb3a851c57c625df6c22251b226da6a9c1be1b9e /0004-Don-t-build-the-main-poppler-library.patch
parent942603fc0ba44a684b74878e82b694223dd25a50 (diff)
downloadaur-5cb347b9130a9865ef152b6e23d7c4e47e1d5d01.tar.gz
Update for Poppler 0.71.0
Diffstat (limited to '0004-Don-t-build-the-main-poppler-library.patch')
-rw-r--r--0004-Don-t-build-the-main-poppler-library.patch17
1 files changed, 8 insertions, 9 deletions
diff --git a/0004-Don-t-build-the-main-poppler-library.patch b/0004-Don-t-build-the-main-poppler-library.patch
index 14f43a3533ba..28810a8e4575 100644
--- a/0004-Don-t-build-the-main-poppler-library.patch
+++ b/0004-Don-t-build-the-main-poppler-library.patch
@@ -1,28 +1,27 @@
-From 07fde1b2f53a16306401a85264e5728ec510036d Mon Sep 17 00:00:00 2001
+From 3bb124da95aba8cbea8625b66b1d10af8dde21bb 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.
+Subject: [PATCH 4/5] Don't build the main poppler library.
---
- CMakeLists.txt | 18 ------------------
- 1 file changed, 18 deletions(-)
+ CMakeLists.txt | 17 -----------------
+ 1 file changed, 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cdfe7795..001425ce 100644
+index 88a53c47..f3abde94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -483,24 +483,6 @@ if(TIFF_FOUND)
+@@ -478,23 +478,6 @@ if(TIFF_FOUND)
set(poppler_LIBS ${poppler_LIBS} ${TIFF_LIBRARIES})
endif()
-if(MSVC)
-add_definitions(-D_CRT_SECURE_NO_WARNINGS)
--set(CMAKE_CXX_FLAGS "/Zc:wchar_t- ${CMAKE_CXX_FLAGS}")
-add_library(poppler STATIC ${poppler_SRCS})
-else()
-add_library(poppler ${poppler_SRCS})
-endif()
--set_target_properties(poppler PROPERTIES VERSION 78.0.0 SOVERSION 78)
+-set_target_properties(poppler PROPERTIES VERSION 82.0.0 SOVERSION 82)
-if(MINGW)
- get_target_property(POPPLER_SOVERSION poppler SOVERSION)
- set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
@@ -37,5 +36,5 @@ index cdfe7795..001425ce 100644
install(FILES
poppler/Annot.h
--
-2.18.0
+2.19.1