Skip to Content.
Sympa Menu

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

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 (104c1025a661c9c792c9a21b6f76569c2c073eee)
  • Date: Wed, 5 Oct 2022 19:51:12 +0000

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

utils/dmenu/DETAILS | 11 ++++++-----
utils/dmenu/HISTORY | 6 ++++++
utils/dmenu/PRE_BUILD | 18 ++++++++++--------
utils/dmenu/fuzzyhighlight.patch | 26 ++++++++++++++++++++++++++
utils/dmenu/fuzzyhighlight_xra.patch | 20 --------------------
utils/dmenu/password.patch | 23 +++++++++++++++++++++++
utils/dmenu/xresources-alt.patch | 18 ++++++++++++++++++
7 files changed, 89 insertions(+), 33 deletions(-)

New commits:
commit 104c1025a661c9c792c9a21b6f76569c2c073eee
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dmenu: => 5.2

diff --git a/utils/dmenu/DETAILS b/utils/dmenu/DETAILS
index 67c5dda..4bffb84 100755
--- a/utils/dmenu/DETAILS
+++ b/utils/dmenu/DETAILS
@@ -1,10 +1,11 @@
SPELL=dmenu
- VERSION=5.1
+ VERSION=5.2
PATCH_VERSION=4.9
PATCH2_VERSION=5.0
+ PATCH3_VERSION=5.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://dl.suckless.org/tools/${SOURCE}
-
SOURCE_HASH=sha512:2f950c30e15880e6081e04d73dd0cf8f402f52d793a77d22c3f10739bfed6222a9c4e7ec8eb3fc676422fea09e30b8cf9789f67b276b22c398c96f5ed3b56453
+
SOURCE_HASH=sha512:7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3
if [[ $DMENU_PASSWORD == y ]]; then
SOURCE2=${SPELL}-password-${PATCH_VERSION}.diff

SOURCE2_URL=https://tools.suckless.org/${SPELL}/patches/password/${SOURCE2}
@@ -16,14 +17,14 @@ if [[ $DMENU_LINEHEIGHT == y ]]; then

SOURCE3_HASH=sha512:b2fa2b33b9a2391285d0c3e5df22a9d68f4193bebb4720ce71678e8a87f43ae6c0a6b3f3fd3f63aa89be95880c04c8a83e43240b6ae4f90487bdb5a9325d084c
fi
if [[ $DMENU_MOUSE_SUPPORT == y ]]; then
- SOURCE4=${SPELL}-mousesupport-${VERSION}.diff
+ SOURCE4=${SPELL}-mousesupport-${PATCH3_VERSION}.diff

SOURCE4_URL=https://tools.suckless.org/${SPELL}/patches/mouse-support/${SOURCE4}

SOURCE4_HASH=sha512:777dd2aeba4725bf4c6adff3bf510f6eb6bf1699db06897fed2576f1162eb94e1e581c8b0d02ad3beebe5491b9631baf873f67aa8926d676f5c8b493dc6be1d7
fi
if [[ $DMENU_NUMBERS == y ]]; then
- SOURCE5=${SPELL}-numbers-${PATCH_VERSION}.diff
+ SOURCE5=${SPELL}-numbers-20220512-28fb3e2.diff

SOURCE5_URL=https://tools.suckless.org/${SPELL}/patches/numbers/${SOURCE5}
-
SOURCE5_HASH=sha512:15d88ea4f10c2fa6fb3eb7478f23b24210a0da3542ae7a5be609013500c15564eedd8153d850f079c2c1f4bab1f5e61ff51153e4c85445ee04a0de5c851e305a
+
SOURCE5_HASH=sha512:ff851cc4ff38f2bf8cad727a1dcc7a927b43aba1159ea14178a4aa894f83db715a7ef920183d7362110c9736299cc3c171a4d645c994f395dda6fd79fa5adc57
fi
if [[ $DMENU_XYW == y ]]; then
SOURCE6=${SPELL}-xyw-${PATCH2_VERSION}.diff
diff --git a/utils/dmenu/HISTORY b/utils/dmenu/HISTORY
index aecdebc..a3ca6ff 100644
--- a/utils/dmenu/HISTORY
+++ b/utils/dmenu/HISTORY
@@ -1,3 +1,9 @@
+2022-10-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.2; updated numbers patch
+ * PRE_BUILD: apply and reorder patches
+ * fuzzyhighlight.patch: updated for 5.2
+ * {password¸xresources-alt}.patch: added, for 5.2 transition
+
2022-09-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, PRE_BUILD, PREPARE: add xresources alt patch option
* fuzzyhighlight_xra.patch, fuzzymatch_xra.patch,
diff --git a/utils/dmenu/PRE_BUILD b/utils/dmenu/PRE_BUILD
index f3e168c..8193301 100755
--- a/utils/dmenu/PRE_BUILD
+++ b/utils/dmenu/PRE_BUILD
@@ -4,7 +4,9 @@ cd ${SOURCE_DIRECTORY} &&
if [[ $DMENU_PASSWORD == y ]]; then
verify_file 2 &&

