Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (198fe20806a84040e1f97608c08677d4bb84b69a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (198fe20806a84040e1f97608c08677d4bb84b69a)
  • Date: Tue, 23 Aug 2022 03:01:22 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

shell-term-fm/st/DEPENDS | 1 +
shell-term-fm/st/DETAILS | 14 ++++++++++++--
shell-term-fm/st/HISTORY | 5 +++++
shell-term-fm/st/PRE_BUILD | 11 +++++++++++
shell-term-fm/st/xsetcursor.patch | 18 ++++++++++++++++++
5 files changed, 47 insertions(+), 2 deletions(-)

New commits:
commit 198fe20806a84040e1f97608c08677d4bb84b69a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

st: add 3 more patches

diff --git a/shell-term-fm/st/DEPENDS b/shell-term-fm/st/DEPENDS
index b3289e2..566e67c 100755
--- a/shell-term-fm/st/DEPENDS
+++ b/shell-term-fm/st/DEPENDS
@@ -1,5 +1,6 @@
depends libx11 &&
depends libxext &&
depends libxft &&
+depends libxrender && # required only for alpha patch
depends fontconfig &&
depends freetype2
diff --git a/shell-term-fm/st/DETAILS b/shell-term-fm/st/DETAILS
index 8fdb635..428c4ea 100755
--- a/shell-term-fm/st/DETAILS
+++ b/shell-term-fm/st/DETAILS
@@ -16,10 +16,20 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE6=${SOURCE6_URL##*/}

SOURCE7_URL=(https://st.suckless.org/patches/sync/st-appsync-20200618-b27a383.diff)
SOURCE7=${SOURCE7_URL##*/}
-
SOURCE8_URL=(https://st.suckless.org/patches/undercurl/st-undercurl-0.8.4-20210822.diff)
+
SOURCE8_URL=(https://st.suckless.org/patches/undercurl/st-undercurl-0.8.4-20210822.diff)
SOURCE8=${SOURCE8_URL##*/}
-
SOURCE9_URL=(https://st.suckless.org/patches/xresources/st-xresources-20200604-9ba7ecf.diff)
+
SOURCE9_URL=(https://st.suckless.org/patches/xresources/st-xresources-20200604-9ba7ecf.diff)
SOURCE9=${SOURCE9_URL##*/}
+
SOURCE10_URL=(https://st.suckless.org/patches/alpha/st-alpha-20220206-0.8.5.diff)
+ SOURCE10=${SOURCE10_URL##*/}
+
SOURCE11_URL=(https://st.suckless.org/patches/scrollback/st-scrollback-0.8.5.diff)
+ SOURCE11=${SOURCE11_URL##*/}
+
SOURCE12_URL=(https://st.suckless.org/patches/scrollback/st-scrollback-mouse-20220127-2c5edf2.diff)
+ SOURCE12=${SOURCE12_URL##*/}
+
SOURCE13_URL=(https://st.suckless.org/patches/scrollback/st-scrollback-mouse-altscreen-20220127-2c5edf2.diff)
+ SOURCE13=${SOURCE13_URL##*/}
+
SOURCE14_URL=(https://st.suckless.org/patches/xresources-with-reload-signal/st-xresources-signal-reloading-20220407-ef05519.diff)
+ SOURCE14=${SOURCE14_URL##*/}
WEB_SITE=https://st.suckless.org/
ENTERED=20130208
LICENSE[0]=MIT
diff --git a/shell-term-fm/st/HISTORY b/shell-term-fm/st/HISTORY
index 57cda2a..93dcd24 100644
--- a/shell-term-fm/st/HISTORY
+++ b/shell-term-fm/st/HISTORY
@@ -1,3 +1,8 @@
+2022-08-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added alpha, scrollback and xresources with reload signal
+ patches
+ * PRE_BUILD: apply patches with conditions
+
2022-03-18 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.8.5
* INSTALL: fixed installation issue with castfs
diff --git a/shell-term-fm/st/PRE_BUILD b/shell-term-fm/st/PRE_BUILD
index 2121600..eb990e0 100755
--- a/shell-term-fm/st/PRE_BUILD
+++ b/shell-term-fm/st/PRE_BUILD
@@ -10,6 +10,17 @@ do
"$SOURCE_CACHE/$src")
if query "Apply $src ($desc)?" n; then
patch -fp1 -i "$SOURCE_CACHE/$src" || exit 1
+
+ if [ "$src" = "st-xresources-signal-reloading-20220407-ef05519.diff" ];
then
+ if grep -q "cursorstyle = 1" config.def.h; then
+ sedit "s:XRESOURCE_LOAD_INTEGER(\"cursorshape\",
cursorshape);:XRESOURCE_LOAD_INTEGER(\"cursorstyle\", cursorstyle);:" x.c &&
+ patch -p0 < "${SPELL_DIRECTORY}/xsetcursor.patch"
+ fi
+
+ if grep -q "alpha = 0.8" config.def.h; then
+ sedit "s:XRESOURCE_LOAD_FLOAT(\"chscale\",
chscale);:XRESOURCE_LOAD_FLOAT(\"chscale\", chscale);
XRESOURCE_LOAD_FLOAT(\"alpha\", alpha);:" x.c
+ fi
+ fi
fi
let i++
done
diff --git a/shell-term-fm/st/xsetcursor.patch
b/shell-term-fm/st/xsetcursor.patch
new file mode 100644
index 0000000..0291f9d
--- /dev/null
+++ b/shell-term-fm/st/xsetcursor.patch
@@ -0,0 +1,18 @@
+--- x.c.orig 2022-08-22 15:30:31.070291506 -0700
++++ x.c 2022-08-22 15:30:54.346325460 -0700
+@@ -2168,7 +2168,6 @@
+ {
+ xw.l = xw.t = 0;
+ xw.isfixed = False;
+- xsetcursor(cursorstyle);
+
+ ARGBEGIN {
+ case 'a':
+@@ -2227,6 +2226,7 @@
+ setlocale(LC_CTYPE, "");
+ XSetLocaleModifiers("");
+ xrdb_load();
++ xsetcursor(cursorstyle);
+ signal(SIGUSR1, reload);
+ cols = MAX(cols, 1);
+ rows = MAX(rows, 1);



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (198fe20806a84040e1f97608c08677d4bb84b69a), Vlad Glagolev, 08/22/2022

Archive powered by MHonArc 2.6.24.

Top of Page