Skip to Content.
Sympa Menu

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

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 (531de3789cb8ccccc9f0b584c4e33839bb358929)
  • Date: Fri, 24 Jun 2022 12:21:03 +0000

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

kde5-net/falkon/DEPENDS | 12 +++++++++---
kde5-net/falkon/HISTORY | 3 +++
kde5-net/kdeconnect/DEPENDS | 6 +++++-
kde5-net/kdeconnect/HISTORY | 3 +++
kde5-net/kio-extras/DEPENDS | 13 +++++++++----
kde5-net/kio-extras/HISTORY | 3 +++
kde5-net/konqueror/DEPENDS | 9 +++++++--
kde5-net/konqueror/HISTORY | 3 +++
kde5-net/konversation/DEPENDS | 6 +++++-
kde5-net/konversation/HISTORY | 3 +++
kde5-net/ktorrent/DEPENDS | 12 ++++++++----
kde5-net/ktorrent/HISTORY | 3 +++
kde5-sdk/kdevelop/DEPENDS | 13 +++++++++----
kde5-sdk/kdevelop/DETAILS | 2 +-
kde5-sdk/kdevelop/HISTORY | 4 ++++
kde5-sdk/kompare/DETAILS | 2 +-
kde5-sdk/kompare/HISTORY | 3 +++
kde5-sdk/lokalize/DETAILS | 2 +-
kde5-sdk/lokalize/HISTORY | 3 +++
19 files changed, 83 insertions(+), 22 deletions(-)

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

lokalize: => 22.04.2

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

kompare: => 22.04.2

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

kdevelop: => 22.04.2

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

ktorrent - adjust for qt6

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

konversation - adjust for qt6

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

konqueror - adjust for qt6

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

kio-extras - adjust for qt6

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

kdeconnect - adjust for qt6

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

falkon - adjust for qt6

diff --git a/kde5-net/falkon/DEPENDS b/kde5-net/falkon/DEPENDS
index 7322b1e..65399a2 100755
--- a/kde5-net/falkon/DEPENDS
+++ b/kde5-net/falkon/DEPENDS
@@ -1,7 +1,13 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtdeclarative &&
-depends qtwebchannel &&
-depends qtwebengine &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative &&
+ depends qt6webchannel &&
+ depends qt6webengine
+else
+ depends qtdeclarative &&
+ depends qtwebchannel &&
+ depends qtwebengine
+fi &&
depends libx11 &&
depends libxcb &&
depends SSL &&
diff --git a/kde5-net/falkon/HISTORY b/kde5-net/falkon/HISTORY
index a1fbdc1..c58f0b6 100644
--- a/kde5-net/falkon/HISTORY
+++ b/kde5-net/falkon/HISTORY
@@ -1,3 +1,6 @@
+2022-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: adjust for qt6
+
2022-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 22.04.2

diff --git a/kde5-net/kdeconnect/DEPENDS b/kde5-net/kdeconnect/DEPENDS
index e5b7114..8c3ef07 100755
--- a/kde5-net/kdeconnect/DEPENDS
+++ b/kde5-net/kdeconnect/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 kcmutils &&
depends kconfig &&
depends kconfigwidgets &&
diff --git a/kde5-net/kdeconnect/HISTORY b/kde5-net/kdeconnect/HISTORY
index 9e630ab..26976e7 100644
--- a/kde5-net/kdeconnect/HISTORY
+++ b/kde5-net/kdeconnect/HISTORY
@@ -1,3 +1,6 @@
+2022-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: adjust for qt6
+
2022-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 22.04.2

diff --git a/kde5-net/kio-extras/DEPENDS b/kde5-net/kio-extras/DEPENDS
index cafdf74..c00808f 100755
--- a/kde5-net/kio-extras/DEPENDS
+++ b/kde5-net/kio-extras/DEPENDS
@@ -1,5 +1,11 @@
-source $GRIMOIRE/KDE5_DEPENDS
-depends qtsvg &&
+source $GRIMOIRE/KDE5_DEPENDS &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6svg &&
+ optional_depends qt6webengine '' '
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=1' 'html thumbnail viewer'
+else
+ depends qtsvg &&
+ optional_depends qtwebengine '' '
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=1' 'html thumbnail viewer'
+fi &&
depends kactivities5 &&
depends karchive &&
depends kbookmarks &&
@@ -25,5 +31,4 @@ optional_depends samba4 '' '' 'SMB/CIFS support' &&
optional_depends exiv2 '' '' 'image metadata' &&
optional_depends slp '' '' 'Service Location Protocol' &&
optional_depends openexr '' '' 'OpenEXR formatted images' &&
-optional_depends phonon '' '' 'audio preview' &&
-optional_depends qtwebengine '' '
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=1' 'html thumbnail viewer'
+optional_depends phonon '' '' 'audio preview'
diff --git a/kde5-net/kio-extras/HISTORY b/kde5-net/kio-extras/HISTORY
index 28b2d09..8a68d26 100644
--- a/kde5-net/kio-extras/HISTORY
+++ b/kde5-net/kio-extras/HISTORY
@@ -1,3 +1,6 @@
+2022-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: adjust for qt6
+
2022-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 22.04.2

