From 16502150d0e22b68bca5f142c48d925618ec0c17 Mon Sep 17 00:00:00 2001 From: odrling Date: Thu, 8 Sep 2022 03:44:32 +0200 Subject: [PATCH] x11-terms/st: update patches --- .../0001-move-config-to-st-flexipatch.patch | 14 +++++++------- .../st/files/0002-disable-dynamic-colors.patch | 6 +++--- x11-terms/st/files/0003-update-color-theme.patch | 6 +++--- .../st/files/0004-dynamic-cursor-color.patch | 6 +++--- .../st/files/0005-move-with-termmod-j-k.patch | 16 ++++++++-------- .../st/files/0006-enable-more-patches-ig.patch | 10 +++++----- x11-terms/st/files/0007-scroll-mouse-patch.patch | 8 ++++---- x11-terms/st/files/0008-st-sync-patch.patch | 8 ++++---- x11-terms/st/files/0009-undercurl.patch | 12 ++++++------ x11-terms/st/files/0010-anysize-simple.patch | 6 +++--- .../files/0011-set-new-font-scale-binding.patch | 8 ++++---- x11-terms/st/files/0012-swapmouse.patch | 8 ++++---- x11-terms/st/files/0013-relative-border.patch | 10 +++++----- 13 files changed, 59 insertions(+), 59 deletions(-) diff --git a/x11-terms/st/files/0001-move-config-to-st-flexipatch.patch b/x11-terms/st/files/0001-move-config-to-st-flexipatch.patch index 5938ffe..79a481f 100644 --- a/x11-terms/st/files/0001-move-config-to-st-flexipatch.patch +++ b/x11-terms/st/files/0001-move-config-to-st-flexipatch.patch @@ -1,4 +1,4 @@ -From e8918b17414a267c2b79b9a4458c92f552ec87e9 Mon Sep 17 00:00:00 2001 +From 8a4e81bd4b454561ffa6b2911308784011e919f6 Mon Sep 17 00:00:00 2001 From: odrling Date: Sun, 7 Mar 2021 16:12:13 +0100 Subject: [PATCH 01/13] move config to st-flexipatch @@ -9,7 +9,7 @@ Subject: [PATCH 01/13] move config to st-flexipatch 2 files changed, 34 insertions(+), 39 deletions(-) diff --git a/config.def.h b/config.def.h -index 8e36213..aaf74c1 100644 +index 02fa4ca..9ee9c38 100644 --- a/config.def.h +++ b/config.def.h @@ -5,7 +5,7 @@ @@ -123,7 +123,7 @@ index 8e36213..aaf74c1 100644 /* diff --git a/patches.def.h b/patches.def.h -index 4345a4a..36a6b57 100644 +index 26ae7e6..2e79d14 100644 --- a/patches.def.h +++ b/patches.def.h @@ -32,7 +32,7 @@ @@ -153,7 +153,7 @@ index 4345a4a..36a6b57 100644 /* Reading and writing st's screen through a pipe, e.g. pass info to dmenu. * https://st.suckless.org/patches/externalpipe/ -@@ -264,7 +264,7 @@ +@@ -272,7 +272,7 @@ /* Scroll back through terminal output using Shift+{PageUp, PageDown}. * https://st.suckless.org/patches/scrollback/ */ @@ -162,7 +162,7 @@ index 4345a4a..36a6b57 100644 /* Scroll back through terminal output using Shift+MouseWheel. * This variant depends on SCROLLBACK_PATCH being enabled. -@@ -368,7 +368,7 @@ +@@ -390,7 +390,7 @@ /* Vertically center lines in the space available if you have set a larger chscale in config.h * https://st.suckless.org/patches/vertcenter/ */ @@ -171,7 +171,7 @@ index 4345a4a..36a6b57 100644 /* The vim-browse patch offers the possibility to move through the terminal history-buffer, * search for strings using VIM-like motions, operations and quantifiers. It overlays the -@@ -388,14 +388,14 @@ +@@ -410,14 +410,14 @@ /* Adds support for w3m images. * https://st.suckless.org/patches/w3m/ */ @@ -189,5 +189,5 @@ index 4345a4a..36a6b57 100644 /* There is a known issue that Google's Variable Fonts (VF) can end up with letter spacing * that is too wide in programs that use Xft, for example Inconsolata v3.000. -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0002-disable-dynamic-colors.patch b/x11-terms/st/files/0002-disable-dynamic-colors.patch index 1a5fbab..3e3d146 100644 --- a/x11-terms/st/files/0002-disable-dynamic-colors.patch +++ b/x11-terms/st/files/0002-disable-dynamic-colors.patch @@ -1,4 +1,4 @@ -From c2668389df418eab245f4936b5552b559db073e2 Mon Sep 17 00:00:00 2001 +From def3f653fc2a6d4b48c7014d0a9a5dc3458e6ea4 Mon Sep 17 00:00:00 2001 From: odrling Date: Thu, 25 Mar 2021 17:47:16 +0100 Subject: [PATCH 02/13] disable dynamic colors @@ -8,7 +8,7 @@ Subject: [PATCH 02/13] disable dynamic colors 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches.def.h b/patches.def.h -index 36a6b57..efca5f5 100644 +index 2e79d14..3457532 100644 --- a/patches.def.h +++ b/patches.def.h @@ -141,7 +141,7 @@ @@ -21,5 +21,5 @@ index 36a6b57..efca5f5 100644 /* Reading and writing st's screen through a pipe, e.g. pass info to dmenu. * https://st.suckless.org/patches/externalpipe/ -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0003-update-color-theme.patch b/x11-terms/st/files/0003-update-color-theme.patch index 201d39c..5703eb7 100644 --- a/x11-terms/st/files/0003-update-color-theme.patch +++ b/x11-terms/st/files/0003-update-color-theme.patch @@ -1,4 +1,4 @@ -From b12b5f295bf21235e7c281a7e8d97a687eb7fe83 Mon Sep 17 00:00:00 2001 +From d48d583c388f298793e8833339deeb188ba0b3d8 Mon Sep 17 00:00:00 2001 From: odrling Date: Thu, 26 May 2022 22:43:52 +0200 Subject: [PATCH 03/13] update color theme @@ -8,7 +8,7 @@ Subject: [PATCH 03/13] update color theme 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/config.def.h b/config.def.h -index aaf74c1..b7ca396 100644 +index 9ee9c38..e43f2ab 100644 --- a/config.def.h +++ b/config.def.h @@ -164,32 +164,36 @@ float alphaUnfocused = 0.6; @@ -81,5 +81,5 @@ index aaf74c1..b7ca396 100644 #if VIM_BROWSE_PATCH unsigned int const currentBg = 6, buffSize = 2048; -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0004-dynamic-cursor-color.patch b/x11-terms/st/files/0004-dynamic-cursor-color.patch index f35d759..66a9920 100644 --- a/x11-terms/st/files/0004-dynamic-cursor-color.patch +++ b/x11-terms/st/files/0004-dynamic-cursor-color.patch @@ -1,4 +1,4 @@ -From abb49aa6ad46582b481dbc523c3ff0d99e91f985 Mon Sep 17 00:00:00 2001 +From 5be338e6298340e24018f63d64dffd296fdd2684 Mon Sep 17 00:00:00 2001 From: odrling Date: Thu, 26 May 2022 22:51:03 +0200 Subject: [PATCH 04/13] dynamic cursor color @@ -8,7 +8,7 @@ Subject: [PATCH 04/13] dynamic cursor color 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches.def.h b/patches.def.h -index efca5f5..36a6b57 100644 +index 3457532..2e79d14 100644 --- a/patches.def.h +++ b/patches.def.h @@ -141,7 +141,7 @@ @@ -21,5 +21,5 @@ index efca5f5..36a6b57 100644 /* Reading and writing st's screen through a pipe, e.g. pass info to dmenu. * https://st.suckless.org/patches/externalpipe/ -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0005-move-with-termmod-j-k.patch b/x11-terms/st/files/0005-move-with-termmod-j-k.patch index c7b37f8..b3a612c 100644 --- a/x11-terms/st/files/0005-move-with-termmod-j-k.patch +++ b/x11-terms/st/files/0005-move-with-termmod-j-k.patch @@ -1,4 +1,4 @@ -From 7f388e7503d8aa3fa83510de108bef23d89ddbce Mon Sep 17 00:00:00 2001 +From 4463e7367fbc980d3fe43e5f0489d794c1974fc9 Mon Sep 17 00:00:00 2001 From: odrling Date: Thu, 26 May 2022 23:01:04 +0200 Subject: [PATCH 05/13] move with termmod + j/k @@ -8,18 +8,18 @@ Subject: [PATCH 05/13] move with termmod + j/k 1 file changed, 2 insertions(+) diff --git a/config.def.h b/config.def.h -index b7ca396..5549bff 100644 +index e43f2ab..9dc4968 100644 --- a/config.def.h +++ b/config.def.h -@@ -410,6 +410,8 @@ static Shortcut shortcuts[] = { +@@ -395,6 +395,8 @@ static Shortcut shortcuts[] = { #if SCROLLBACK_PATCH - { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, - { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, -+ { TERMMOD, XK_K, kscrollup, {.i = 1} }, -+ { TERMMOD, XK_J, kscrolldown, {.i = 1} }, + { ShiftMask, XK_Page_Up, kscrollup, {.i = -1}, S_PRI }, + { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1}, S_PRI }, ++ { TERMMOD, XK_K, kscrollup, {.i = 1}, S_PRI }, ++ { TERMMOD, XK_J, kscrolldown, {.i = 1}, S_PRI }, #endif // SCROLLBACK_PATCH #if CLIPBOARD_PATCH { TERMMOD, XK_Y, clippaste, {.i = 0} }, -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0006-enable-more-patches-ig.patch b/x11-terms/st/files/0006-enable-more-patches-ig.patch index 2dd10ff..e23e185 100644 --- a/x11-terms/st/files/0006-enable-more-patches-ig.patch +++ b/x11-terms/st/files/0006-enable-more-patches-ig.patch @@ -1,4 +1,4 @@ -From 04f0a74d34f21adcbeb2b591b8a965af23717fe5 Mon Sep 17 00:00:00 2001 +From 21b61362d4a6db5252281756b9d170078fe6cdce Mon Sep 17 00:00:00 2001 From: odrling Date: Thu, 26 May 2022 23:08:37 +0200 Subject: [PATCH 06/13] enable more patches ig @@ -8,7 +8,7 @@ Subject: [PATCH 06/13] enable more patches ig 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches.def.h b/patches.def.h -index 36a6b57..6799455 100644 +index 2e79d14..c7009b8 100644 --- a/patches.def.h +++ b/patches.def.h @@ -63,7 +63,7 @@ @@ -36,8 +36,8 @@ index 36a6b57..6799455 100644 -#define NEWTERM_PATCH 0 +#define NEWTERM_PATCH 1 - /* Open contents of the clipboard in a user-defined browser. - * https://st.suckless.org/patches/open_copied_url/ + /* This patch will set the _MOTIF_WM_HINTS property for the st window which, if the window manager + * respects it, will show the st window without window decorations. -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0007-scroll-mouse-patch.patch b/x11-terms/st/files/0007-scroll-mouse-patch.patch index 6ebc057..efd1dd4 100644 --- a/x11-terms/st/files/0007-scroll-mouse-patch.patch +++ b/x11-terms/st/files/0007-scroll-mouse-patch.patch @@ -1,4 +1,4 @@ -From 155524a9677e835c5cbe06498797655173cf7a0c Mon Sep 17 00:00:00 2001 +From c1dc6a219659fd88419f44a37097ab70ea4e875e Mon Sep 17 00:00:00 2001 From: odrling Date: Fri, 27 May 2022 00:35:49 +0200 Subject: [PATCH 07/13] scroll mouse patch @@ -8,10 +8,10 @@ Subject: [PATCH 07/13] scroll mouse patch 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches.def.h b/patches.def.h -index 6799455..0ceb5c4 100644 +index c7009b8..020bc59 100644 --- a/patches.def.h +++ b/patches.def.h -@@ -270,7 +270,7 @@ +@@ -278,7 +278,7 @@ * This variant depends on SCROLLBACK_PATCH being enabled. * https://st.suckless.org/patches/scrollback/ */ @@ -21,5 +21,5 @@ index 6799455..0ceb5c4 100644 /* Scroll back through terminal output using mouse wheel (when not in MODE_ALTSCREEN). * This variant depends on SCROLLBACK_PATCH being enabled. -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0008-st-sync-patch.patch b/x11-terms/st/files/0008-st-sync-patch.patch index 5612dbb..065d1a1 100644 --- a/x11-terms/st/files/0008-st-sync-patch.patch +++ b/x11-terms/st/files/0008-st-sync-patch.patch @@ -1,4 +1,4 @@ -From 3d0c5918c2baa6d6ac6ec25ca2d3bce7592afbf8 Mon Sep 17 00:00:00 2001 +From fc4a4356fc50085858ed304d340f405b8d47e264 Mon Sep 17 00:00:00 2001 From: odrling Date: Fri, 27 May 2022 00:37:18 +0200 Subject: [PATCH 08/13] st sync patch @@ -8,10 +8,10 @@ Subject: [PATCH 08/13] st sync patch 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches.def.h b/patches.def.h -index 0ceb5c4..0e650b0 100644 +index 020bc59..c406975 100644 --- a/patches.def.h +++ b/patches.def.h -@@ -332,7 +332,7 @@ +@@ -340,7 +340,7 @@ * * https://st.suckless.org/patches/sync/ */ @@ -21,5 +21,5 @@ index 0ceb5c4..0e650b0 100644 /* Instead of a default X cursor, use the xterm cursor from your cursor theme. * You need to uncomment the corresponding line in config.mk to use the -lXcursor library -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0009-undercurl.patch b/x11-terms/st/files/0009-undercurl.patch index 2b88d40..b5e6921 100644 --- a/x11-terms/st/files/0009-undercurl.patch +++ b/x11-terms/st/files/0009-undercurl.patch @@ -1,4 +1,4 @@ -From 180611bed53b94638dc05d9ff3571f7ee77442a3 Mon Sep 17 00:00:00 2001 +From ec07e072f4605cb8b5be02486d55f89cb144bf76 Mon Sep 17 00:00:00 2001 From: odrling Date: Fri, 27 May 2022 00:38:36 +0200 Subject: [PATCH 09/13] undercurl @@ -9,10 +9,10 @@ Subject: [PATCH 09/13] undercurl 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.def.h b/config.def.h -index 5549bff..9e6f82a 100644 +index 9dc4968..3071936 100644 --- a/config.def.h +++ b/config.def.h -@@ -763,5 +763,5 @@ static char *plumb_cmd = "plumb"; +@@ -748,5 +748,5 @@ static char *plumb_cmd = "plumb"; #define UNDERCURL_SPIKY 1 #define UNDERCURL_CAPPED 2 // Active style @@ -20,10 +20,10 @@ index 5549bff..9e6f82a 100644 +#define UNDERCURL_STYLE UNDERCURL_CAPPED #endif // UNDERCURL_PATCH diff --git a/patches.def.h b/patches.def.h -index 0e650b0..aaed7d2 100644 +index c406975..837b904 100644 --- a/patches.def.h +++ b/patches.def.h -@@ -357,7 +357,7 @@ +@@ -365,7 +365,7 @@ * * https://st.suckless.org/patches/undercurl/ */ @@ -33,5 +33,5 @@ index 0e650b0..aaed7d2 100644 /* Allows mouse scroll without modifier keys for regardless of alt screen using the external * scroll program. -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0010-anysize-simple.patch b/x11-terms/st/files/0010-anysize-simple.patch index bd2249a..c03436e 100644 --- a/x11-terms/st/files/0010-anysize-simple.patch +++ b/x11-terms/st/files/0010-anysize-simple.patch @@ -1,4 +1,4 @@ -From fb5506bff6177847553bded32ebaa2a3a119deb7 Mon Sep 17 00:00:00 2001 +From 0e7b872a1cd79ad01cdd23515c7453eeaedd451d Mon Sep 17 00:00:00 2001 From: odrling Date: Fri, 27 May 2022 02:09:19 +0200 Subject: [PATCH 10/13] anysize simple @@ -8,7 +8,7 @@ Subject: [PATCH 10/13] anysize simple 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches.def.h b/patches.def.h -index aaed7d2..a046b4d 100644 +index 837b904..5c6d41b 100644 --- a/patches.def.h +++ b/patches.def.h @@ -32,12 +32,12 @@ @@ -27,5 +27,5 @@ index aaed7d2..a046b4d 100644 /* Draws a background image in farbfeld format in place of the defaultbg color allowing for pseudo * transparency. -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0011-set-new-font-scale-binding.patch b/x11-terms/st/files/0011-set-new-font-scale-binding.patch index 1e21cd4..fc8eb4e 100644 --- a/x11-terms/st/files/0011-set-new-font-scale-binding.patch +++ b/x11-terms/st/files/0011-set-new-font-scale-binding.patch @@ -1,4 +1,4 @@ -From 9dccd760d1faba64fce80cfb2f7d06d064a937ee Mon Sep 17 00:00:00 2001 +From fef1701dfca816c3afb66813c46261955a5cbfaa Mon Sep 17 00:00:00 2001 From: odrling Date: Fri, 27 May 2022 02:09:49 +0200 Subject: [PATCH 11/13] set new font scale binding @@ -8,10 +8,10 @@ Subject: [PATCH 11/13] set new font scale binding 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.def.h b/config.def.h -index 9e6f82a..9bc9177 100644 +index 3071936..c8e6208 100644 --- a/config.def.h +++ b/config.def.h -@@ -402,8 +402,8 @@ static Shortcut shortcuts[] = { +@@ -387,8 +387,8 @@ static Shortcut shortcuts[] = { { ControlMask, XK_Print, toggleprinter, {.i = 0} }, { ShiftMask, XK_Print, printscreen, {.i = 0} }, { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, @@ -23,5 +23,5 @@ index 9e6f82a..9bc9177 100644 { TERMMOD, XK_C, clipcopy, {.i = 0} }, { TERMMOD, XK_V, clippaste, {.i = 0} }, -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0012-swapmouse.patch b/x11-terms/st/files/0012-swapmouse.patch index d1f32f5..2424552 100644 --- a/x11-terms/st/files/0012-swapmouse.patch +++ b/x11-terms/st/files/0012-swapmouse.patch @@ -1,4 +1,4 @@ -From dc59c1bca0c5bca5f68829d64d52422397aa5e56 Mon Sep 17 00:00:00 2001 +From 4e4383504cf3d47599ac1d38af3631b2dd947c25 Mon Sep 17 00:00:00 2001 From: odrling Date: Fri, 27 May 2022 02:29:39 +0200 Subject: [PATCH 12/13] swapmouse @@ -8,10 +8,10 @@ Subject: [PATCH 12/13] swapmouse 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches.def.h b/patches.def.h -index a046b4d..7e31539 100644 +index 5c6d41b..56854ec 100644 --- a/patches.def.h +++ b/patches.def.h -@@ -319,7 +319,7 @@ +@@ -327,7 +327,7 @@ * shown by vte terminals like termite. * https://st.suckless.org/patches/swapmouse/ */ @@ -21,5 +21,5 @@ index a046b4d..7e31539 100644 /* This patch adds synchronized-updates/application-sync support in st. * This will have no effect except when an application uses the synchronized-update escape -- -2.37.2 +2.37.3 diff --git a/x11-terms/st/files/0013-relative-border.patch b/x11-terms/st/files/0013-relative-border.patch index 4f8f84a..d75f7a9 100644 --- a/x11-terms/st/files/0013-relative-border.patch +++ b/x11-terms/st/files/0013-relative-border.patch @@ -1,4 +1,4 @@ -From bea178a82ad8a0eff95dcb70126330598241f4ee Mon Sep 17 00:00:00 2001 +From 2f49ed98f7506e036d5ab0e9446ea548ad55d7f2 Mon Sep 17 00:00:00 2001 From: odrling Date: Fri, 27 May 2022 02:39:03 +0200 Subject: [PATCH 13/13] relative border @@ -9,7 +9,7 @@ Subject: [PATCH 13/13] relative border 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.def.h b/config.def.h -index 9bc9177..7236797 100644 +index c8e6208..06ec158 100644 --- a/config.def.h +++ b/config.def.h @@ -27,7 +27,7 @@ static const int pseudotransparency = 0; @@ -22,10 +22,10 @@ index 9bc9177..7236797 100644 static int borderpx = 2; #endif // RELATIVEBORDER_PATCH diff --git a/patches.def.h b/patches.def.h -index 7e31539..e8bc45b 100644 +index 56854ec..78b2320 100644 --- a/patches.def.h +++ b/patches.def.h -@@ -253,7 +253,7 @@ +@@ -261,7 +261,7 @@ * in the terminal. * https://st.suckless.org/patches/relativeborder/ */ @@ -35,5 +35,5 @@ index 7e31539..e8bc45b 100644 /* This patch allows you to right-click on some selected text to send it to the plumbing * program of choice, e.g. open a file, view an image, open a URL. -- -2.37.2 +2.37.3