Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 graphics-libs/poppler/BUILD     |    2 +-
 graphics-libs/poppler/CONFIGURE |    6 +++++-
 graphics-libs/poppler/CONFLICTS |    3 +++
 graphics-libs/poppler/HISTORY   |    4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 672f10f8d037efa18eb319a5de925e0ed026f238
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    graphics-libs/poppler: added option to build pdf utilities

diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index 6170637..8e40644 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 ba8bdaf..1cf17bd 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 0000000..3b73500
--- /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 dfae960..f1f1324 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,7 @@
+2019-10-08 Pavel Vinogradov <public AT 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 AT sourcemage.org>
        * DETAILS: version 0.81.0