Skip to content

Commit

Permalink
(#5396) [poppler-data] Add version 0.4.10
Browse files Browse the repository at this point in the history
* [poppler-data] Add  version 0.4.10

* modify patch following suggestion by @madebr
  • Loading branch information
jgsogo authored May 4, 2021
1 parent 1a3c132 commit 7f66a09
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
6 changes: 6 additions & 0 deletions recipes/poppler-data/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ sources:
"0.4.9":
url: "https://poppler.freedesktop.org/poppler-data-0.4.9.tar.gz"
sha256: "1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012"
"0.4.10":
url: "https://poppler.freedesktop.org/poppler-data-0.4.10.tar.gz"
sha256: "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30"
patches:
"0.4.9":
- base_path: "source_subfolder"
patch_file: "patches/0001-cmake-use-GNUInstallDirs.patch"
"0.4.10":
- base_path: "source_subfolder"
patch_file: "patches/0001-cmake-use-GNUInstallDirs.patch"
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -3,7 +3,9 @@
cmake_minimum_required(VERSION 2.6)

set(VERSION "0.4.9")
@@ -6,1 +6,3 @@
-set(datadir ${CMAKE_INSTALL_PREFIX}/share)
+if(NOT datadir)
+ set(datadir ${CMAKE_INSTALL_PREFIX}/share)
+endif()
set(pkgdatadir ${datadir}/poppler)

set(unicode-map-files
2 changes: 2 additions & 0 deletions recipes/poppler-data/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"0.4.9":
folder: all
"0.4.10":
folder: all

0 comments on commit 7f66a09

Please sign in to comment.