Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ad66619099a808fdc5b14c6adafa8c612d50430b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ad66619099a808fdc5b14c6adafa8c612d50430b)
  • Date: Tue, 8 Jan 2019 23:47:03 +0000

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

graphics-libs/poppler/BUILD | 2 --
graphics-libs/poppler/CONFIGURE | 7 +++++--
graphics-libs/poppler/HISTORY | 4 ++++
graphics-libs/poppler/PRE_SUB_DEPENDS | 2 +-
graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS | 2 +-
graphics-libs/poppler/SUB_DEPENDS | 4 ++--
6 files changed, 13 insertions(+), 8 deletions(-)

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

graphics-libs/poppler: fully converted the XPDF_HEADERS flag

diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index b378dd9..6170637 100755
--- a/graphics-libs/poppler/BUILD
+++ b/graphics-libs/poppler/BUILD
@@ -3,7 +3,5 @@ if is_depends_enabled $SPELL qtbase;then
fi &&
export CMAKE_PREFIX_PATH=$QTP &&
OPTS+=" $XPDF_HEADERS -DBUILD_CPP_TESTS=0" &&
-# as of version 0.73.0
-OPTS="${OPTS/ENABLE_XPDF_HEADERS/ENABLE_UNSTABLE_API_ABI_HEADERS}"
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 31e396a..ba8bdaf 100755
--- a/graphics-libs/poppler/CONFIGURE
+++ b/graphics-libs/poppler/CONFIGURE
@@ -1,5 +1,8 @@
source $GRIMOIRE/CMAKE_CONFIGURE &&

+# Old flag -> new flag
+XPDF_HEADERS="${XPDF_HEADERS/ENABLE_XPDF_HEADERS/ENABLE_UNSTABLE_API_ABI_HEADERS}"
&&
+
config_query_option XPDF_HEADERS "Install unsupported xpdf headers?" n \
- "-DENABLE_XPDF_HEADERS=ON" \
- "-DENABLE_XPDF_HEADERS=OFF"
+ "-DENABLE_UNSTABLE_API_ABI_HEADERS=ON" \
+ "-DENABLE_UNSTABLE_API_ABI_HEADERS=OFF"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 887e172..e58b684 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,7 @@
+2019-01-08 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE, *SUB_DEPENDS: converted XPDF_HEADERS flag
+ completely
+
2019-01-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.73.0
* BUILD: fixed
diff --git a/graphics-libs/poppler/PRE_SUB_DEPENDS
b/graphics-libs/poppler/PRE_SUB_DEPENDS
index 89314c0..bb091db 100755
--- a/graphics-libs/poppler/PRE_SUB_DEPENDS
+++ b/graphics-libs/poppler/PRE_SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
QT5) is_depends_enabled $SPELL qtbase && return 0;;
- XPDF_HEADERS) list_find "$XPDF_HEADERS" "-DENABLE_XPDF_HEADERS=ON" &&
return 0;;
+ XPDF_HEADERS) list_find "$XPDF_HEADERS"
"-DENABLE_UNSTABLE_API_ABI_HEADERS=ON" && return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
b/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
index 89314c0..bb091db 100755
--- a/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
+++ b/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
QT5) is_depends_enabled $SPELL qtbase && return 0;;
- XPDF_HEADERS) list_find "$XPDF_HEADERS" "-DENABLE_XPDF_HEADERS=ON" &&
return 0;;
+ XPDF_HEADERS) list_find "$XPDF_HEADERS"
"-DENABLE_UNSTABLE_API_ABI_HEADERS=ON" && return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/graphics-libs/poppler/SUB_DEPENDS
b/graphics-libs/poppler/SUB_DEPENDS
index 37b7630..be68e3a 100755
--- a/graphics-libs/poppler/SUB_DEPENDS
+++ b/graphics-libs/poppler/SUB_DEPENDS
@@ -2,8 +2,8 @@ case $THIS_SUB_DEPENDS in
QT5) echo "QT5 support requested, forcing qtbase dependency." &&
depends qtbase ''
;;
- XPDF_HEADERS) echo "XPDF_HEADERS requested, forcing
-DENABLE_XPDF_HEADERS=ON" &&
- list_add XPDF_HEADERS "-DENABLE_XPDF_HEADERS=ON"
+ XPDF_HEADERS) echo "XPDF_HEADERS requested, forcing
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON" &&
+ list_add XPDF_HEADERS "-DENABLE_UNSTABLE_API_ABI_HEADERS=ON"
;;
*) echo unknown sub-depends!!! ; return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ad66619099a808fdc5b14c6adafa8c612d50430b), Pavel Vinogradov, 01/08/2019

Archive powered by MHonArc 2.6.24.

Top of Page