- interdiff ${SOURCE_CACHE}/${SOURCE2} /dev/null | patch -p1
+ interdiff ${SOURCE_CACHE}/${SOURCE2} /dev/null >
"${SOURCE_DIRECTORY}/${SOURCE2}" &&
+ patch -p0 < "${SPELL_DIRECTORY}/password.patch" &&
+ patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE2}"
fi &&

if [[ $DMENU_LINEHEIGHT == y ]]; then
@@ -16,13 +18,14 @@ fi &&
if [[ $DMENU_XRESOURCES_ALT == y ]]; then
verify_file 9 &&

+ cat ${SOURCE_CACHE}/${SOURCE9} > "${SOURCE_DIRECTORY}/${SOURCE9}" &&
+ patch -p0 < "${SPELL_DIRECTORY}/xresources-alt.patch" &&
+
if [[ $DMENU_FUZZYHIGHLIGHT == y ]]; then
- cat ${SOURCE_CACHE}/${SOURCE9} > "${SOURCE_DIRECTORY}/${SOURCE9}" &&
- patch -p0 < "${SPELL_DIRECTORY}/xresources-alt_fhl.patch" &&
- patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE9}"
- else
- cat ${SOURCE_CACHE}/${SOURCE9} | patch -p1
+ patch -p0 < "${SPELL_DIRECTORY}/xresources-alt_fhl.patch"
fi
+
+ patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE9}"
fi &&

if [[ $DMENU_MOUSE_SUPPORT == y ]]; then
@@ -71,11 +74,10 @@ if [[ $DMENU_FUZZYHIGHLIGHT == y ]]; then
verify_file 8 &&

cat ${SOURCE_CACHE}/${SOURCE8} > "${SOURCE_DIRECTORY}/${SOURCE8}" &&
+ patch -p0 < "${SPELL_DIRECTORY}/fuzzyhighlight.patch"

if [[ $DMENU_XRESOURCES_ALT == y ]]; then
patch -p0 < "${SPELL_DIRECTORY}/fuzzyhighlight_xra.patch"
- else
- patch -p0 < "${SPELL_DIRECTORY}/fuzzyhighlight.patch"
fi &&

patch -p1 -F3 < "${SOURCE_DIRECTORY}/${SOURCE8}"
diff --git a/utils/dmenu/fuzzyhighlight.patch
b/utils/dmenu/fuzzyhighlight.patch
index d4e4c56..f36cb72 100644
--- a/utils/dmenu/fuzzyhighlight.patch
+++ b/utils/dmenu/fuzzyhighlight.patch
@@ -18,3 +18,29 @@
+ return r;
}

