Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (a2b3ac6ffb8d923007a64ae65fdfe8f223319e33)
  • Date: Wed, 20 Sep 2023 11:21:33 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

dfl/dfl-applications/DETAILS | 4 +--
dfl/dfl-applications/HISTORY | 3 ++
dfl/dfl-ipc/DETAILS | 4 +--
dfl/dfl-ipc/HISTORY | 3 ++
dfl/dfl-login1/DETAILS | 4 +--
dfl/dfl-login1/HISTORY | 3 ++
dfl/dfl-utils/DETAILS | 4 +--
dfl/dfl-utils/HISTORY | 3 ++
dfl/dfl-wayqt/DETAILS | 4 +--
dfl/dfl-wayqt/HISTORY | 3 ++
dfl/dfl-xdg/DETAILS | 4 +--
dfl/dfl-xdg/HISTORY | 3 ++
dfl/qtgreet/BUILD | 2 +
dfl/qtgreet/CONFIGURE | 1
dfl/qtgreet/DEPENDS | 19 ++++++++++++++
dfl/qtgreet/DETAILS | 16 ++++++++++++
dfl/qtgreet/HISTORY | 9 ++++++
dfl/qtgreet/PRE_BUILD | 3 ++
dfl/qtgreet/patches/0001-fix-qt5-6-build.patch | 33
+++++++++++++++++++++++++
qt5-cmake/qtgreet/BUILD | 2 -
qt5-cmake/qtgreet/CONFIGURE | 1
qt5-cmake/qtgreet/DEPENDS | 18 -------------
qt5-cmake/qtgreet/DETAILS | 16 ------------
qt5-cmake/qtgreet/HISTORY | 3 --
24 files changed, 113 insertions(+), 52 deletions(-)

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

qtgreet - use meson build

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

qtgreet: => 1.99.3

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

move qtreet - now uses meson

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

dfl-xdg: => 0.1.99

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

dfl-wayqt: => 0.1.99

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

dfl-utils: => 0.1.99

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

dfl-login1: => 0.1.99

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

dfl-ipc: => 0.1.99

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

dfl-applications: => 0.1.99

diff --git a/dfl/dfl-applications/DETAILS b/dfl/dfl-applications/DETAILS
index 821db6d..337d13a 100755
--- a/dfl/dfl-applications/DETAILS
+++ b/dfl/dfl-applications/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=dfl-applications
- VERSION=0.1.1
-
SOURCE_HASH=sha512:ef81aa2e21cf5790917944fd637a111a0a735aeb58896f4e297492c7486d43976d5dc34597b1b7bfe004c146d2188abe2c566a37ef1df49fabbd07d18b839182
+ VERSION=0.1.99
+
SOURCE_HASH=sha512:48bb38c14ee0154906828c63fd122a6c4a4c201ccd73eb1dad06ab503d02a6bc899b38f9d1d4dacb841f683ccb31aeb871b85bb7f16486a7c9624b7a9e36b0cc
SPELLX=applications
SOURCE=$SPELLX-v$VERSION.tar.bz2
WEB_SITE=https://gitlab.com/desktop-frameworks
diff --git a/dfl/dfl-applications/HISTORY b/dfl/dfl-applications/HISTORY
index 2cf2935..bed5a19 100644
--- a/dfl/dfl-applications/HISTORY
+++ b/dfl/dfl-applications/HISTORY
@@ -1,3 +1,6 @@
+2023-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.99
+
2023-03-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.1

diff --git a/dfl/dfl-ipc/DETAILS b/dfl/dfl-ipc/DETAILS
index a11dbad..cea6c0e 100755
--- a/dfl/dfl-ipc/DETAILS
+++ b/dfl/dfl-ipc/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=dfl-ipc
- VERSION=0.1.1
-
SOURCE_HASH=sha512:e039e97a8ec807928d79c9ad0ace2bcf5804c018adc628f3458497de2aeb026ae8986207ccfb0c1d0e7c7f64d346037415e3ab11d6806845386238b12bc43e04
+ VERSION=0.1.99
+
SOURCE_HASH=sha512:55c63291936035776bca53409ae40b94b8ad5d923dd20842edf8dbd21e9692e01adab8a0d0807b86b413278f0ef8ddfe0e61f5542eceb7499e3c11d5221e1774
SPELLX=ipc
SOURCE=$SPELLX-v$VERSION.tar.bz2
WEB_SITE=https://gitlab.com/desktop-frameworks
diff --git a/dfl/dfl-ipc/HISTORY b/dfl/dfl-ipc/HISTORY
index e4ed032..fef9d87 100644
--- a/dfl/dfl-ipc/HISTORY
+++ b/dfl/dfl-ipc/HISTORY
@@ -1,3 +1,6 @@
+2023-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.99
+
2023-03-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.1