diff --git a/kde5-net/konqueror/DEPENDS b/kde5-net/konqueror/DEPENDS
index db59209..87353d0 100755
--- a/kde5-net/konqueror/DEPENDS
+++ b/kde5-net/konqueror/DEPENDS
@@ -1,5 +1,11 @@
source $GRIMOIRE/KDE5_DEPENDS &&
-depends qtwebengine &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6webengine &&
+ optional_depends qt6speech '' '' 'speech support'
+else
+ depends qtwebengine &&
+ optional_depends qtspeech '' '' 'speech support'
+fi &&
depends karchive &&
depends kbookmarks &&
depends kcmutils &&
@@ -24,7 +30,6 @@ depends zlib &&

optional_depends kactivities5 '' '' 'Activity support' &&
optional_depends kdoctools '' '' 'build docs' &&
-optional_depends qtspeech '' '' 'speech support' &&

#runtime_depends kio-extras &&
suggest_depends keditbookmarks '' '' 'manage bookmarks'
diff --git a/kde5-net/konqueror/HISTORY b/kde5-net/konqueror/HISTORY
index dca579f..d00ff02 100644
--- a/kde5-net/konqueror/HISTORY
+++ b/kde5-net/konqueror/HISTORY
@@ -1,3 +1,6 @@
+2022-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: adjust for qt6
+
2022-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 22.04.2

diff --git a/kde5-net/konversation/DEPENDS b/kde5-net/konversation/DEPENDS
index 74997f4..4569fa0 100755
--- a/kde5-net/konversation/DEPENDS
+++ b/kde5-net/konversation/DEPENDS
@@ -1,5 +1,9 @@
source "$GRIMOIRE/KDE5_DEPENDS" &&
-depends qtmultimedia &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6multimedia
+else
+ depends qtmultimedia
+fi &&
depends karchive &&
depends kbookmarks &&
depends kconfig &&
diff --git a/kde5-net/konversation/HISTORY b/kde5-net/konversation/HISTORY
index e5aab52..15b5ab5 100644
--- a/kde5-net/konversation/HISTORY
+++ b/kde5-net/konversation/HISTORY
@@ -1,3 +1,6 @@
+2022-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: adjust for qt6
+
2022-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 22.04.2

diff --git a/kde5-net/ktorrent/DEPENDS b/kde5-net/ktorrent/DEPENDS
index c4b1794..31fc787 100755
--- a/kde5-net/ktorrent/DEPENDS
+++ b/kde5-net/ktorrent/DEPENDS
@@ -1,5 +1,11 @@
. "$GRIMOIRE/KDE5_DEPENDS" &&
-depends qtscript &&
+if is_depends_enabled $SPELL qt6base;then
+ optional_depends qt6declarative '' '' '' &&
+ optional_depends qt6webengine '' '' 'search and syndication plugins'
+else
+ optional_depends qtdeclarative '' '' '' &&
+ optional_depends qtwebengine '' '' 'search and syndication plugins'
+fi &&
depends kcrash &&
depends kcmutils &&
depends kconfig &&
@@ -33,6 +39,4 @@ optional_depends kplotting '' '' 'statistics plugin' &&
optional_depends ktextwidgets '' '' 'IP Filter plugin' &&

optional_depends phonon '' '' 'multimedia plugin' &&
-optional_depends syndication '' ' -DENABLE_SYNDICATION_PLUGIN=0'
'syndication plugin' &&
-optional_depends qtdeclarative '' '' '' &&
-optional_depends qtwebengine '' '' 'search and syndication plugins'
+optional_depends syndication '' ' -DENABLE_SYNDICATION_PLUGIN=0'
'syndication plugin'
diff --git a/kde5-net/ktorrent/HISTORY b/kde5-net/ktorrent/HISTORY
index 4a19faa..cf04a46 100644
--- a/kde5-net/ktorrent/HISTORY
+++ b/kde5-net/ktorrent/HISTORY
@@ -1,3 +1,6 @@
+2022-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: adjust for qt6
+
2022-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 22.04.2

