Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 shell-term-fm/st/DEPENDS               |    7 +
 shell-term-fm/st/DETAILS               |   99 +++++++++++++++++++--------
 shell-term-fm/st/HISTORY               |    7 +
 shell-term-fm/st/PREPARE               |   23 ++++++
 shell-term-fm/st/PRE_BUILD             |  117 
++++++++++++++++++++++++++-------
 shell-term-fm/st/blinking_cursor.patch |   23 ++++++
 shell-term-fm/st/scrollback_lsd.patch  |   26 +++++++
 utils/dmenu/DETAILS                    |   16 ++--
 utils/dmenu/HISTORY                    |    4 +
 utils/dmenu/PRE_BUILD                  |   28 +++----
 10 files changed, 274 insertions(+), 76 deletions(-)

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

    dmenu: add patch guards

commit 17b2a4507e33f9224ee2735c44f78382f1165393
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    st: => 0.9

diff --git a/shell-term-fm/st/DEPENDS b/shell-term-fm/st/DEPENDS
index 566e67c..aace56b 100755
--- a/shell-term-fm/st/DEPENDS
+++ b/shell-term-fm/st/DEPENDS
@@ -1,6 +1,9 @@
 depends libx11 &&
 depends libxext &&
 depends libxft &&
-depends libxrender && # required only for alpha patch
 depends fontconfig &&
-depends freetype2
+depends freetype2 &&
+
+if [[ $ST_ALPHA == y ]]; then
+  depends libxrender
+fi
diff --git a/shell-term-fm/st/DETAILS b/shell-term-fm/st/DETAILS
index 428c4ea..548a3a5 100755
--- a/shell-term-fm/st/DETAILS
+++ b/shell-term-fm/st/DETAILS
@@ -1,35 +1,74 @@
            SPELL=st
