diff options
author | Mark Coolen | 2018-11-21 15:56:28 -0500 |
---|---|---|
committer | Mark Coolen | 2018-11-21 15:56:28 -0500 |
commit | 9d2021956e57f1e0e6840ed01736d82dd196fa3f (patch) | |
tree | a74ddf8ad57eccf90630f71dabb452bed1293621 /fixpoppler.patch | |
parent | 1183d9401de0b1eef0fe0b591fb1403069d010de (diff) | |
download | aur-9d2021956e57f1e0e6840ed01736d82dd196fa3f.tar.gz |
Compiles Poppler 0.69 and changes to GTK3
Diffstat (limited to 'fixpoppler.patch')
-rw-r--r-- | fixpoppler.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/fixpoppler.patch b/fixpoppler.patch new file mode 100644 index 000000000000..cb55dc5fb91e --- /dev/null +++ b/fixpoppler.patch @@ -0,0 +1,25 @@ +From 6dd346daefbe6133ebd3a81489880d94b1a87a65 Mon Sep 17 00:00:00 2001 +From: Florian Freund <florian88freund@gmail.com> +Date: Wed, 21 Nov 2018 01:08:04 +0100 +Subject: Change lib installation to poppler 0.69.0 and fix ignoring DESTDIR + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2715e91b..93a9c8eb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -322,11 +322,11 @@ install (DIRECTORY ui + + if (BUILD_POPPLER) + # The Path /usr/lib is hardcoded, fix if there is a better solution +- set(POPPLER_LIB ${CMAKE_INSTALL_PREFIX}/lib/libpoppler.so.72) ++ set(POPPLER_LIB ${CMAKE_INSTALL_PREFIX}/lib/libpoppler.so.80) + + install(CODE "MESSAGE(\"Install Poppler workaround to ${POPPLER_LIB}\")") +- install(CODE "configure_file(${CMAKE_CURRENT_BINARY_DIR}/poppler-prefix/src/poppler-build/libpoppler.so.72.0.0 ${POPPLER_LIB} COPYONLY)") +- install(CODE "file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_manifest_workaround.txt \"${POPPLER_LIB}\")") ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/poppler-prefix/src/poppler-build/libpoppler.so.80.0.0 DESTINATION lib) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/poppler-prefix/src/poppler-build/libpoppler.so.80 DESTINATION lib) + endif() + + # Uninstall target |