New commits:
commit 97f621760228284eda6d840add9a329abdf564e4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
st: handle all patch combinations
diff --git a/shell-term-fm/st/DETAILS b/shell-term-fm/st/DETAILS
index 548a3a5..032699a 100755
--- a/shell-term-fm/st/DETAILS
+++ b/shell-term-fm/st/DETAILS
@@ -38,7 +38,7 @@ if [[ $ST_UNDERCURL == y ]]; then
SOURCE8_URL[0]=https://st.suckless.org/patches/undercurl/${SOURCE8}
SOURCE8_HASH=sha512:8d22d10839df6e30460ee4c1a3fd9b1fe89e87685bf82c1a7bea8cba913516e14a55db29065ff047eb83cb90b0866d3a8b3b854754dbf8132ff59679e0eef314
fi
-if [[ $ST_XRESOURCES == y ]]; then
+if [[ $ST_XRESOURCES == "original" ]]; then
SOURCE9=${SPELL}-xresources-20200604-9ba7ecf.diff
SOURCE9_URL[0]=https://st.suckless.org/patches/xresources/${SOURCE9}
SOURCE9_HASH=sha512:1d3a9e780e76b19ea123948973d80d8c1f5a691c31c3e45ac62813d7d6b1c82fc3c170e7437615b4555d078835bc8065a06b758a9177b327119cf645f5d05736
@@ -63,7 +63,7 @@ if [[ $ST_SCROLLBACK_MOUSE_ALTSCREEN == y ]]; then
SOURCE13_URL[0]=https://st.suckless.org/patches/scrollback/${SOURCE13}
SOURCE13_HASH=sha512:f0cdce2c8b05abbb5228edb0fdda1b8e30991bc688dd7fb53edc61f76a688cb4df5d23af2cc93c878185324e103d7a5ff591153a2d29215e65d36115a082f76f
fi
-if [[ $ST_XRESOURCES_SIGNAL_RELOADING == y ]]; then
+if [[ $ST_XRESOURCES == "signal-reloading" ]]; then
SOURCE14=${SPELL}-xresources-signal-reloading-20220407-ef05519.diff
SOURCE14_HASH=sha512:0ed790b18ff92d3f2bbc3635b396fc2a1858d2e63d24ccc69af3d4360c2ec0cd41b6acb7cce3316ccc6d7a5ef8a34fdd8b7af434c98c75f7ece1675280176879
diff --git a/shell-term-fm/st/HISTORY b/shell-term-fm/st/HISTORY
index bdf1a22..5c11dec 100644
--- a/shell-term-fm/st/HISTORY
+++ b/shell-term-fm/st/HISTORY
@@ -4,6 +4,8 @@
* PRE_BUILD: rewritten
* PREPARE: added, for optional patch support
* {blinking_cursor,scrollback_lsd}.patch: added, for 0.9 transition
+ * alpha_{hidecursor,xr,xr_hidecursor}.patch, scrollback_copyurl.patch,
+ undercurl.patch: added, for combination handling
2022-08-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: added alpha, scrollback and xresources with reload signal
diff --git a/shell-term-fm/st/PREPARE b/shell-term-fm/st/PREPARE
index 0e90ae1..9d40d61 100755
--- a/shell-term-fm/st/PREPARE
+++ b/shell-term-fm/st/PREPARE
@@ -6,11 +6,11 @@ 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_list ST_XRESOURCES "Apply st xresources patch?" \
+ none \
+ original \
+ signal-reloading &&
config_query ST_SCROLLBACK "Apply st scrollback patch?" n &&
diff --git a/shell-term-fm/st/PRE_BUILD b/shell-term-fm/st/PRE_BUILD
index e7e7650..8004f92 100755
--- a/shell-term-fm/st/PRE_BUILD
+++ b/shell-term-fm/st/PRE_BUILD
@@ -43,10 +43,13 @@ fi &&
if [[ $ST_UNDERCURL == y ]]; then
verify_file 8 &&
+ if [[ $ST_COPYURL == y ]]; then
+ patch -p0 < "${SPELL_DIRECTORY}/scrollback_copyurl.patch" || exit 1
+ fi &&
+
if [[ $ST_LINE_SNAP_DELIMITER == y ]]; then
patch -p0 < "${SPELL_DIRECTORY}/scrollback_lsd.patch" || exit 1
fi &&
@@ -82,7 +103,7 @@ if [[ $ST_SCROLLBACK_MOUSE_ALTSCREEN == y ]]; then
patch -p1 < "${SOURCE_CACHE}/${SOURCE13}" || exit 1
fi &&
-if [[ $ST_XRESOURCES_SIGNAL_RELOADING == y ]]; then
+if [[ $ST_XRESOURCES == "signal-reloading" ]]; then
verify_file 14 &&