diff --git a/dfl/dfl-login1/DETAILS b/dfl/dfl-login1/DETAILS
index 3181c93..543e815 100755
--- a/dfl/dfl-login1/DETAILS
+++ b/dfl/dfl-login1/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=dfl-login1
- VERSION=0.1.1
-
SOURCE_HASH=sha512:06be3a310dc7e8c48eda4a1bfc63e499ef18adfd5d7f13d2f89157c3945657e695c5a7037322012585b26616b47366cd1968243f3c836c07bc44f0006d7b9e1a
+ VERSION=0.1.99
+
SOURCE_HASH=sha512:c606bfb1eb912f5aa0a7a524b15983b6adf7ce7b43e64429253c0cc848b0fb1a0716aac382aa5c8f89514cc3683945f30accfc899cf2913a79096379cd0f02d2
SPELLX=login1
SOURCE=$SPELLX-v$VERSION.tar.bz2
WEB_SITE=https://gitlab.com/desktop-frameworks
diff --git a/dfl/dfl-login1/HISTORY b/dfl/dfl-login1/HISTORY
index 2cf2935..bed5a19 100644
--- a/dfl/dfl-login1/HISTORY
+++ b/dfl/dfl-login1/HISTORY
@@ -1,3 +1,6 @@
+2023-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.99
+
2023-03-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.1

diff --git a/dfl/dfl-utils/DETAILS b/dfl/dfl-utils/DETAILS
index 0ab926c..0f54af5 100755
--- a/dfl/dfl-utils/DETAILS
+++ b/dfl/dfl-utils/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=dfl-utils
- VERSION=0.1.1
-
SOURCE_HASH=sha512:bc6dca0708467c282b93c86ca2a539e40fbaf861bd7ee23a5df49416b296bde279c615c93faab18ddaab0406b5003e76afa631a1ed9200cfc37d996aa035e57f
+ VERSION=0.1.99
+
SOURCE_HASH=sha512:278a2f3f784333c7410294fa3a8f8c348437a8bd2ac67f1a9acff75d2e383bc322590175273d6ef04d574b6fb56a15f01307f35d850e86d280fc17b362d394da
SPELLX=utils
SOURCE=$SPELLX-v$VERSION.tar.bz2
WEB_SITE=https://gitlab.com/desktop-frameworks
diff --git a/dfl/dfl-utils/HISTORY b/dfl/dfl-utils/HISTORY
index 2cf2935..bed5a19 100644
--- a/dfl/dfl-utils/HISTORY
+++ b/dfl/dfl-utils/HISTORY
@@ -1,3 +1,6 @@
+2023-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.99
+
2023-03-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.1

diff --git a/dfl/dfl-wayqt/DETAILS b/dfl/dfl-wayqt/DETAILS
index 503b461..16bfd9e 100755
--- a/dfl/dfl-wayqt/DETAILS
+++ b/dfl/dfl-wayqt/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=dfl-wayqt
- VERSION=0.1.1
-
SOURCE_HASH=sha512:bef6d661edb80f3c1a2b580689d76891d1583f52f1fca921d1c49d39d10b90cca6667c7334df7bd4c8319d5dcb63f180937db93505c70cd1d8b126f63ac21ef4
+ VERSION=0.1.99
+
SOURCE_HASH=sha512:3c41ff465657d0ead2b2b748a212cd902909bfc7adefb348377a6cbaa1cc98bb2720d4b1f6bbd9e27cdae54c8a294dd5822ad4fb37228111d2229eadbb5d9cd0
SPELLX=wayqt
SOURCE=$SPELLX-v$VERSION.tar.bz2
WEB_SITE=https://gitlab.com/desktop-frameworks
diff --git a/dfl/dfl-wayqt/HISTORY b/dfl/dfl-wayqt/HISTORY
index f6314df..d7ced67 100644
--- a/dfl/dfl-wayqt/HISTORY
+++ b/dfl/dfl-wayqt/HISTORY
@@ -1,2 +1,5 @@
+2023-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.99
+
2023-03-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.1
diff --git a/dfl/dfl-xdg/DETAILS b/dfl/dfl-xdg/DETAILS
index cf726c3..199227a 100755
--- a/dfl/dfl-xdg/DETAILS
+++ b/dfl/dfl-xdg/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=dfl-xdg
- VERSION=0.1.1
-
SOURCE_HASH=sha512:3e484c8283f9d8bb794b56b37bb870abac3359bf5bb0b2f60cd2e6a0474f3cd7246907aa65960a06bbf61a33d9538bbba650eb5cc5e7f00693d9656b0ccf0c5e
+ VERSION=0.1.99
+ SOURCE_HASH=sha512:
SPELLX=xdg
SOURCE=$SPELLX-v$VERSION.tar.bz2
WEB_SITE=https://gitlab.com/desktop-frameworks
diff --git a/dfl/dfl-xdg/HISTORY b/dfl/dfl-xdg/HISTORY
index 2cf2935..bed5a19 100644
--- a/dfl/dfl-xdg/HISTORY
+++ b/dfl/dfl-xdg/HISTORY
@@ -1,3 +1,6 @@
+2023-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.99
+
2023-03-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.1

