diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rwxr-xr-x | KDE5_DEPENDS | 7 | ||||
-rwxr-xr-x | KDE5_FUNCTIONS | 14 |
3 files changed, 16 insertions, 8 deletions
@@ -1,3 +1,6 @@ +2022-02-16 Treeve Jelbert <treeve@sourcemage.org> + * KDE5_*: prepare for qt6/6 + 2022-02-13 Ismael Luceno <ismael@sourcemage.org> * editors/se: new spell, screen oriented version of the classic UNIX text editor ed diff --git a/KDE5_DEPENDS b/KDE5_DEPENDS index 43572284f9..4d97682aeb 100755 --- a/KDE5_DEPENDS +++ b/KDE5_DEPENDS @@ -1,5 +1,8 @@ source $GRIMOIRE/CMAKE_DEPENDS && depends -sub CXX gcc && -depends -sub ACCESS qtbase && -depends qtx11extras && +#optional_depends qt6base '' '' 'build with qt6' +if ! is_depends_enabled $SPELL qt6base;then + depends -sub ACCESS qtbase && + depends qtx11extras +fi && depends extra-cmake-modules diff --git a/KDE5_FUNCTIONS b/KDE5_FUNCTIONS index 302b4c6f99..7948cb5711 100755 --- a/KDE5_FUNCTIONS +++ b/KDE5_FUNCTIONS @@ -2,19 +2,21 @@ KF5DIR="$INSTALL_ROOT/usr" export XDG_DATA_DIRS=/usr/share #--------------------------------------------------------------------- -function kde5_build() { +default_build() { CXXFLAGS+=' -Wno-deprecated-declarations' OPTS+=" -DLIB_INSTALL_DIR=lib" OPTS+=" -Wno-dev $CM_TESTS" OPTS+=" -DKDE_SKIP_UNINSTALL_TARGET=1" - qt5_cmake_build + if is_depends_enabled $SPELL qt6base;then + OPTS+=" -DBUILD_WITH_QT6=1" + OPTS+=" -DCMAKE_INSTALL_PREFIX=${QT6DIR}" + cmake_build $QT6DIR + else + cmake_build + fi } -default_build() { - kde5_build -} - function default_install() { cmake_install } |