+--- dmenu-fuzzyhighlight-4.9.diff.orig 2022-10-05 12:29:01.751742646 -0700
++++ dmenu-fuzzyhighlight-4.9.diff 2022-10-05 12:41:27.035920377 -0700
+@@ -125,16 +125,17 @@
+ }
+
+ static void
+-@@ -683,7 +727,8 @@ static void
++@@ -711,7 +711,9 @@
+ usage(void)
+ {
+- fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m
monitor]\n"
+-- " [-nb color] [-nf color] [-sb color] [-sf color]
[-w windowid]\n", stderr);
+-+ " [-nb color] [-nf color] [-sb color] [-sf color]\n"
+-+ " [-nhb color] [-nhf color] [-shb color] [-shf
color] [-w windowid]\n", stderr);
+- exit(1);
++ die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m
monitor]\n"
++- " [-nb color] [-nf color] [-sb color] [-sf color] [-w
windowid]");
+++ " [-nb color] [-nf color] [-sb color] [-sf color]\n"
+++ " [-nhb color] [-nhf color] [-shb color] [-shf
color]\n"
+++ " [-w windowid]");
+ }
+
++ int
+ @@ -724,6 +769,14 @@ main(int argc, char *argv[])
+ colors[SchemeSel][ColBg] = argv[++i];
+ else if (!strcmp(argv[i], "-sf")) /* selected foreground
color */
diff --git a/utils/dmenu/fuzzyhighlight_xra.patch
b/utils/dmenu/fuzzyhighlight_xra.patch
index 2b95809..510b657 100644
--- a/utils/dmenu/fuzzyhighlight_xra.patch
+++ b/utils/dmenu/fuzzyhighlight_xra.patch
@@ -15,23 +15,3 @@
};
/* -l option; if nonzero, dmenu uses vertical list with given number of
lines */
diff -upN dmenu-4.9/dmenu.1 dmenu-4.9-fuzzyhighlight/dmenu.1
---- dmenu-fuzzyhighlight-4.9.diff.orig 2020-04-12 04:50:28.000000000 -0700
-+++ dmenu-fuzzyhighlight-4.9.diff 2020-11-25 23:06:28.669246836 -0800
-@@ -82,7 +82,7 @@
- + ? SchemeSelHighlight
- + : SchemeNormHighlight]);
- + for (i = 0, highlight = item->text; *highlight && text[i];) {
--+ if (*highlight == text[i]) {
-++ if (!fstrncmp(&(*highlight), &text[i], 1)) {
- + /* get indentation */
- + c = *highlight;
- + *highlight = '\0';
-@@ -120,7 +120,7 @@
-
- - return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
- + r = drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
--+ drawhighlights(item, x, y, w);
-++ if (fuzzy) drawhighlights(item, x, y, w);
- + return r;
- }
-
diff --git a/utils/dmenu/password.patch b/utils/dmenu/password.patch
new file mode 100644
index 0000000..038e39c
--- /dev/null
+++ b/utils/dmenu/password.patch
@@ -0,0 +1,23 @@
+--- dmenu-password-4.9.diff.orig 2022-10-05 12:06:05.424752258 -0700
++++ dmenu-password-4.9.diff 2022-10-05 12:08:38.086645782 -0700
+@@ -66,15 +66,15 @@
+ /* read each line from stdin and add it to the item list */
+ for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
+ if (i + 1 >= size / sizeof *items)
+-@@ -682,7 +693,7 @@
++@@ -710,7 +710,7 @@
+ static void
+ usage(void)
+ {
+-+ fputs("usage: dmenu [-bfiPv] [-l lines] [-p prompt] [-fn font] [-m
monitor]\n"
+-- fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m
monitor]\n"
+- " [-nb color] [-nf color] [-sb color] [-sf color]
[-w windowid]\n", stderr);
+- exit(1);
++- die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m
monitor]\n"
+++ die("usage: dmenu [-bfiPv] [-l lines] [-p prompt] [-fn font] [-m
monitor]\n"
++ " [-nb color] [-nf color] [-sb color] [-sf color] [-w
windowid]");
+ }
++
+ @@ -705,7 +716,9 @@
+ else if (!strcmp(argv[i], "-i")) { /* case-insensitive item
matching */
+ fstrncmp = strncasecmp;
diff --git a/utils/dmenu/xresources-alt.patch
b/utils/dmenu/xresources-alt.patch
new file mode 100644
index 0000000..d04235e
--- /dev/null
+++ b/utils/dmenu/xresources-alt.patch
@@ -0,0 +1,18 @@
+--- dmenu-xresources-alt-5.0.diff.orig 2022-10-05 12:11:59.984083703 -0700
++++ dmenu-xresources-alt-5.0.diff 2022-10-05 12:12:32.477436575 -0700
+@@ -82,15 +82,6 @@
+ #include "config.h"
+
+ static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
+-@@ -395,7 +411,7 @@ keypress(XKeyEvent *ev)
+-
+- switch(ksym) {
+- default:
+--insert:
+-+ insert:
+- if (!iscntrl(*buf))
+- insert(buf, len);
+- break;
+ @@ -547,6 +563,54 @@ readstdin(void)
+ lines = MIN(lines, i);
+ }



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (104c1025a661c9c792c9a21b6f76569c2c073eee), Vlad Glagolev, 10/05/2022

Archive powered by MHonArc 2.6.24.

Top of Page