Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ea41157aad192bdc976daf679feb9f6de88aba16)

Chronological Thread  
    < 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 (ea41157aad192bdc976daf679feb9f6de88aba16)
  • Date: Wed, 16 Feb 2022 13:29:13 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 +++
KDE5_DEPENDS | 7 +++++--
KDE5_FUNCTIONS | 14 ++++++++------
kde-frameworks/baloo5/DEPENDS | 7 +++++--
kde-frameworks/baloo5/HISTORY | 3 +++
kde-frameworks/kcmutils/DEPENDS | 6 +++++-
kde-frameworks/kcmutils/HISTORY | 3 +++
kde-frameworks/kdeclarative/DEPENDS | 10 +++++++---
kde-frameworks/kdeclarative/HISTORY | 3 +++
kde-frameworks/kholidays/DEPENDS | 6 +++++-
kde-frameworks/kholidays/HISTORY | 3 +++
kde-frameworks/ki18n/DEPENDS | 6 +++++-
kde-frameworks/ki18n/HISTORY | 3 +++
kde-frameworks/kiconthemes/DEPENDS | 6 +++++-
kde-frameworks/kiconthemes/HISTORY | 3 +++
kde-frameworks/kio/DEPENDS | 8 +++++++-
kde-frameworks/kio/HISTORY | 3 +++
kde-frameworks/kirigami2/DEPENDS | 19 +++++++++++++------
kde-frameworks/kirigami2/HISTORY | 3 +++
kde-frameworks/knewstuff/DEPENDS | 6 +++++-
kde-frameworks/knewstuff/HISTORY | 3 +++
kde-frameworks/kquickcharts/DEPENDS | 8 ++++++--
kde-frameworks/kquickcharts/HISTORY | 3 +++
kde-frameworks/krunner/DEPENDS | 7 +++++--
kde-frameworks/krunner/HISTORY | 3 +++
kde-frameworks/ktexteditor/DEPENDS | 6 +++++-
kde-frameworks/ktexteditor/HISTORY | 3 +++
kde-frameworks/plasma-framework/DEPENDS | 10 +++++++---
kde-frameworks/plasma-framework/HISTORY | 3 +++
kde-frameworks/qqc2-desktop-style/DEPENDS | 10 +++++++---
kde-frameworks/qqc2-desktop-style/HISTORY | 3 +++
kde-frameworks/syntax-highlighting/DEPENDS | 10 ++++++++--
kde-frameworks/syntax-highlighting/HISTORY | 3 +++
33 files changed, 156 insertions(+), 38 deletions(-)

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

syntax-highlighting - prepare for qt6 usage

commit 1d383339e9d7565f1f03a6c1d087e445a06926c5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qqc2-desktop-style - prepare for qt6 usage

commit 36e19fd3b7c750bb6f7f629daf8ed0068aa633af
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

plasma-framework - prepare for qt6 usage

commit 02d7b19d1cb40ba7c836b892ba6997c1a098bfab
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ktexteditor - prepare for qt6 usage

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

krunner - prepare for qt6 usage

commit 018a46c9ac35ad9d6844d53172c88a5dca45478d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kquickcharts - prepare for qt6 usage

commit 1caed5e5f79afca558ae81deff4540006eb75c0f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

knewstuff - prepare for qt6 usage

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

kio - prepare for qt6 usage

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

kiconthemes - prepare for qt6 usage

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

ki18n - prepare for qt6 usage

commit 5ab1a77288bb57f9bd2e669f45570d234ff66a22
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kholidays - prepare for qt6 usage

commit 8781fbc70796caccd892d8e899494a61377d6880
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdeclarative - prepare for qt6 usage

commit 266edbc15d74589b13bb3d18203918f4bd4e5be9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kcmutils - prepare for qt6 usage

commit 0dc7fcfde517984477acd0707a2d7a0846c6e2cc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

baloo5 - prepare for qt6 usage

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

kirigami2 - prepare for qt6 usage

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

KDE5_* - prepare for qt6