-         VERSION=0.8.5
-     
SOURCE_HASH=sha512:45cc51f9fc343bd80a48f23f5b00e41e0cc01a538474e0578dd02f02ce92cb560e0e7464ec47fd7de4d39483b23fda212c3e7c64233e8a3f4ab6862144d76323
+         VERSION=0.9
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-      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##*/}
-    
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##*/}
+   SOURCE_URL[0]=https://dl.suckless.org/${SPELL}/${SOURCE}
+     
SOURCE_HASH=sha512:8d996a68d55c63d84da9962911b076ef437842e8cd83d74672d95531dfbaea91e049430886459a99e859ec760bb3754e94bbe1f646410998725e5a8997fb70ea
+if [[ $ST_HIDECURSOR == y ]]; then
+         SOURCE2=${SPELL}-hidecursor-0.8.3.diff
+  SOURCE2_URL[0]=https://st.suckless.org/patches/hidecursor/${SOURCE2}
+    
SOURCE2_HASH=sha512:e60f389acf6589504d30b39ff6afa7cf14eeb3fa0f2831787daa224da64fced9f5403e03e4db69c87b9c65bfe52f0a9e088983db7aec8969ea4e28a6d2dff032
+fi
+if [[ $ST_BLINKING_CURSOR == y ]]; then
+         SOURCE3=${SPELL}-blinking_cursor-20211116-2f6e597.diff
+  SOURCE3_URL[0]=https://st.suckless.org/patches/blinking_cursor/${SOURCE3}
+    
SOURCE3_HASH=sha512:d09f6e86aeb4d5a06f04cca889c3d15ee02c23ba28a0e706b9efd2a1f3e525470a0fe638b0fb2f0192f24030ee53cec86dcdc7d947a665dbaa68a25f2138d0eb
+fi
+if [[ $ST_COPYURL == y ]]; then
+         SOURCE4=${SPELL}-copyurl-20220217-0.8.5.diff
+  SOURCE4_URL[0]=https://st.suckless.org/patches/copyurl/${SOURCE4}
+    
SOURCE4_HASH=sha512:efbc6f805d778ccb3793cbf187997e963292e20a167b5114b00ea5d28cd933a71e37572a4e373615be0ff6ed596ddb6ad08687c0455463bf31be3f91b3cd333a
+fi
+if [[ $ST_LINE_SNAP_DELIMITER == y ]]; then
+         SOURCE5=${SPELL}-line_snap_delimiter-3bd7e43.diff
+  
SOURCE5_URL[0]=https://st.suckless.org/patches/line_snap_delimiter/${SOURCE5}
+    
SOURCE5_HASH=sha512:8b19b03f6e792317ad194662aabd8f1d3e904e953e2b44d1ec5daec981b0dfe1653720a070529dfaa3f5111d12af8d4187cea62b1466171ce15303176bf8e605
+fi
+if [[ $ST_DESKTOPENTRY == y ]]; then
+         SOURCE6=${SPELL}-desktopentry-0.8.4.diff
+  SOURCE6_URL[0]=https://st.suckless.org/patches/desktopentry/${SOURCE6}
+    
SOURCE6_HASH=sha512:2a749778f2e863cdf769132c299559b40b0b3553ceb2a835353bccd3a09bf5830c6b4fe337b2804121cdd8b842024a340d5cf081b2739df8710a20cdfd7b744b
+fi
+if [[ $ST_SYNC == y ]]; then
+         SOURCE7=${SPELL}-appsync-20200618-b27a383.diff
+  SOURCE7_URL[0]=https://st.suckless.org/patches/sync/${SOURCE7}
+    
SOURCE7_HASH=sha512:16a2ca741f1a43b01e424edc0c7a04f40f8f7a5783e421e08091198c620295d6570a09f96417673c38b0809037442410f27cdbb6723be201c36810739fa2c5a0
+fi
+if [[ $ST_UNDERCURL == y ]]; then
+         SOURCE8=${SPELL}-undercurl-0.8.4-20210822.diff
+  SOURCE8_URL[0]=https://st.suckless.org/patches/undercurl/${SOURCE8}
+    
SOURCE8_HASH=sha512:8d22d10839df6e30460ee4c1a3fd9b1fe89e87685bf82c1a7bea8cba913516e14a55db29065ff047eb83cb90b0866d3a8b3b854754dbf8132ff59679e0eef314
+fi
+if [[ $ST_XRESOURCES == y ]]; then
+         SOURCE9=${SPELL}-xresources-20200604-9ba7ecf.diff
+  SOURCE9_URL[0]=https://st.suckless.org/patches/xresources/${SOURCE9}
+    
SOURCE9_HASH=sha512:1d3a9e780e76b19ea123948973d80d8c1f5a691c31c3e45ac62813d7d6b1c82fc3c170e7437615b4555d078835bc8065a06b758a9177b327119cf645f5d05736
+fi
+if [[ $ST_ALPHA == y ]]; then
+        SOURCE10=${SPELL}-alpha-20220206-0.8.5.diff
+ SOURCE10_URL[0]=https://st.suckless.org/patches/alpha/${SOURCE10}
+   
SOURCE10_HASH=sha512:d07f4d9cff87a3bc7f1fa852261de04cf680c28860e3b9bc8a9b09a0572b1876b29c919eba1f81d68ee0f2a6b8812fde2fcf561d80c640f44eb1f658a55cdbea
+fi
+if [[ $ST_SCROLLBACK == y ]]; then
+        SOURCE11=${SPELL}-scrollback-0.8.5.diff
+ SOURCE11_URL[0]=https://st.suckless.org/patches/scrollback/${SOURCE11}
+   
SOURCE11_HASH=sha512:24b9333e999b4465f2850356055095c1f3b2acf09301abd453c867c7a9d622c4d93424ce1b8ff1840304a9dfae8dd3a86e27f195100539caedd00ec2e0c78eb0
+fi
+if [[ $ST_SCROLLBACK_MOUSE == y ]]; then
+        SOURCE12=${SPELL}-scrollback-mouse-20220127-2c5edf2.diff
+ SOURCE12_URL[0]=https://st.suckless.org/patches/scrollback/${SOURCE12}
+   
SOURCE12_HASH=sha512:9e82e33bec4904094c4d654eb0ad69a5a061203bf54ab5f877b219e662f5fc4d67554bf395375afdcc9313510c1fa011cb97b27e590f63cf17088ec42c6a894c
+fi
+if [[ $ST_SCROLLBACK_MOUSE_ALTSCREEN == y ]]; then
+        SOURCE13=${SPELL}-scrollback-mouse-altscreen-20220127-2c5edf2.diff
+ SOURCE13_URL[0]=https://st.suckless.org/patches/scrollback/${SOURCE13}
+   
SOURCE13_HASH=sha512:f0cdce2c8b05abbb5228edb0fdda1b8e30991bc688dd7fb53edc61f76a688cb4df5d23af2cc93c878185324e103d7a5ff591153a2d29215e65d36115a082f76f
+fi
+if [[ $ST_XRESOURCES_SIGNAL_RELOADING == y ]]; then
+        SOURCE14=${SPELL}-xresources-signal-reloading-20220407-ef05519.diff
+ 
SOURCE14_URL[0]=https://st.suckless.org/patches/xresources-with-reload-signal/${SOURCE14}
+   
SOURCE14_HASH=sha512:0ed790b18ff92d3f2bbc3635b396fc2a1858d2e63d24ccc69af3d4360c2ec0cd41b6acb7cce3316ccc6d7a5ef8a34fdd8b7af434c98c75f7ece1675280176879
+fi
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         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 93dcd24..bdf1a22 100644
--- a/shell-term-fm/st/HISTORY
+++ b/shell-term-fm/st/HISTORY
@@ -1,3 +1,10 @@
+2022-10-04 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.9; rewritten
+       * DEPENDS: updated for optional alpha patch
+       * PRE_BUILD: rewritten
+       * PREPARE: added, for optional patch support
+       * {blinking_cursor,scrollback_lsd}.patch: added, for 0.9 transition
+
 2022-08-22 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: added alpha, scrollback and xresources with reload signal
          patches
