Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8e69240aa05a037caf21635fee2a9ecff0123be8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8e69240aa05a037caf21635fee2a9ecff0123be8)
  • Date: Sun, 11 Apr 2021 12:05:00 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 6 +++++-
graphics-libs/poppler/BUILD | 2 +-
graphics-libs/poppler/DEPENDS | 1 +
graphics-libs/poppler/HISTORY | 4 ++++
5 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 8e69240aa05a037caf21635fee2a9ecff0123be8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

FUNCTIONS - support qt6

commit 384a7b7d0a69eefd8c3632480b1206cec42728d4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

poppler - add qt6 support

diff --git a/ChangeLog b/ChangeLog
index c40daeb..4470bd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2021-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: add qt6 support to cmake_build
+
2021-04-06 Treeve Jelbert <treeve AT sourcemage.org>
* kde.gpg: add "Vlad Zahorodnii <vlad.zahorodnii AT kde.org>"

diff --git a/FUNCTIONS b/FUNCTIONS
index d770aa0..09c0047 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -4,6 +4,7 @@

QT4DIR=$INSTALL_ROOT/opt/qt4
QT5DIR=$INSTALL_ROOT/usr
+QT6DIR=$INSTALL_ROOT/opt/qt6

qt5_build() {
# qmake uses its own flag settings
@@ -691,13 +692,16 @@ cmake_build() {

message INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX &&

+ if is_depends_enabled $SPELL qt6base;then
+ OPTS+=" -DCMAKE_PREFIX_PATH=$QT6DIR/lib/cmake"
+ fi &&
+
cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
-DCMAKE_INSTALL_DATADIR=share \
-DCMAKE_INSTALL_DOCDIR=share/doc \
-DCMAKE_INSTALL_INCLUDEDIR=include \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_MANDIR=share/man \
- -DCMAKE_PREFIX_PATH=share/apps/cmake/modules \
-DCMAKE_INSTALL_SYSCONFDIR=$INSTALL_ROOT/etc \
-DCMAKE_BUILD_TYPE=$CM_BUILD_TYPE \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index 4fdef46..eeaa796 100755
--- a/graphics-libs/poppler/BUILD
+++ b/graphics-libs/poppler/BUILD
@@ -1,3 +1,3 @@
+OPTS+=" -DBUILD_QT5_TESTS=0 -DBUILD_QT6_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/DEPENDS b/graphics-libs/poppler/DEPENDS
index 5be853a..8feb3fd 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -17,5 +17,6 @@ optional_depends tiff '' '' 'for TIFF support' &&
optional_depends zlib '' '' "for compressed file support" &&
optional_depends gtk+3 -DBUILD_GTK_TESTS={ON,OFF} "GTK tests" &&
optional_depends qtbase -DENABLE_QT5={ON,OFF} "Qt5 support" &&
+optional_depends qt6base -DENABLE_QT6={ON,OFF} "Qt6 support" &&
optional_depends cairo '' '' 'for cairo output' &&
optional_depends gtk-doc '' '' 'build GTK documentation'
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index eed8b74..ee999fc 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,7 @@
+2021-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add optional qt6base
+ * BUILD: disable QT? tests
+
2021-04-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 21.04.0




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8e69240aa05a037caf21635fee2a9ecff0123be8), Treeve Jelbert, 04/11/2021

Archive powered by MHonArc 2.6.24.

Top of Page