diff options
| author | Pavel Vinogradov | 2019-10-08 18:56:24 -0400 |
|---|---|---|
| committer | Pavel Vinogradov | 2019-10-08 18:56:24 -0400 |
| commit | 672f10f8d037efa18eb319a5de925e0ed026f238 (patch) | |
| tree | e4a20c9daab750b353e3698d3040eeab4453dfc5 /graphics-libs | |
| parent | 1256d5d4b7191f50fa5dc5e4bcde2ba395a78672 (diff) | |
graphics-libs/poppler: added option to build pdf utilities
Diffstat (limited to 'graphics-libs')
| -rwxr-xr-x | graphics-libs/poppler/BUILD | 2 | ||||
| -rwxr-xr-x | graphics-libs/poppler/CONFIGURE | 6 | ||||
| -rwxr-xr-x | graphics-libs/poppler/CONFLICTS | 3 | ||||
| -rw-r--r-- | graphics-libs/poppler/HISTORY | 4 |
4 files changed, 13 insertions, 2 deletions
diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD index 6170637202..8e4064457e 100755 --- a/graphics-libs/poppler/BUILD +++ b/graphics-libs/poppler/BUILD @@ -2,6 +2,6 @@ if is_depends_enabled $SPELL qtbase;then QTP+=":${INSTALL_ROOT}/opt/qt5" fi && export CMAKE_PREFIX_PATH=$QTP && -OPTS+=" $XPDF_HEADERS -DBUILD_CPP_TESTS=0" && +OPTS+=" $XPDF_HEADERS -DBUILD_CPP_TESTS=0 ${POPPLER_OPTS}" && sed -i "/SYSTEM/d" test/CMakeLists.txt glib/CMakeLists.txt && default_build diff --git a/graphics-libs/poppler/CONFIGURE b/graphics-libs/poppler/CONFIGURE index ba8bdafe23..1cf17bde59 100755 --- a/graphics-libs/poppler/CONFIGURE +++ b/graphics-libs/poppler/CONFIGURE @@ -5,4 +5,8 @@ XPDF_HEADERS="${XPDF_HEADERS/ENABLE_XPDF_HEADERS/ENABLE_UNSTABLE_API_ABI_HEADERS config_query_option XPDF_HEADERS "Install unsupported xpdf headers?" n \ "-DENABLE_UNSTABLE_API_ABI_HEADERS=ON" \ - "-DENABLE_UNSTABLE_API_ABI_HEADERS=OFF" + "-DENABLE_UNSTABLE_API_ABI_HEADERS=OFF" && + +config_query_option POPPLER_OPTS "Build pdf utilities (may conflict with xpdf)?" n \ + "-DENABLE_UTILS=ON" \ + "-DENABLE_UTILS=OFF" diff --git a/graphics-libs/poppler/CONFLICTS b/graphics-libs/poppler/CONFLICTS new file mode 100755 index 0000000000..3b73500a83 --- /dev/null +++ b/graphics-libs/poppler/CONFLICTS @@ -0,0 +1,3 @@ +if list_find "${POPPLER_OPTS}" "-DENABLE_UTILS=ON" ; then + conflicts xpdf y +fi diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY index dfae9604f4..f1f1324e8f 100644 --- a/graphics-libs/poppler/HISTORY +++ b/graphics-libs/poppler/HISTORY @@ -1,3 +1,7 @@ +2019-10-08 Pavel Vinogradov <public@sourcemage.org> + * BUILD, CONFIGURE, CONFLICTS: added option to build pdf utilities and + a conflict with xpdf if that option was chosen + 2019-09-22 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.81.0 |