diff options
| author | Treeve Jelbert | 2022-04-10 09:30:29 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2022-04-10 09:30:29 +0200 |
| commit | fba5127d5e25a13b94cc0fc058816209b7a9b833 (patch) | |
| tree | e67fef5966d39fa5dd4676aa406431db174b921d | |
| parent | 9528cfda6504c8a1d65cc73027b5cf4a7aa4a688 (diff) | |
KDE5*: prepare for qt6
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | KDE5_DEPENDS | 5 | ||||
| -rwxr-xr-x | KDE5_FUNCTIONS | 22 |
3 files changed, 13 insertions, 17 deletions
@@ -1,3 +1,6 @@ +2022-04-10 Treeve Jelbert <treeve@sourcemage.org> + * KDE5*: prepare for qt6 + 2022-04-03 Vlad Glagolev <stealth@sourcemage.org> * wm-addons/devilspie2: new spell, window matching utility, based on original devilspie diff --git a/KDE5_DEPENDS b/KDE5_DEPENDS index 4d97682aeb..d0863be5e1 100755 --- a/KDE5_DEPENDS +++ b/KDE5_DEPENDS @@ -1,7 +1,8 @@ source $GRIMOIRE/CMAKE_DEPENDS && depends -sub CXX gcc && -#optional_depends qt6base '' '' 'build with qt6' -if ! is_depends_enabled $SPELL qt6base;then +if [[ -f /etc/KDE_USE_QT6 ]];then + depends qt6base +else depends -sub ACCESS qtbase && depends qtx11extras fi && diff --git a/KDE5_FUNCTIONS b/KDE5_FUNCTIONS index 7948cb5711..83b7a3577c 100755 --- a/KDE5_FUNCTIONS +++ b/KDE5_FUNCTIONS @@ -1,36 +1,28 @@ -KF5DIR="$INSTALL_ROOT/usr" -export XDG_DATA_DIRS=/usr/share - -#--------------------------------------------------------------------- default_build() { CXXFLAGS+=' -Wno-deprecated-declarations' - OPTS+=" -DLIB_INSTALL_DIR=lib" - OPTS+=" -Wno-dev $CM_TESTS" +# OPTS+=" -Wno-dev" + OPTS+=" $CM_TESTS" OPTS+=" -DKDE_SKIP_UNINSTALL_TARGET=1" if is_depends_enabled $SPELL qt6base;then - OPTS+=" -DBUILD_WITH_QT6=1" - OPTS+=" -DCMAKE_INSTALL_PREFIX=${QT6DIR}" - cmake_build $QT6DIR - else - cmake_build + OPTS+=" -DCMAKE_PREFIX_PATH=/opt/qt6" + OPTS+=" -DBUILD_WITH_QT6=ON" fi +cmake_build } - function default_install() { cmake_install } - # we need a default_final, default_post_remove # so that the mime and desktop databases get updated update_databases() { local DD - DD=$KF5DIR -# update-mime-database takes a long time, so only do it when needed + DD=$INSTALL_ROOT/usr if is_depends_enabled $SPELL shared-mime-info;then update-mime-database $DD/share/mime/ fi + if [[ -e $DD/share/desktop-directories ]]; then update-desktop-database $DD/share/desktop-directories fi |