Skip to Content.
Sympa Menu

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

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 (d7810bc5a33919335e885446fe166d19423d4463)
  • Date: Sat, 22 Apr 2023 11:33:09 +0000

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

kde-gear/kate/DEPENDS | 3 +++
kde-gear/kate/HISTORY | 3 +++
kde5-apps/plasma-pass/DEPENDS | 5 ++++-
kde5-apps/plasma-pass/HISTORY | 1 +
qt5-cmake/simple-mail/DEPENDS | 2 +-
qt5-cmake/simple-mail/HISTORY | 3 +++
qt5-qmake/dooble/HISTORY | 3 +++
qt5-qmake/dooble/INSTALL | 2 +-
qt6/qt6base/HISTORY | 3 +++
qt6/qt6base/INSTALL | 4 ++++
qt6/qt6base/qt.sh | 15 +++++++++++++++
11 files changed, 41 insertions(+), 3 deletions(-)

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

qt6base - install a profile for some users

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

dooble - fi x install loc

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

kate - fix kf6 build

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

simple-mail - fix depends for qt6

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

plasma-pass - add plasma5support for qt6

diff --git a/kde-gear/kate/DEPENDS b/kde-gear/kate/DEPENDS
index 1edb354..1176851 100755
--- a/kde-gear/kate/DEPENDS
+++ b/kde-gear/kate/DEPENDS
@@ -1,4 +1,7 @@
source $GRIMOIRE/KDE_DEPENDS
+if is_depends_enabled $SPELL qt6base;then
+ depends kmoretools
+fi &&
depends kactivities &&
depends kconfig &&
depends kcrash &&
diff --git a/kde-gear/kate/HISTORY b/kde-gear/kate/HISTORY
index 00b4495..b988fe4 100644
--- a/kde-gear/kate/HISTORY
+++ b/kde-gear/kate/HISTORY
@@ -1,3 +1,6 @@
+2023-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: kf6 needs kmoretools
+
2023-01-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: tweak

diff --git a/kde5-apps/plasma-pass/DEPENDS b/kde5-apps/plasma-pass/DEPENDS
index 50e0a5c..85bba4d 100755
--- a/kde5-apps/plasma-pass/DEPENDS
+++ b/kde5-apps/plasma-pass/DEPENDS
@@ -1,6 +1,9 @@
source $GRIMOIRE/KDE_DEPENDS &&
if is_depends_enabled $SPELL qt6base;then
- depends qt6declarative
+ depends qt6declarative &&
+ depends plasma5support &&
+ depends kcoreaddons &&
+ depends kconfig
else
depends qtdeclarative
fi &&
diff --git a/kde5-apps/plasma-pass/HISTORY b/kde5-apps/plasma-pass/HISTORY
index 909bb80..4ae6cc1 100644
--- a/kde5-apps/plasma-pass/HISTORY
+++ b/kde5-apps/plasma-pass/HISTORY
@@ -1,6 +1,7 @@
2023-04-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.1
* DEPENDS: qt6 support, add gpgme
+ also plasma5support

2021-03-11 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add oath-toolkit, remove GNUPG
diff --git a/qt5-cmake/simple-mail/DEPENDS b/qt5-cmake/simple-mail/DEPENDS
index 071b873..470e7ed 100755
--- a/qt5-cmake/simple-mail/DEPENDS
+++ b/qt5-cmake/simple-mail/DEPENDS
@@ -1,3 +1,3 @@
source $GRIMOIRE/CMAKE_DEPENDS &&
-source $GRIMOIRE/QT5_DEPENDS
+source $GRIMOIRE/QT_DEPENDS

diff --git a/qt5-cmake/simple-mail/HISTORY b/qt5-cmake/simple-mail/HISTORY
index 1a74c45..b494997 100644
--- a/qt5-cmake/simple-mail/HISTORY
+++ b/qt5-cmake/simple-mail/HISTORY
@@ -1,3 +1,6 @@
+2023-04-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: fix for qt6
+
2021-01-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.3.0

diff --git a/qt5-qmake/dooble/HISTORY b/qt5-qmake/dooble/HISTORY
index a633686..0f084bb 100644
--- a/qt5-qmake/dooble/HISTORY
+++ b/qt5-qmake/dooble/HISTORY
@@ -1,3 +1,6 @@
+2023-04-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL; fix location
+
2023-04-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2023.04.01
* *: add qt6 support
diff --git a/qt5-qmake/dooble/INSTALL b/qt5-qmake/dooble/INSTALL
index 311933d..36a5843 100755
--- a/qt5-qmake/dooble/INSTALL
+++ b/qt5-qmake/dooble/INSTALL
@@ -1,4 +1,4 @@
cd $SOURCE_DIRECTORY &&
-DEST=$INSTALL_ROOT/bin &&
+DEST=$INSTALL_ROOT/usr/bin &&
mkdir -p $DEST &&
cp Dooble $DEST
diff --git a/qt6/qt6base/HISTORY b/qt6/qt6base/HISTORY
index 61bd2ba..9f8dcf3 100644
--- a/qt6/qt6base/HISTORY
+++ b/qt6/qt6base/HISTORY
@@ -1,3 +1,6 @@
+2023-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * INsTALL qt.sh: added, needby some qt6 users, especially kde6
+
2023-04-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 6.5.0

diff --git a/qt6/qt6base/INSTALL b/qt6/qt6base/INSTALL
new file mode 100755
index 0000000..e554458
--- /dev/null
+++ b/qt6/qt6base/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
+install -m 0644 $SCRIPT_DIRECTORY/qt.sh \
+ ${INSTALL_ROOT}/etc/profile.d/
diff --git a/qt6/qt6base/qt.sh b/qt6/qt6base/qt.sh
new file mode 100644
index 0000000..dc2ba11
--- /dev/null
+++ b/qt6/qt6base/qt.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# since qt6 is installed to /opt/qt6, users of qt/qml and qt/plugins need to
be findable by qt6
+# this espacially applies to much of kde
+
+
+
+# for kde6
+export
XDG_DATA_DIRS=/usr/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}
+export XDG_CONFIG_DIRS=/etc/xdg:${XDG_CONFIG_DIRS:-/etc/xdg}
+
+export QT_PLUGIN_PATH=/usr/lib/plugins:$QT_PLUGIN_PATH
+export QML2_IMPORT_PATH=/usr/lib/qml:$QML2_IMPORT_PATH
+
+export
QT_QUICK_CONTROLS_STYLE_PATH=/usr/lib/qml/QtQuick/Controls.2/:$QT_QUICK_CONTROLS_STYLE_PATH



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d7810bc5a33919335e885446fe166d19423d4463), Treeve Jelbert, 04/22/2023

Archive powered by MHonArc 2.6.24.

Top of Page