diff --git a/ChangeLog b/ChangeLog
index 48876ae..c0d54f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * KDE5_*: prepare for qt6/6
+
2022-02-13 Ismael Luceno <ismael AT 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 4357228..4d97682 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 302b4c6..7948cb5 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
}
diff --git a/kde-frameworks/baloo5/DEPENDS b/kde-frameworks/baloo5/DEPENDS
index 4f20824..5a754e3 100755
--- a/kde-frameworks/baloo5/DEPENDS
+++ b/kde-frameworks/baloo5/DEPENDS
@@ -1,6 +1,9 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtdeclarative &&
-
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative
+else
+ depends qtdeclarative
+fi &&
depends kauth &&
depends kconfig &&
depends kcrash &&
diff --git a/kde-frameworks/baloo5/HISTORY b/kde-frameworks/baloo5/HISTORY
index 5ffb31a..8096582 100644
--- a/kde-frameworks/baloo5/HISTORY
+++ b/kde-frameworks/baloo5/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/kcmutils/DEPENDS b/kde-frameworks/kcmutils/DEPENDS
index 0953874..5898dc3 100755
--- a/kde-frameworks/kcmutils/DEPENDS
+++ b/kde-frameworks/kcmutils/DEPENDS
@@ -1,5 +1,9 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtdeclarative &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative
+else
+ depends qtdeclarative
+fi &&
depends kconfigwidgets &&
depends kcoreaddons &&
depends kdeclarative &&
diff --git a/kde-frameworks/kcmutils/HISTORY b/kde-frameworks/kcmutils/HISTORY
index 264b56d..a1bf8a2 100644
--- a/kde-frameworks/kcmutils/HISTORY
+++ b/kde-frameworks/kcmutils/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/kdeclarative/DEPENDS
b/kde-frameworks/kdeclarative/DEPENDS
index f3eb309..c043a49 100755
--- a/kde-frameworks/kdeclarative/DEPENDS
+++ b/kde-frameworks/kdeclarative/DEPENDS
@@ -1,4 +1,10 @@
source $GRIMOIRE/KDE5_DEPENDS &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative
+else
+ depends qtdeclarative &&
+ depends qtquickcontrols2
+fi &&
depends kconfig &&
depends kglobalaccel &&
depends kguiaddons &&
@@ -8,6 +14,4 @@ depends kio &&
depends kpackage &&
depends kwidgetsaddons &&
depends kwindowsystem &&
-depends libepoxy &&
-depends qtdeclarative &&
-depends qtquickcontrols2
+depends libepoxy
diff --git a/kde-frameworks/kdeclarative/HISTORY
b/kde-frameworks/kdeclarative/HISTORY
index c634e29..12d780b 100644
--- a/kde-frameworks/kdeclarative/HISTORY
+++ b/kde-frameworks/kdeclarative/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/kholidays/DEPENDS
b/kde-frameworks/kholidays/DEPENDS
index d32e313..5ebae6b 100755
--- a/kde-frameworks/kholidays/DEPENDS
+++ b/kde-frameworks/kholidays/DEPENDS
@@ -1,2 +1,6 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtdeclarative
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative
+else
+ depends qtdeclarative
+fi
diff --git a/kde-frameworks/kholidays/HISTORY
b/kde-frameworks/kholidays/HISTORY
index cd759d2..792afd4 100644
--- a/kde-frameworks/kholidays/HISTORY
+++ b/kde-frameworks/kholidays/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/ki18n/DEPENDS b/kde-frameworks/ki18n/DEPENDS
index 4ae62d7..6bf1648 100755
--- a/kde-frameworks/ki18n/DEPENDS
+++ b/kde-frameworks/ki18n/DEPENDS
@@ -1,2 +1,6 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtdeclarative
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative
+else
+ depends qtdeclarative
+fi
diff --git a/kde-frameworks/ki18n/HISTORY b/kde-frameworks/ki18n/HISTORY
index 83ef58c..7e753b7 100644
--- a/kde-frameworks/ki18n/HISTORY
+++ b/kde-frameworks/ki18n/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/kiconthemes/DEPENDS
b/kde-frameworks/kiconthemes/DEPENDS
index dde7873..5a0c380 100755
--- a/kde-frameworks/kiconthemes/DEPENDS
+++ b/kde-frameworks/kiconthemes/DEPENDS
@@ -1,5 +1,9 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtsvg &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6svg
+else
+ depends qtsvg
+fi &&
depends ki18n &&
depends kconfigwidgets &&
depends kitemviews &&
diff --git a/kde-frameworks/kiconthemes/HISTORY
b/kde-frameworks/kiconthemes/HISTORY
index 921dc2d..2604222 100644
--- a/kde-frameworks/kiconthemes/HISTORY
+++ b/kde-frameworks/kiconthemes/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/kio/DEPENDS b/kde-frameworks/kio/DEPENDS
index 6d79d5cb..766feec 100755
--- a/kde-frameworks/kio/DEPENDS
+++ b/kde-frameworks/kio/DEPENDS
@@ -26,6 +26,12 @@ depends zlib &&