diff --git a/shell-term-fm/st/PREPARE b/shell-term-fm/st/PREPARE
new file mode 100755
index 0000000..0e90ae1
--- /dev/null
+++ b/shell-term-fm/st/PREPARE
@@ -0,0 +1,23 @@
+config_query ST_HIDECURSOR "Apply st hidecursor patch?" n &&
+config_query ST_BLINKING_CURSOR "Apply st blinking cursor patch?" n &&
+config_query ST_COPYURL "Apply st copyurl patch?" n &&
+config_query ST_LINE_SNAP_DELIMITER "Apply st line_snap_delimiter patch?" n 
&&
+config_query ST_DESKTOPENTRY "Apply st desktopentry patch?" n &&
+config_query ST_SYNC "Apply st sync patch?" n &&
+config_query ST_UNDERCURL "Apply st undercurl patch?" n &&
+config_query ST_ALPHA "Apply st alpha patch?" n &&
+config_query ST_XRESOURCES "Apply st xresources patch?" n &&
+
+if [[ $ST_XRESOURCES == n ]]; then
+  config_query ST_XRESOURCES_SIGNAL_RELOADING "Apply st xresources with 
signal reloading patch?" n
+fi &&
+
+config_query ST_SCROLLBACK "Apply st scrollback patch?" n &&
+
+if [[ $ST_SCROLLBACK == y ]]; then
+  config_query ST_SCROLLBACK_MOUSE "Apply st scrollback_mouse patch?" n &&
+
+  if [[ $ST_SCROLLBACK_MOUSE == y ]]; then
+    config_query ST_SCROLLBACK_MOUSE_ALTSCREEN "Apply st 
scrollback_mouse_altscreen patch?" n
+  fi
+fi
diff --git a/shell-term-fm/st/PRE_BUILD b/shell-term-fm/st/PRE_BUILD
index eb990e0..e7e7650 100755
--- a/shell-term-fm/st/PRE_BUILD
+++ b/shell-term-fm/st/PRE_BUILD
@@ -1,29 +1,102 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
 