diff --git a/kde5-sdk/kdevelop/DEPENDS b/kde5-sdk/kdevelop/DEPENDS
index 4fd0cd7..bf51564 100755
--- a/kde5-sdk/kdevelop/DEPENDS
+++ b/kde5-sdk/kdevelop/DEPENDS
@@ -1,7 +1,11 @@
source "$GRIMOIRE/KDE5_DEPENDS" &&
-depends qtdeclarative &&
-depends qtscript &&
-depends qtwebkit &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative &&
+ optional_depends qt6webengine '' '' ''
+else
+ depends qtdeclarative &&
+ optional_depends qtwebengine '' '' ''
+fi &&
depends kcmutils &&
depends ki18n &&
depends kio &&
@@ -20,4 +24,5 @@ depends shared-mime-info &&
optional_depends llvm '' '-DLEGACY_CPP_SUPPORT=1' 'modern C++ backend' &&
optional_depends okteta '' '' 'build Okteta plugin' &&
optional_depends gdb '' '' 'GNU Debugger'&&
-optional_depends valgrind '' '' 'find memory leaks'
+optional_depends valgrind '' '' 'find memory leaks' &&
+optional_depends libksysguard '' '' 'Attach to Process feature'
diff --git a/kde5-sdk/kdevelop/DETAILS b/kde5-sdk/kdevelop/DETAILS
index d42424c..e849118 100755
--- a/kde5-sdk/kdevelop/DETAILS
+++ b/kde5-sdk/kdevelop/DETAILS
@@ -1,5 +1,5 @@
SPELL=kdevelop
- VERSION=21.12.1
+ VERSION=22.04.2
SOURCE=$SPELL-${VERSION}.tar.xz

SOURCE_URL=https://download.kde.org/stable/release-service/${VERSION}/src/$SOURCE
SOURCE2=$SOURCE.asc
diff --git a/kde5-sdk/kdevelop/HISTORY b/kde5-sdk/kdevelop/HISTORY
index 5018089..b60be18 100644
--- a/kde5-sdk/kdevelop/HISTORY
+++ b/kde5-sdk/kdevelop/HISTORY
@@ -1,3 +1,7 @@
+2022-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 22.04.2
+ * DEPENDS: adjust for qt6
+
2022-01-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 21.12.1

diff --git a/kde5-sdk/kompare/DETAILS b/kde5-sdk/kompare/DETAILS
index ff99d7a..cf4a745 100755
--- a/kde5-sdk/kompare/DETAILS
+++ b/kde5-sdk/kompare/DETAILS
@@ -1,5 +1,5 @@
SPELL=kompare
- VERSION=22.04.0
+ VERSION=22.04.2
SOURCE=$SPELL-$VERSION.tar.xz

SOURCE_URL=https://download.kde.org/stable/release-service/${VERSION}/src/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-sdk/kompare/HISTORY b/kde5-sdk/kompare/HISTORY
index e78b789..e4fecd5 100644
--- a/kde5-sdk/kompare/HISTORY
+++ b/kde5-sdk/kompare/HISTORY
@@ -1,3 +1,6 @@
+2022-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 22.04.2
+
2022-04-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 22.04.0

diff --git a/kde5-sdk/lokalize/DETAILS b/kde5-sdk/lokalize/DETAILS
index a08fdbd..9d3577f 100755
--- a/kde5-sdk/lokalize/DETAILS
+++ b/kde5-sdk/lokalize/DETAILS
@@ -1,5 +1,5 @@
SPELL=lokalize
- VERSION=22.04.0
+ VERSION=22.04.2
SOURCE=$SPELL-$VERSION.tar.xz

SOURCE_URL=https://download.kde.org/stable/release-service/${VERSION}/src/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-sdk/lokalize/HISTORY b/kde5-sdk/lokalize/HISTORY
index aef56fa..a249c17 100644
--- a/kde5-sdk/lokalize/HISTORY
+++ b/kde5-sdk/lokalize/HISTORY
@@ -1,3 +1,6 @@
+2022-06-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 22.04.2
+
2022-04-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 22.04.0




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (531de3789cb8ccccc9f0b584c4e33839bb358929), Treeve Jelbert, 06/24/2022

Archive powered by MHonArc 2.6.24.

Top of Page