Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e6620f36549cf8e372561df5bbd73a073ab6034b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e6620f36549cf8e372561df5bbd73a073ab6034b)
  • Date: Fri, 18 Mar 2022 12:40:17 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

shell-term-fm/st/DETAILS | 22 +++++-
shell-term-fm/st/HISTORY | 8 ++
shell-term-fm/st/INSTALL | 4 +
shell-term-fm/st/PRE_BUILD | 16 +++-
shell-term-fm/st/patches/st-hidecursor-0.8.diff | 88
------------------------
5 files changed, 42 insertions(+), 96 deletions(-)

New commits:
commit e6620f36549cf8e372561df5bbd73a073ab6034b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

st: Add more patches

commit 5691ad080f6a3af82a80601909700535b39a84cc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

st: Make it download patches

No point in bundling them.

commit ed14263cf2d00e6028a76556aa3fbab42b70278c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

st: Fix installation issue with castfs

commit 532cf919dbb2a45277ba2fcae80711075ad4cd57
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

st 0.8.5

diff --git a/shell-term-fm/st/DETAILS b/shell-term-fm/st/DETAILS
index 45300c5..8fdb635 100755
--- a/shell-term-fm/st/DETAILS
+++ b/shell-term-fm/st/DETAILS
@@ -1,9 +1,25 @@
SPELL=st
- VERSION=0.8.4
-
SOURCE_HASH=sha512:f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a
+ VERSION=0.8.5
+
SOURCE_HASH=sha512:45cc51f9fc343bd80a48f23f5b00e41e0cc01a538474e0578dd02f02ce92cb560e0e7464ec47fd7de4d39483b23fda212c3e7c64233e8a3f4ab6862144d76323
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=https://dl.suckless.org/st/$SOURCE
+ SOURCE_URL=(https://dl.suckless.org/st/$SOURCE)
+
SOURCE2_URL=(https://st.suckless.org/patches/hidecursor/st-hidecursor-0.8.3.diff)
+ SOURCE2=${SOURCE2_URL##*/}
+
SOURCE3_URL=(https://st.suckless.org/patches/blinking_cursor/st-blinking_cursor-20211116-2f6e597.diff)
+ SOURCE3=${SOURCE3_URL##*/}
+
SOURCE4_URL=(https://st.suckless.org/patches/copyurl/st-copyurl-20220217-0.8.5.diff)
+ SOURCE4=${SOURCE4_URL##*/}
+
SOURCE5_URL=(https://st.suckless.org/patches/line_snap_delimiter/st-line_snap_delimiter-3bd7e43.diff)
+ SOURCE5=${SOURCE5_URL##*/}
+
SOURCE6_URL=(https://st.suckless.org/patches/desktopentry/st-desktopentry-0.8.4.diff)
+ 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=${SOURCE8_URL##*/}
+
SOURCE9_URL=(https://st.suckless.org/patches/xresources/st-xresources-20200604-9ba7ecf.diff)
+ SOURCE9=${SOURCE9_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 f40e595..57cda2a 100644
--- a/shell-term-fm/st/HISTORY
+++ b/shell-term-fm/st/HISTORY
@@ -1,3 +1,11 @@
+2022-03-18 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.5
+ * INSTALL: fixed installation issue with castfs
+ * patches/st-hidecursor-0.8.diff: removed, made downloadable
+ * PRE_BUILD, DETAILS: made it download patches
+ * DETAILS: added patches: blinking_cursor, copyurl,
line_snap_delimiter,
+ desktopentry, appsync, undercurl, xresources.
+
2021-11-20 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.8.4
* patches/st-hidecursor-0.8.diff: updated patch
diff --git a/shell-term-fm/st/INSTALL b/shell-term-fm/st/INSTALL
index 1f63c40..a6ad164 100755
--- a/shell-term-fm/st/INSTALL
+++ b/shell-term-fm/st/INSTALL
@@ -1,3 +1,7 @@
+# XXX removal required due to issue with castfs
+rm -f "$INSTALL_ROOT"/usr/share/terminfo/s/st \
+ "$INSTALL_ROOT"/usr/share/terminfo/s/st-256color &&
+
make install PREFIX="$INSTALL_ROOT/usr" &&
if [[ "${ST_CONFIG}" == "y" ]]; then
mkdir -p ${INSTALL_ROOT}/usr/share/doc/st &&
diff --git a/shell-term-fm/st/PRE_BUILD b/shell-term-fm/st/PRE_BUILD
index b9b7235..2121600 100755
--- a/shell-term-fm/st/PRE_BUILD
+++ b/shell-term-fm/st/PRE_BUILD
@@ -1,12 +1,18 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

-for i in "$SPELL_DIRECTORY"/patches/*; do
- desc="$(sed -r '/^Subject: /!d;s@[^ ]* *(\[[^\]]*\] *)*@ (@;s@$@)@;q'
"$i")" &&
- if query "Apply ${i##*/}$desc?" n; then
- patch -sp1 -i "$i" || break
+# Apply optional patches
+i=2
+while src=$(eval 'echo "$SOURCE'"$i"\")
+ [[ -n "$src" ]]
+do
+ desc=$(sed -r '/^Subject: /!d;s@^[^ ]+ (\[[^]]+\] *)*@@;q' \
+ "$SOURCE_CACHE/$src")
+ if query "Apply $src ($desc)?" n; then
+ patch -fp1 -i "$SOURCE_CACHE/$src" || exit 1
fi
-done &&
+ let i++
+done

if [[ "${ST_CONFIG}" == "y" ]]; then
if [[ -e ${INSTALL_ROOT}/usr/share/doc/st/config.def.h ]]; then
diff --git a/shell-term-fm/st/patches/st-hidecursor-0.8.diff
b/shell-term-fm/st/patches/st-hidecursor-0.8.diff
deleted file mode 100644
index 4895a66..0000000
--- a/shell-term-fm/st/patches/st-hidecursor-0.8.diff
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/x.c b/x.c
-index e5f1737..7e759b0 100644
---- a/x.c
-+++ b/x.c
-@@ -103,6 +103,11 @@ typedef struct {
- Draw draw;
- Visual *vis;
- XSetWindowAttributes attrs;
-+ /* Here, we use the term *pointer* to differentiate the cursor
-+ * one sees when hovering the mouse over the terminal from, e.g.,
-+ * a green rectangle where text would be entered. */
-+ Cursor vpointer, bpointer; /* visible and hidden pointers */
-+ int pointerisvisible;
- int scr;
- int isfixed; /* is fixed geometry? */
- int l, t; /* left and top offset */
-@@ -698,6 +703,13 @@ brelease(XEvent *e)
- void
- bmotion(XEvent *e)
- {
-+ if (!xw.pointerisvisible) {
-+ XDefineCursor(xw.dpy, xw.win, xw.vpointer);
-+ xw.pointerisvisible = 1;
-+ if (!IS_SET(MODE_MOUSEMANY))
-+ xsetpointermotion(0);
-+ }
-+
- if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
- mousereport(e);
- return;
-@@ -1099,10 +1111,10 @@ void
- xinit(int cols, int rows)
- {
- XGCValues gcvalues;
-- Cursor cursor;
- Window parent;
- pid_t thispid = getpid();
- XColor xmousefg, xmousebg;
-+ Pixmap blankpm;
-
- if (!(xw.dpy = XOpenDisplay(NULL)))
- die("can't open display\n");
-@@ -1166,8 +1178,9 @@ xinit(int cols, int rows)
- }
-
- /* white cursor, black outline */
-- cursor = XCreateFontCursor(xw.dpy, mouseshape);
-- XDefineCursor(xw.dpy, xw.win, cursor);
-+ xw.pointerisvisible = 1;
-+ xw.vpointer = XCreateFontCursor(xw.dpy, mouseshape);
-+ XDefineCursor(xw.dpy, xw.win, xw.vpointer);
-
- if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0)
{
- xmousefg.red = 0xffff;
-@@ -1181,7 +1194,10 @@ xinit(int cols, int rows)
- xmousebg.blue = 0x0000;
- }
-
-- XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg);
-+ XRecolorCursor(xw.dpy, xw.vpointer, &xmousefg, &xmousebg);
-+ blankpm = XCreateBitmapFromData(xw.dpy, xw.win, &(char){0}, 1, 1);
-+ xw.bpointer = XCreatePixmapCursor(xw.dpy, blankpm, blankpm,
-+ &xmousefg, &xmousebg, 0, 0);
-
- xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
- xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
-@@ -1673,6 +1689,8 @@ unmap(XEvent *ev)
- void
- xsetpointermotion(int set)
- {
-+ if (!set && !xw.pointerisvisible)
-+ return;
- MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
- XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
- }
-@@ -1793,6 +1811,12 @@ kpress(XEvent *ev)
- Status status;
- Shortcut *bp;
-
-+ if (xw.pointerisvisible) {
-+ XDefineCursor(xw.dpy, xw.win, xw.bpointer);
-+ xsetpointermotion(1);
-+ xw.pointerisvisible = 0;
-+ }
-+
- if (IS_SET(MODE_KBDLOCK))
- return;
-



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e6620f36549cf8e372561df5bbd73a073ab6034b), Ismael Luceno, 03/18/2022

Archive powered by MHonArc 2.6.24.

Top of Page