-# 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
-
-    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
+if [[ $ST_HIDECURSOR == y ]]; then
+  verify_file 2 &&
+
+  patch -p1 < "${SOURCE_CACHE}/${SOURCE2}" || exit 1
+fi &&
+
+if [[ $ST_BLINKING_CURSOR == y ]]; then
+  verify_file 3 &&
+
+  cat ${SOURCE_CACHE}/${SOURCE3} > "${SOURCE_DIRECTORY}/${SOURCE3}" &&
+  patch -p0 < "${SPELL_DIRECTORY}/blinking_cursor.patch" &&
+
+  patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE3}" || exit 1
+fi &&
+
+if [[ $ST_COPYURL == y ]]; then
+  verify_file 4 &&
+
+  patch -p1 < "${SOURCE_CACHE}/${SOURCE4}" || exit 1
+fi &&
+
+if [[ $ST_LINE_SNAP_DELIMITER == y ]]; then
+  verify_file 5 &&
+
+  patch -p1 < "${SOURCE_CACHE}/${SOURCE5}" || exit 1
+fi &&
+
+if [[ $ST_DESKTOPENTRY == y ]]; then
+  verify_file 6 &&
+
+  patch -p1 < "${SOURCE_CACHE}/${SOURCE6}" || exit 1
+fi &&
+
+if [[ $ST_SYNC == y ]]; then
+  verify_file 7 &&
+
+  patch -p1 < "${SOURCE_CACHE}/${SOURCE7}" || exit 1
+fi &&
+
+if [[ $ST_UNDERCURL == y ]]; then
+  verify_file 8 &&
+
+  patch -p1 < "${SOURCE_CACHE}/${SOURCE8}" || exit 1
+fi &&
+
+if [[ $ST_XRESOURCES == y ]]; then
+  verify_file 9 &&
+
+  patch -p1 < "${SOURCE_CACHE}/${SOURCE9}" || exit 1
+fi &&
+
+if [[ $ST_ALPHA == y ]]; then
+  verify_file 10 &&
+
+  patch -p1 < "${SOURCE_CACHE}/${SOURCE10}" || exit 1
+fi &&
+
+if [[ $ST_SCROLLBACK == y ]]; then
+  verify_file 11 &&
+
+  cat ${SOURCE_CACHE}/${SOURCE11} > "${SOURCE_DIRECTORY}/${SOURCE11}" &&
+
+  if [[ $ST_LINE_SNAP_DELIMITER == y ]]; then
+    patch -p0 < "${SPELL_DIRECTORY}/scrollback_lsd.patch" || exit 1
+  fi &&
+
+  patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE11}" || exit 1
+fi &&
+
+if [[ $ST_SCROLLBACK_MOUSE == y ]]; then
+  verify_file 12 &&
+
+  patch -p1 < "${SOURCE_CACHE}/${SOURCE12}" || exit 1
+fi &&
+
+if [[ $ST_SCROLLBACK_MOUSE_ALTSCREEN == y ]]; then
+  verify_file 13 &&
+
+  patch -p1 < "${SOURCE_CACHE}/${SOURCE13}" || exit 1
+fi &&
+
+if [[ $ST_XRESOURCES_SIGNAL_RELOADING == y ]]; then
+  verify_file 14 &&
+
+  patch -p1 < "${SOURCE_CACHE}/${SOURCE14}" &&
+
+  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" || exit 1
+  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
-  let i++
-done
+fi &&
 
 if [[ "${ST_CONFIG}" == "y" ]]; then
   if [[ -e ${INSTALL_ROOT}/usr/share/doc/st/config.def.h ]]; then
