Skip to Content.
Sympa Menu

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

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 (756b780dbc9154856dea50a40556ca56a40a93ce)
  • Date: Wed, 12 Oct 2022 18:44:44 +0000

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

crypto/pcsc-lite/DETAILS | 2 +-
crypto/pcsc-lite/HISTORY | 3 +++
smgl/seatd/DEPENDS | 2 +-
smgl/seatd/HISTORY | 3 +++
windowmanagers/sway/DEPENDS | 2 +-
windowmanagers/sway/HISTORY | 4 ++++
windowmanagers/sway/PRE_BUILD | 4 ++++
windowmanagers/sway/patches/nag.patch | 20 ++++++++++++++++++++
8 files changed, 37 insertions(+), 3 deletions(-)

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

pcsc-lite: => 1.9.9

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

sway - fix build

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

seatd - use LOGIN-DAEMON

diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index d2b68b4..d924744 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcsc-lite
- VERSION=1.9.8
+ VERSION=1.9.9
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index f94c9a3..7c3c48d 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,6 @@
+2022-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.9
+
2022-06-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.8

diff --git a/smgl/seatd/DEPENDS b/smgl/seatd/DEPENDS
index 3c7d554..fb67ce7 100755
--- a/smgl/seatd/DEPENDS
+++ b/smgl/seatd/DEPENDS
@@ -1,3 +1,3 @@
source $GRIMOIRE/MESON_DEPENDS &&
-optional_depends elogind '' '' 'logind support' &&
+optional_depends LOGIN-DAEMON '' '' 'logind support' &&
optional_depends scdoc man-pages={en,dis}abled 'create man pages'
diff --git a/smgl/seatd/HISTORY b/smgl/seatd/HISTORY
index fe1fd9a..5176db8 100644
--- a/smgl/seatd/HISTORY
+++ b/smgl/seatd/HISTORY
@@ -1,3 +1,6 @@
+2022-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: use LOGIN-DAEMON
+
2022-06-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.0

diff --git a/windowmanagers/sway/DEPENDS b/windowmanagers/sway/DEPENDS
index 7c8a9ae..2548c9e 100755
--- a/windowmanagers/sway/DEPENDS
+++ b/windowmanagers/sway/DEPENDS
@@ -31,5 +31,5 @@ optional_depends linux-pam \

optional_depends xwayland xwayland={en,dis}abled "X11 support" &&

-optional_depends elogind '' '' 'provide sd-bus library' &&
+optional_depends LOGIN-DAEMON '' '' 'provide sd-bus library' &&
optional_depends scdoc man-pages={en,dis}abled 'build man pages'
diff --git a/windowmanagers/sway/HISTORY b/windowmanagers/sway/HISTORY
index 026cbda..f1eaced 100644
--- a/windowmanagers/sway/HISTORY
+++ b/windowmanagers/sway/HISTORY
@@ -1,3 +1,7 @@
+2022-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: use LOGIN-DAEMON
+ * PRE_BUILD patches/*: added, fix build with gcc-12.2
+
2022-03-16 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: fixed missing sourcing of VDEPENDS
switched to NINJA-BUILD dep
diff --git a/windowmanagers/sway/PRE_BUILD b/windowmanagers/sway/PRE_BUILD
new file mode 100755
index 0000000..a11588c
--- /dev/null
+++ b/windowmanagers/sway/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i 's/strncpy/memcpy/' sway/criteria.c &&
+apply_patch_dir patches
diff --git a/windowmanagers/sway/patches/nag.patch
b/windowmanagers/sway/patches/nag.patch
new file mode 100644
index 0000000..b986149
--- /dev/null
+++ b/windowmanagers/sway/patches/nag.patch
@@ -0,0 +1,20 @@
+diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c
+index 9b57d57856..03ec0411b7 100644
+--- a/swaynag/swaynag.c
++++ b/swaynag/swaynag.c
+@@ -511,13 +511,8 @@ void swaynag_destroy(struct swaynag *swaynag) {
+ swaynag_seat_destroy(seat);
+ }
+
+- if (&swaynag->buffers[0]) {
+- destroy_buffer(&swaynag->buffers[0]);
+- }
+-
+- if (&swaynag->buffers[1]) {
+- destroy_buffer(&swaynag->buffers[1]);
+- }
++ destroy_buffer(&swaynag->buffers[0]);
++ destroy_buffer(&swaynag->buffers[1]);
+
+ if (swaynag->outputs.prev || swaynag->outputs.next) {
+ struct swaynag_output *output, *temp;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (756b780dbc9154856dea50a40556ca56a40a93ce), Treeve Jelbert, 10/12/2022

Archive powered by MHonArc 2.6.24.

Top of Page