optional_depends kdoctools '' ' -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=1'
'build documentation' &&
optional_depends knotifications '' 'error notifications in kpac' &&
-optional_depends qtdeclarative '' '' 'Proxy Auto Configuration' &&
+
+if is_depends_enabled $SPELL qt6base;then
+ optional_depends qt6declarative '' '' 'Proxy Auto Configuration'
+else
+ optional_depends qtdeclarative '' '' 'Proxy Auto Configuration'
+fi &&
+
optional_depends acl '' '' 'support for Access Control Lists' &&
optional_depends krb5 '' ' -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI=1' 'support
HTTP authentication services'
diff --git a/kde-frameworks/kio/HISTORY b/kde-frameworks/kio/HISTORY
index 90b991a..d57f08f 100644
--- a/kde-frameworks/kio/HISTORY
+++ b/kde-frameworks/kio/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/kirigami2/DEPENDS
b/kde-frameworks/kirigami2/DEPENDS
index 7db53f9..29a08db 100755
--- a/kde-frameworks/kirigami2/DEPENDS
+++ b/kde-frameworks/kirigami2/DEPENDS
@@ -1,8 +1,15 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtdeclarative &&
-depends qtquickcontrols2 &&
-depends qtsvg &&
-depends qttools &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative &&
+ depends qtshadertools &&
+ depends qt6svg &&
+ depends qt6tools
+else
+ depends qtdeclarative &&
+ depends qtquickcontrols2 &&
+ depends qtsvg &&
+ depends qttools &&
+ runtime_depends qtgraphicaleffects
+fi &&
depends pkgconfig &&
-suggest_depends qqc2-desktop-style '' '' 'improved desktop integration' &&
-runtime_depends qtgraphicaleffects
+suggest_depends qqc2-desktop-style '' '' 'improved desktop integration'
diff --git a/kde-frameworks/kirigami2/HISTORY
b/kde-frameworks/kirigami2/HISTORY
index 93e7c2b..be23cde 100644
--- a/kde-frameworks/kirigami2/HISTORY
+++ b/kde-frameworks/kirigami2/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/knewstuff/DEPENDS
b/kde-frameworks/knewstuff/DEPENDS
index b518326..8f58e87 100755
--- a/kde-frameworks/knewstuff/DEPENDS
+++ b/kde-frameworks/knewstuff/DEPENDS
@@ -1,5 +1,9 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtdeclarative &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative
+else
+ depends qtdeclarative
+fi &&
depends attica5 &&
depends karchive &&
depends kbookmarks &&
diff --git a/kde-frameworks/knewstuff/HISTORY
b/kde-frameworks/knewstuff/HISTORY
index 6ba91d4..0d2bcef 100644
--- a/kde-frameworks/knewstuff/HISTORY
+++ b/kde-frameworks/knewstuff/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/kquickcharts/DEPENDS
b/kde-frameworks/kquickcharts/DEPENDS
index a9732d1..c116fca 100755
--- a/kde-frameworks/kquickcharts/DEPENDS
+++ b/kde-frameworks/kquickcharts/DEPENDS
@@ -1,3 +1,7 @@
source $GRIMOIRE/KDE5_DEPENDS
-depends qtdeclarative &&
-depends qtquickcontrols2
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative
+else
+ depends qtdeclarative &&
+ depends qtquickcontrols2
+fi
diff --git a/kde-frameworks/kquickcharts/HISTORY
b/kde-frameworks/kquickcharts/HISTORY
index 0ec2823..ccbac14 100644
--- a/kde-frameworks/kquickcharts/HISTORY
+++ b/kde-frameworks/kquickcharts/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/krunner/DEPENDS b/kde-frameworks/krunner/DEPENDS
index 5432fd0..b5bd039 100755
--- a/kde-frameworks/krunner/DEPENDS
+++ b/kde-frameworks/krunner/DEPENDS
@@ -1,6 +1,9 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtdeclarative &&
-
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative
+else
+ depends qtdeclarative
+fi &&
depends kconfig &&
depends kcoreaddons &&
depends ki18n &&
diff --git a/kde-frameworks/krunner/HISTORY b/kde-frameworks/krunner/HISTORY
index c981aec..6d66374 100644
--- a/kde-frameworks/krunner/HISTORY
+++ b/kde-frameworks/krunner/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/ktexteditor/DEPENDS
b/kde-frameworks/ktexteditor/DEPENDS
index 2b775de..90547a7 100755
--- a/kde-frameworks/ktexteditor/DEPENDS
+++ b/kde-frameworks/ktexteditor/DEPENDS
@@ -1,5 +1,9 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtdeclarative &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative
+else
+ depends qtdeclarative
+fi &&
depends karchive &&
depends kauth &&
depends kconfig &&
diff --git a/kde-frameworks/ktexteditor/HISTORY
b/kde-frameworks/ktexteditor/HISTORY
index d4661cc..6bf5bdc 100644
--- a/kde-frameworks/ktexteditor/HISTORY
+++ b/kde-frameworks/ktexteditor/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/plasma-framework/DEPENDS
b/kde-frameworks/plasma-framework/DEPENDS
index 357d405..4400ba0 100755
--- a/kde-frameworks/plasma-framework/DEPENDS
+++ b/kde-frameworks/plasma-framework/DEPENDS
@@ -5,9 +5,13 @@ depends libx11 &&
#depends libxext &&
depends libxcb &&
depends OPENGL &&
-depends qtsvg &&
-depends qtdeclarative &&
-
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative &&
+ depends qt6svg
+else
+ depends qtdeclarative &&
+ depends qtsvg
+fi &&
depends karchive &&
depends kcrash &&
depends kcoreaddons &&
diff --git a/kde-frameworks/plasma-framework/HISTORY
b/kde-frameworks/plasma-framework/HISTORY
index 272b0c5..d17a25a 100644
--- a/kde-frameworks/plasma-framework/HISTORY
+++ b/kde-frameworks/plasma-framework/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/qqc2-desktop-style/DEPENDS
b/kde-frameworks/qqc2-desktop-style/DEPENDS
index 2f7efbc..cbfd045 100755
--- a/kde-frameworks/qqc2-desktop-style/DEPENDS
+++ b/kde-frameworks/qqc2-desktop-style/DEPENDS
@@ -1,7 +1,11 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtdeclarative &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative
+else
+ depends qtdeclarative &&
+ runtime_depends qtquickcontrols2
+fi &&
depends pkgconfig &&
depends kconfigwidgets &&
depends kirigami2 &&
-depends kiconthemes &&
-runtime_depends qtquickcontrols2
+depends kiconthemes
diff --git a/kde-frameworks/qqc2-desktop-style/HISTORY
b/kde-frameworks/qqc2-desktop-style/HISTORY
index 95e5519..3baee06 100644
--- a/kde-frameworks/qqc2-desktop-style/HISTORY
+++ b/kde-frameworks/qqc2-desktop-style/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0

diff --git a/kde-frameworks/syntax-highlighting/DEPENDS
b/kde-frameworks/syntax-highlighting/DEPENDS
index 70ce311..4670b4f 100755
--- a/kde-frameworks/syntax-highlighting/DEPENDS
+++ b/kde-frameworks/syntax-highlighting/DEPENDS
@@ -1,3 +1,9 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qttools &&
-optional_depends qtxmlpatterns '' '' 'Compile-time validation of syntax
definition files'
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6tools
+else
+ depends qttools &&
+ optional_depends qtxmlpatterns '' '' 'Compile-time validation of syntax
definition files'
+fi
+
+
diff --git a/kde-frameworks/syntax-highlighting/HISTORY
b/kde-frameworks/syntax-highlighting/HISTORY
index 8c067a6..ad2f32b 100644
--- a/kde-frameworks/syntax-highlighting/HISTORY
+++ b/kde-frameworks/syntax-highlighting/HISTORY
@@ -1,3 +1,6 @@
+2022-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: prepare for qt6 usage
+
2022-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.91.0



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ea41157aad192bdc976daf679feb9f6de88aba16), Treeve Jelbert, 02/16/2022

Archive powered by MHonArc 2.6.24.

Top of Page