diff --git a/shell-term-fm/st/blinking_cursor.patch 
b/shell-term-fm/st/blinking_cursor.patch
new file mode 100644
index 0000000..96e5966
--- /dev/null
+++ b/shell-term-fm/st/blinking_cursor.patch
@@ -0,0 +1,23 @@
+--- st-blinking_cursor-20211116-2f6e597.diff.orig      2022-10-05 
16:33:08.206590256 -0700
++++ st-blinking_cursor-20211116-2f6e597.diff   2022-10-05 16:34:51.246821546 
-0700
+@@ -43,14 +43,14 @@
+ index 89786b8..7d2447d 100644
+ --- a/x.c
+ +++ b/x.c
+-@@ -253,6 +253,7 @@ static char *opt_name  = NULL;
++@@ -256,6 +256,7 @@
++ static char *opt_line  = NULL;
++ static char *opt_name  = NULL;
+  static char *opt_title = NULL;
+- 
+- static int oldbutton = 3; /* button event on startup: 3 = release */
+ +static int cursorblinks = 0;
+- 
+- void
+- clipcopy(const Arg *dummy)
++
++ static uint buttons; /* bit field of pressed buttons */
++
+ @@ -1529,29 +1530,44 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int 
oy, Glyph og)
+       /* draw the new one */
+       if (IS_SET(MODE_FOCUSED)) {
diff --git a/shell-term-fm/st/scrollback_lsd.patch 
b/shell-term-fm/st/scrollback_lsd.patch
new file mode 100644
index 0000000..0f51e48
--- /dev/null
+++ b/shell-term-fm/st/scrollback_lsd.patch
@@ -0,0 +1,26 @@
+--- st-scrollback-0.8.5.diff.orig      2022-10-05 16:58:07.482512354 -0700
++++ st-scrollback-0.8.5.diff   2022-10-05 17:02:14.065461247 -0700
+@@ -23,14 +23,15 @@
+  
+  /* macros */
+  #define IS_SET(flag)         ((term.mode & (flag)) != 0)
+-@@ -42,6 +43,9 @@
+- #define ISCONTROLC1(c)               (BETWEEN(c, 0x80, 0x9f))
+- #define ISCONTROL(c)         (ISCONTROLC0(c) || ISCONTROLC1(c))
+- #define ISDELIM(u)           (u && wcschr(worddelimiters, u))
+-+#define TLINE(y)             ((y) < term.scr ? term.hist[((y) + term.histi 
- \
+-+                             term.scr + HISTSIZE + 1) % HISTSIZE] : \
+-+                             term.line[(y) - term.scr])
+- 
++@@ -43,6 +44,10 @@
++ #define ISCONTROL(c)           (ISCONTROLC0(c) || ISCONTROLC1(c))
++ #define ISDELIM(u)             (u && wcschr(worddelimiters, u))
++ #define IS_SNAP_LINE_DELIM(u) (u && wcschr(snap_line_delimiters, u))
+++#define TLINE(y)               ((y) < term.scr ? term.hist[((y) + 
term.histi - \
+++                               term.scr + HISTSIZE + 1) % HISTSIZE] : \
+++                               term.line[(y) - term.scr])
+++
++
+  enum term_mode {
+       MODE_WRAP        = 1 << 0,
+ @@ -115,6 +119,9 @@ typedef struct {
diff --git a/utils/dmenu/DETAILS b/utils/dmenu/DETAILS
index 4bffb84..d756228 100755
--- a/utils/dmenu/DETAILS
+++ b/utils/dmenu/DETAILS
@@ -8,42 +8,42 @@
      
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}
+  
SOURCE2_URL[0]=https://tools.suckless.org/${SPELL}/patches/password/${SOURCE2}
     
SOURCE2_HASH=sha512:455dfa017585962d64dbcb0a091c32809699f0e067ad28c94cc3bf86f4e6801b996bd4bac71ce15a5255114de5bdedc676b62fb76cb1b9f71be33017af1c72be
 fi
 if [[ $DMENU_LINEHEIGHT == y ]]; then
          SOURCE3=${SPELL}-lineheight-${PATCH_VERSION}.diff
-     
SOURCE3_URL=https://tools.suckless.org/${SPELL}/patches/line-height/${SOURCE3}
+  
SOURCE3_URL[0]=https://tools.suckless.org/${SPELL}/patches/line-height/${SOURCE3}
     
SOURCE3_HASH=sha512:b2fa2b33b9a2391285d0c3e5df22a9d68f4193bebb4720ce71678e8a87f43ae6c0a6b3f3fd3f63aa89be95880c04c8a83e43240b6ae4f90487bdb5a9325d084c
 fi
 if [[ $DMENU_MOUSE_SUPPORT == y ]]; then
          SOURCE4=${SPELL}-mousesupport-${PATCH3_VERSION}.diff
-     
SOURCE4_URL=https://tools.suckless.org/${SPELL}/patches/mouse-support/${SOURCE4}
+  
SOURCE4_URL[0]=https://tools.suckless.org/${SPELL}/patches/mouse-support/${SOURCE4}
     
SOURCE4_HASH=sha512:777dd2aeba4725bf4c6adff3bf510f6eb6bf1699db06897fed2576f1162eb94e1e581c8b0d02ad3beebe5491b9631baf873f67aa8926d676f5c8b493dc6be1d7
 fi
 if [[ $DMENU_NUMBERS == y ]]; then
          SOURCE5=${SPELL}-numbers-20220512-28fb3e2.diff
-     
SOURCE5_URL=https://tools.suckless.org/${SPELL}/patches/numbers/${SOURCE5}
+  
SOURCE5_URL[0]=https://tools.suckless.org/${SPELL}/patches/numbers/${SOURCE5}
     
SOURCE5_HASH=sha512:ff851cc4ff38f2bf8cad727a1dcc7a927b43aba1159ea14178a4aa894f83db715a7ef920183d7362110c9736299cc3c171a4d645c994f395dda6fd79fa5adc57
 fi
 if [[ $DMENU_XYW == y ]]; then
          SOURCE6=${SPELL}-xyw-${PATCH2_VERSION}.diff
-     SOURCE6_URL=https://tools.suckless.org/${SPELL}/patches/xyw/${SOURCE6}
+  SOURCE6_URL[0]=https://tools.suckless.org/${SPELL}/patches/xyw/${SOURCE6}
     
SOURCE6_HASH=sha512:af093f2e2be3c5c379add2340fcb9c4e63376a055849fe91685d033a486dae0b7d806b987b89498162ff00c3f47eaa0bda9601b08e5fdf4226af8bb18aa5057f
 fi
 if [[ $DMENU_FUZZYMATCH == y ]]; then
          SOURCE7=${SPELL}-fuzzymatch-${PATCH_VERSION}.diff
-     
SOURCE7_URL=https://tools.suckless.org/${SPELL}/patches/fuzzymatch/${SOURCE7}
+  
SOURCE7_URL[0]=https://tools.suckless.org/${SPELL}/patches/fuzzymatch/${SOURCE7}
     
SOURCE7_HASH=sha512:6ce4ce0ddb9c1058f253ce46cdae8949c468d97ce7d787831d8a4f4ebd4db672761e2552703f58d36d01b2933dea624a30627629027b9a5960b404542a40a732
 fi
 if [[ $DMENU_FUZZYHIGHLIGHT == y ]]; then
          SOURCE8=${SPELL}-fuzzyhighlight-${PATCH_VERSION}.diff
-     
SOURCE8_URL=https://tools.suckless.org/${SPELL}/patches/fuzzyhighlight/${SOURCE8}
+  
SOURCE8_URL[0]=https://tools.suckless.org/${SPELL}/patches/fuzzyhighlight/${SOURCE8}
     
SOURCE8_HASH=sha512:ce806c6481b20d5b2352fc387816878c75285162f6404b3a969a95f9dbd6c7476fd4c6571f260886fa30ccc40e4a388ea8f6902e40ff90447e04bec3faf0669d
 fi
 if [[ $DMENU_XRESOURCES_ALT == y ]]; then
          SOURCE9=${SPELL}-xresources-alt-${PATCH2_VERSION}.diff
-     
SOURCE9_URL=https://tools.suckless.org/${SPELL}/patches/xresources-alt/${SOURCE9}
+  
SOURCE9_URL[0]=https://tools.suckless.org/${SPELL}/patches/xresources-alt/${SOURCE9}
     
SOURCE9_HASH=sha512:ddd20d6c2f5e57fc8c60be53943d10656f6e41558750e28050ca23858aa0e7fe3b189788419e6a87cb24a85f0ab8c83a486320023117b4a4734a80882d1265a8
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/dmenu/HISTORY b/utils/dmenu/HISTORY
index a3ca6ff..d6f49dd 100644
--- a/utils/dmenu/HISTORY
+++ b/utils/dmenu/HISTORY
@@ -1,3 +1,7 @@
+2022-10-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: fixed source URLs
+       * PRE_BUILD: added patch guards
+
 2022-10-04 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 5.2; updated numbers patch
        * PRE_BUILD: apply and reorder patches
diff --git a/utils/dmenu/PRE_BUILD b/utils/dmenu/PRE_BUILD
index 8193301..c34e17b 100755
--- a/utils/dmenu/PRE_BUILD
+++ b/utils/dmenu/PRE_BUILD
@@ -6,13 +6,13 @@ if [[ $DMENU_PASSWORD == y ]]; then
 
   interdiff ${SOURCE_CACHE}/${SOURCE2} /dev/null > 
"${SOURCE_DIRECTORY}/${SOURCE2}" &&
   patch -p0 < "${SPELL_DIRECTORY}/password.patch" &&
-  patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE2}"
+  patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE2}" || exit 1
 fi &&
 
 if [[ $DMENU_LINEHEIGHT == y ]]; then
   verify_file 3 &&
 