diff --git a/dfl/qtgreet/BUILD b/dfl/qtgreet/BUILD
new file mode 100755
index 0000000..aea51ce
--- /dev/null
+++ b/dfl/qtgreet/BUILD
@@ -0,0 +1,2 @@
+cd $SOURCE_DIRECTORY/src &&
+default_build
diff --git a/dfl/qtgreet/CONFIGURE b/dfl/qtgreet/CONFIGURE
new file mode 100755
index 0000000..d0bac55
--- /dev/null
+++ b/dfl/qtgreet/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/MESON_CONFIGURE
diff --git a/dfl/qtgreet/DEPENDS b/dfl/qtgreet/DEPENDS
new file mode 100755
index 0000000..bbbd011
--- /dev/null
+++ b/dfl/qtgreet/DEPENDS
@@ -0,0 +1,19 @@
+source $GRIMOIRE/DFL_DEPENDS &&
+source $GRIMOIRE/depends_one_of.function &&
+
+depends dfl-applications &&
+depends dfl-ipc &&
+depends dfl-login1 &&
+depends dfl-utils &&
+depends dfl-wayqt &&
+depends wayland &&
+depends wlroots &&
+depends libxkbcommon &&
+depends mpv &&
+
+runtime_depends greetd &&
+depends_one_of QTG_COMPOSITOR \
+ sway '' \
+ wayfire '' \
+ 'wayland compositor'
+
diff --git a/dfl/qtgreet/DETAILS b/dfl/qtgreet/DETAILS
new file mode 100755
index 0000000..e1512fa
--- /dev/null
+++ b/dfl/qtgreet/DETAILS
@@ -0,0 +1,16 @@
+source $GRIMOIRE/MESON_FUNCTIONS
+ SPELL=qtgreet
+ SPELLX=QtGreet
+ VERSION=1.99.3
+
SOURCE_HASH=sha512:1fb60cc2671794d61097b5a62ea474798753ee18ce3b82beb6fea2c1313eb2b5b88aaf24aaac23c3870dcfb29968449c4a8428545342d8aa5d9debe14f29e7b3
+ SOURCE=$SPELLX-v$VERSION.tar.bz2
+ WEB_SITE=https://gitlab.com/marcusbritanicus/QtGreet
+ SOURCE_URL=$WEB_SITE/-/archive/v$VERSION/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-v$VERSION
+ LICENSE[0]=GPL3
+ ENTERED=20221229
+ KEYWORDS=""
+ SHORT=""
+cat << EOF
+Qt based greeter for greetd, to be run under wayfire or similar wlr-based
compositors.
+EOF
diff --git a/dfl/qtgreet/HISTORY b/dfl/qtgreet/HISTORY
new file mode 100644
index 0000000..bc9bf2e
--- /dev/null
+++ b/dfl/qtgreet/HISTORY
@@ -0,0 +1,9 @@
+2023-09-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.99.3
+ * DETAILS DEPENDS CONFIGURE: meson support
+ * PRE_BUILD patches/*: fix build for smgl
+ * DEPENDS: add mpv
+
+2023-03-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.0
+
diff --git a/dfl/qtgreet/PRE_BUILD b/dfl/qtgreet/PRE_BUILD
new file mode 100755
index 0000000..4604ffc
--- /dev/null
+++ b/dfl/qtgreet/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/dfl/qtgreet/patches/0001-fix-qt5-6-build.patch
b/dfl/qtgreet/patches/0001-fix-qt5-6-build.patch
new file mode 100644
index 0000000..664ccbf
--- /dev/null
+++ b/dfl/qtgreet/patches/0001-fix-qt5-6-build.patch
@@ -0,0 +1,33 @@
+From 2e1e85aad08753f10c35f70d4400fe7a80f8242b Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Thu, 29 Dec 2022 11:46:26 +0100
+Subject: [PATCH] fix qt5/6 build
+
+---
+ src/Main.cpp | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/src/Main.cpp b/src/Main.cpp
+index 9eb650b..ef60184 100644
+--- a/src/Main.cpp
++++ b/src/Main.cpp
+@@ -27,13 +27,9 @@
+ #include <unistd.h>
+ #include <signal.h>
+
+-#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
+-#include <DFL/DF5/Application.hpp>
+-#include <DFL/DF5/Utils.hpp>
+-#else
+-#include <DFL/DF6/Application.hpp>
+-#include <DFL/DF6/Utils.hpp>
+-#endif
++// from dfl
++#include <Application.hpp>
++#include <Utils.hpp>
+
+ #include <wayqt/WayQtUtils.hpp>
+ #include <wayqt/Registry.hpp>
+--
+2.42.0
+
diff --git a/qt5-cmake/qtgreet/BUILD b/qt5-cmake/qtgreet/BUILD
deleted file mode 100755
index aea51ce..0000000
--- a/qt5-cmake/qtgreet/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-cd $SOURCE_DIRECTORY/src &&
-default_build
diff --git a/qt5-cmake/qtgreet/CONFIGURE b/qt5-cmake/qtgreet/CONFIGURE
deleted file mode 100755
index b2f02c3..0000000
--- a/qt5-cmake/qtgreet/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/qt5-cmake/qtgreet/DEPENDS b/qt5-cmake/qtgreet/DEPENDS
deleted file mode 100755
index f2ddf9e..0000000
--- a/qt5-cmake/qtgreet/DEPENDS
+++ /dev/null
@@ -1,18 +0,0 @@
-source $GRIMOIRE/QT5_DEPENDS &&
-source $GRIMOIRE/depends_one_of.function &&
-
-depends dfl-applications &&
-depends dfl-ipc &&
-depends dfl-login1 &&
-depends dfl-utils &&
-depends dfl-wayqt &&
-depends wayland &&
-depends wlroots &&
-depends libxkbcommon &&
-
-runtime_depends greetd &&
-depends_one_of QTG_COMPOSITOR \
- sway '' \
- wayfire '' \
- 'wayland compositor'
-
diff --git a/qt5-cmake/qtgreet/DETAILS b/qt5-cmake/qtgreet/DETAILS
deleted file mode 100755
index eb14350..0000000
--- a/qt5-cmake/qtgreet/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
-#source $GRIMOIRE/MESON_FUNCTIONS
- SPELL=qtgreet
- SPELLX=QtGreet
- VERSION=1.0.0
-
SOURCE_HASH=sha512:5abf291081b3affc528f9280e137707b4af8cec841ee9bd177881fb5ad430c2767d18e4d6e265954ca3b542f82745c11cc423a3278b2d645042b4e0fa368f031
- SOURCE=$SPELLX-v$VERSION.tar.bz2
- WEB_SITE=https://gitlab.com/marcusbritanicus/QtGreet
- SOURCE_URL=$WEB_SITE/-/archive/v$VERSION/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-v$VERSION
- LICENSE[0]=GPL3
- ENTERED=20221229
- KEYWORDS=""
- SHORT=""
-cat << EOF
-Qt based greeter for greetd, to be run under wayfire or similar wlr-based
compositors.
-EOF
diff --git a/qt5-cmake/qtgreet/HISTORY b/qt5-cmake/qtgreet/HISTORY
deleted file mode 100644
index 35e1d64..0000000
--- a/qt5-cmake/qtgreet/HISTORY
+++ /dev/null
@@ -1,3 +0,0 @@
-2023-03-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.0.0
-


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a2b3ac6ffb8d923007a64ae65fdfe8f223319e33), Treeve Jelbert, 09/20/2023

Archive powered by MHonArc 2.6.24.

Top of Page