Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (89e6fe3baa3a1b0e4bf4da3480a0361cc5597d53)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (89e6fe3baa3a1b0e4bf4da3480a0361cc5597d53)
  • Date: Wed, 27 Sep 2017 12:51:38 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

graphics-libs/poppler/BUILD | 1 +
graphics-libs/poppler/CONFIGURE | 5 +----
graphics-libs/poppler/HISTORY | 3 ++-
3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 89e6fe3baa3a1b0e4bf4da3480a0361cc5597d53
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

poppler: un-break build, fix XPDF_HEADERS sub-dep

The sub-dependency only worked if it has been enabled before.
With empty value, things never went forward. This still
should be a normal option, too.

diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index b8ea42e..5169eb6 100755
--- a/graphics-libs/poppler/BUILD
+++ b/graphics-libs/poppler/BUILD
@@ -6,4 +6,5 @@ if is_depends_enabled $SPELL qtbase;then
fi &&
export CMAKE_PREFIX_PATH=$QTP &&
OPTS+=" $XPDF_HEADERS -DBUILD_CPP_TESTS=0" &&
+echo "OPTS=$OPTS" &&
cmake_build
diff --git a/graphics-libs/poppler/CONFIGURE b/graphics-libs/poppler/CONFIGURE
index 6a67dec..b1ab1bf 100755
--- a/graphics-libs/poppler/CONFIGURE
+++ b/graphics-libs/poppler/CONFIGURE
@@ -1,5 +1,2 @@
source $GRIMOIRE/CMAKE_CONFIGURE &&
-
-if [[ -n "${XPDF_HEADERS}" ]]; then
- persistent_add XPDF_HEADERS
-fi
+persistent_add XPDF_HEADERS
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index c372a6f..d6d50b2 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,5 +1,6 @@
2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
- * CONFIGURE: un-break for empty XPDF_HEADERS
+ * CONFIGURE: un-break for empty XPDF_HEADERS, also make the
+ sub-dep work at all (if not already set)

2017-09-26 Pavel Vinogradov <public AT sourcemage.org>
* BUILD, DEPENDS: moved tests flags to their respectful dependencies,



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (89e6fe3baa3a1b0e4bf4da3480a0361cc5597d53), Thomas Orgis, 09/27/2017

Archive powered by MHonArc 2.6.24.

Top of Page