-  cat ${SOURCE_CACHE}/${SOURCE3} | sed "s:@@ -683,6 +684,7 @@:@@ -685,6 
+686,7 @@:" | patch -p1 -F3 # ignore context in case previous patch was 
applied
+  cat ${SOURCE_CACHE}/${SOURCE3} | sed "s:@@ -683,6 +684,7 @@:@@ -685,6 
+686,7 @@:" | patch -p1 -F3 || exit 1 # ignore context in case previous patch 
was applied
 fi &&
 
 if [[ $DMENU_XRESOURCES_ALT == y ]]; then
@@ -22,22 +22,22 @@ if [[ $DMENU_XRESOURCES_ALT == y ]]; then
   patch -p0 < "${SPELL_DIRECTORY}/xresources-alt.patch" &&
 
   if [[ $DMENU_FUZZYHIGHLIGHT == y ]]; then
-    patch -p0 < "${SPELL_DIRECTORY}/xresources-alt_fhl.patch"
+    patch -p0 < "${SPELL_DIRECTORY}/xresources-alt_fhl.patch" || exit 1
   fi
 
-  patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE9}"
+  patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE9}" || exit 1
 fi &&
 
 if [[ $DMENU_MOUSE_SUPPORT == y ]]; then
   verify_file 4 &&
 
-  cat ${SOURCE_CACHE}/${SOURCE4} | patch -p1
+  cat ${SOURCE_CACHE}/${SOURCE4} | patch -p1 || exit 1
 fi &&
 
 if [[ $DMENU_NUMBERS == y ]]; then
   verify_file 5 &&
 
-  cat ${SOURCE_CACHE}/${SOURCE5} | patch -p1
+  cat ${SOURCE_CACHE}/${SOURCE5} | patch -p1 || exit 1
 fi &&
 
 if [[ $DMENU_XYW == y ]]; then
@@ -45,12 +45,12 @@ if [[ $DMENU_XYW == y ]]; then
 
   if [[ $DMENU_PASSWORD == y ]] || [[ $DMENU_LINEHEIGHT == y ]]; then
     if [[ $DMENU_MOUSE_SUPPORT == y ]]; then
-      cat ${SOURCE_CACHE}/${SOURCE6} | sed "s:@@ -690,6 +693,7 @@:@@ -691,6 
+694,7 @@:" | patch -p1 -F3 # ignore context in case password/lineheight 
patch was applied
+      cat ${SOURCE_CACHE}/${SOURCE6} | sed "s:@@ -690,6 +693,7 @@:@@ -691,6 
+694,7 @@:" | patch -p1 -F3 || exit 1 # ignore context in case 
password/lineheight patch was applied
     else
-      cat ${SOURCE_CACHE}/${SOURCE6} | patch -p1 -F3 # ignore context in 
case password/lineheight patch was applied
+      cat ${SOURCE_CACHE}/${SOURCE6} | patch -p1 -F3 || exit 1 # ignore 
context in case password/lineheight patch was applied
     fi
   else
-    cat ${SOURCE_CACHE}/${SOURCE6} | patch -p1
+    cat ${SOURCE_CACHE}/${SOURCE6} | patch -p1 || exit 1
   fi
 fi &&
 
@@ -60,9 +60,9 @@ if [[ $DMENU_FUZZYMATCH == y ]]; then
   cat ${SOURCE_CACHE}/${SOURCE7} > "${SOURCE_DIRECTORY}/${SOURCE7}" &&
 
   if [[ $DMENU_XRESOURCES_ALT == y ]]; then
-    patch -p0 < "${SPELL_DIRECTORY}/fuzzymatch_xra.patch"
+    patch -p0 < "${SPELL_DIRECTORY}/fuzzymatch_xra.patch" || exit 1
   else
-    patch -p0 < "${SPELL_DIRECTORY}/fuzzymatch.patch"
+    patch -p0 < "${SPELL_DIRECTORY}/fuzzymatch.patch" || exit 1
   fi &&
 
   patch -p1 < "${SOURCE_DIRECTORY}/${SOURCE7}" &&
@@ -74,13 +74,13 @@ if [[ $DMENU_FUZZYHIGHLIGHT == y ]]; then
   verify_file 8 &&
 
   cat ${SOURCE_CACHE}/${SOURCE8} > "${SOURCE_DIRECTORY}/${SOURCE8}" &&
-  patch -p0 < "${SPELL_DIRECTORY}/fuzzyhighlight.patch"
+  patch -p0 < "${SPELL_DIRECTORY}/fuzzyhighlight.patch" &&
 
   if [[ $DMENU_XRESOURCES_ALT == y ]]; then
-    patch -p0 < "${SPELL_DIRECTORY}/fuzzyhighlight_xra.patch"
+    patch -p0 < "${SPELL_DIRECTORY}/fuzzyhighlight_xra.patch" || exit 1
   fi &&
 
-  patch -p1 -F3 < "${SOURCE_DIRECTORY}/${SOURCE8}"
+  patch -p1 -F3 < "${SOURCE_DIRECTORY}/${SOURCE8}" || exit 1
 fi &&
 
 if is_version_less $(installed_version fontconfig) 2.11.91; then