From 488948469f6aafd36efc657e1136c095e7a7ac7b Mon Sep 17 00:00:00 2001 From: odrling Date: Sun, 21 Aug 2022 01:35:10 +0200 Subject: [PATCH] x11-terms/st: update patches --- .../0001-move-config-to-st-flexipatch.patch | 27 +++++++------------ .../files/0002-disable-dynamic-colors.patch | 4 +-- .../st/files/0003-update-color-theme.patch | 10 +++---- .../st/files/0004-dynamic-cursor-color.patch | 4 +-- .../st/files/0005-move-with-termmod-j-k.patch | 8 +++--- .../files/0006-enable-more-patches-ig.patch | 4 +-- .../st/files/0007-scroll-mouse-patch.patch | 4 +-- x11-terms/st/files/0008-st-sync-patch.patch | 4 +-- x11-terms/st/files/0009-undercurl.patch | 8 +++--- x11-terms/st/files/0010-anysize-simple.patch | 4 +-- .../0011-set-new-font-scale-binding.patch | 8 +++--- x11-terms/st/files/0012-swapmouse.patch | 4 +-- x11-terms/st/files/0013-relative-border.patch | 6 ++--- 13 files changed, 44 insertions(+), 51 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 cac155b..5938ffe 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,15 +1,15 @@ -From 191c8ca669c1b75b993cb6918bc41c2ba44675fc Mon Sep 17 00:00:00 2001 +From e8918b17414a267c2b79b9a4458c92f552ec87e9 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 --- - config.def.h | 61 +++++++++++++++++++++++---------------------------- + config.def.h | 59 +++++++++++++++++++++++---------------------------- patches.def.h | 14 ++++++------ - 2 files changed, 35 insertions(+), 40 deletions(-) + 2 files changed, 34 insertions(+), 39 deletions(-) diff --git a/config.def.h b/config.def.h -index 5b0f055..b6ee43d 100644 +index 8e36213..aaf74c1 100644 --- a/config.def.h +++ b/config.def.h @@ -5,7 +5,7 @@ @@ -21,7 +21,7 @@ index 5b0f055..b6ee43d 100644 #if FONT2_PATCH /* Spare fonts */ static char *font2[] = { -@@ -114,11 +114,11 @@ static unsigned int cursorthickness = 2; +@@ -116,11 +116,11 @@ static unsigned int cursorthickness = 2; * Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored. * 0: disable (render all U25XX glyphs normally from the font). */ @@ -35,7 +35,7 @@ index 5b0f055..b6ee43d 100644 #endif // BOXDRAW_PATCH /* -@@ -162,32 +162,32 @@ float alphaUnfocused = 0.6; +@@ -164,32 +164,32 @@ float alphaUnfocused = 0.6; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { /* 8 normal colors */ @@ -88,7 +88,7 @@ index 5b0f055..b6ee43d 100644 }; -@@ -195,13 +195,8 @@ static const char *colorname[] = { +@@ -197,13 +197,8 @@ static const char *colorname[] = { * Default colors (colorname index) * foreground, background, cursor, reverse cursor */ @@ -104,7 +104,7 @@ index 5b0f055..b6ee43d 100644 unsigned int defaultcs = 256; unsigned int defaultrcs = 257; -@@ -237,7 +232,7 @@ Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11}, +@@ -239,7 +234,7 @@ Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11}, * 7: Blinking st cursor * 8: Steady st cursor */ @@ -113,7 +113,7 @@ index 5b0f055..b6ee43d 100644 static Rune stcursor = 0x2603; /* snowman (U+2603) */ #else /* -@@ -247,7 +242,7 @@ static Rune stcursor = 0x2603; /* snowman (U+2603) */ +@@ -249,7 +244,7 @@ static Rune stcursor = 0x2603; /* snowman (U+2603) */ * 6: Bar ("|") * 7: Snowman ("☃") */ @@ -122,13 +122,6 @@ index 5b0f055..b6ee43d 100644 #endif // BLINKING_CURSOR_PATCH /* -@@ -752,4 +747,4 @@ static char *plumb_cmd = "plumb"; - #define UNDERCURL_CAPPED 2 - // Active style - #define UNDERCURL_STYLE UNDERCURL_SPIKY --#endif // UNDERCURL_PATCH -\ No newline at end of file -+#endif // UNDERCURL_PATCH diff --git a/patches.def.h b/patches.def.h index 4345a4a..36a6b57 100644 --- a/patches.def.h @@ -196,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.35.1 +2.37.2 diff --git a/x11-terms/st/files/0002-disable-dynamic-colors.patch b/x11-terms/st/files/0002-disable-dynamic-colors.patch index a2e2849..1a5fbab 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 2bf4587ca7ab32eb262183cb89a31c79aeafab81 Mon Sep 17 00:00:00 2001 +From c2668389df418eab245f4936b5552b559db073e2 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 @@ -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.35.1 +2.37.2 diff --git a/x11-terms/st/files/0003-update-color-theme.patch b/x11-terms/st/files/0003-update-color-theme.patch index 0696a8c..201d39c 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 3cbf9c47e3c249ab2d1f10b7cfde03c4a6ce6c31 Mon Sep 17 00:00:00 2001 +From b12b5f295bf21235e7c281a7e8d97a687eb7fe83 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,10 +8,10 @@ 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 b6ee43d..581bb61 100644 +index aaf74c1..b7ca396 100644 --- a/config.def.h +++ b/config.def.h -@@ -162,32 +162,36 @@ float alphaUnfocused = 0.6; +@@ -164,32 +164,36 @@ float alphaUnfocused = 0.6; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { /* 8 normal colors */ @@ -66,7 +66,7 @@ index b6ee43d..581bb61 100644 }; -@@ -195,10 +199,10 @@ static const char *colorname[] = { +@@ -197,10 +201,10 @@ static const char *colorname[] = { * Default colors (colorname index) * foreground, background, cursor, reverse cursor */ @@ -81,5 +81,5 @@ index b6ee43d..581bb61 100644 #if VIM_BROWSE_PATCH unsigned int const currentBg = 6, buffSize = 2048; -- -2.35.1 +2.37.2 diff --git a/x11-terms/st/files/0004-dynamic-cursor-color.patch b/x11-terms/st/files/0004-dynamic-cursor-color.patch index 6ad7e22..f35d759 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 c68e7a0a41c8d2ab03117f4faf80cbfc84902a91 Mon Sep 17 00:00:00 2001 +From abb49aa6ad46582b481dbc523c3ff0d99e91f985 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 @@ -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.35.1 +2.37.2 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 a3059d6..c7b37f8 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 611fad8eadb06848e9356b7fd2d77c850d35637c Mon Sep 17 00:00:00 2001 +From 7f388e7503d8aa3fa83510de108bef23d89ddbce 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,10 +8,10 @@ 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 581bb61..042fbcc 100644 +index b7ca396..5549bff 100644 --- a/config.def.h +++ b/config.def.h -@@ -402,6 +402,8 @@ static Shortcut shortcuts[] = { +@@ -410,6 +410,8 @@ static Shortcut shortcuts[] = { #if SCROLLBACK_PATCH { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, @@ -21,5 +21,5 @@ index 581bb61..042fbcc 100644 #if CLIPBOARD_PATCH { TERMMOD, XK_Y, clippaste, {.i = 0} }, -- -2.35.1 +2.37.2 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 1c63720..2dd10ff 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 5c62a55bba91069509ae649c3ee0016951f58834 Mon Sep 17 00:00:00 2001 +From 04f0a74d34f21adcbeb2b591b8a965af23717fe5 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 @@ -39,5 +39,5 @@ index 36a6b57..6799455 100644 /* Open contents of the clipboard in a user-defined browser. * https://st.suckless.org/patches/open_copied_url/ -- -2.35.1 +2.37.2 diff --git a/x11-terms/st/files/0007-scroll-mouse-patch.patch b/x11-terms/st/files/0007-scroll-mouse-patch.patch index 97f519a..6ebc057 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 0a194cf2e817805ed4558a6ed1f70a8f2134d124 Mon Sep 17 00:00:00 2001 +From 155524a9677e835c5cbe06498797655173cf7a0c 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 @@ -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.35.1 +2.37.2 diff --git a/x11-terms/st/files/0008-st-sync-patch.patch b/x11-terms/st/files/0008-st-sync-patch.patch index 78521c0..5612dbb 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 767d2313d38dcff641637cc0d144c5d38c360fc5 Mon Sep 17 00:00:00 2001 +From 3d0c5918c2baa6d6ac6ec25ca2d3bce7592afbf8 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 @@ -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.35.1 +2.37.2 diff --git a/x11-terms/st/files/0009-undercurl.patch b/x11-terms/st/files/0009-undercurl.patch index 145e5e2..2b88d40 100644 --- a/x11-terms/st/files/0009-undercurl.patch +++ b/x11-terms/st/files/0009-undercurl.patch @@ -1,4 +1,4 @@ -From 3b0b0f6177576d9f589ea3fc088c992449678428 Mon Sep 17 00:00:00 2001 +From 180611bed53b94638dc05d9ff3571f7ee77442a3 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 042fbcc..0da8375 100644 +index 5549bff..9e6f82a 100644 --- a/config.def.h +++ b/config.def.h -@@ -752,5 +752,5 @@ static char *plumb_cmd = "plumb"; +@@ -763,5 +763,5 @@ static char *plumb_cmd = "plumb"; #define UNDERCURL_SPIKY 1 #define UNDERCURL_CAPPED 2 // Active style @@ -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.35.1 +2.37.2 diff --git a/x11-terms/st/files/0010-anysize-simple.patch b/x11-terms/st/files/0010-anysize-simple.patch index 9867ce6..bd2249a 100644 --- a/x11-terms/st/files/0010-anysize-simple.patch +++ b/x11-terms/st/files/0010-anysize-simple.patch @@ -1,4 +1,4 @@ -From 0ae511fa7a321d16f9aaaa3585309214786968e9 Mon Sep 17 00:00:00 2001 +From fb5506bff6177847553bded32ebaa2a3a119deb7 Mon Sep 17 00:00:00 2001 From: odrling Date: Fri, 27 May 2022 02:09:19 +0200 Subject: [PATCH 10/13] anysize simple @@ -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.35.1 +2.37.2 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 30240c2..1e21cd4 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 1d3a493f1fbc61cc0365f1846af3a16ebd78efae Mon Sep 17 00:00:00 2001 +From 9dccd760d1faba64fce80cfb2f7d06d064a937ee 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 0da8375..2fe66ff 100644 +index 9e6f82a..9bc9177 100644 --- a/config.def.h +++ b/config.def.h -@@ -394,8 +394,8 @@ static Shortcut shortcuts[] = { +@@ -402,8 +402,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 0da8375..2fe66ff 100644 { TERMMOD, XK_C, clipcopy, {.i = 0} }, { TERMMOD, XK_V, clippaste, {.i = 0} }, -- -2.35.1 +2.37.2 diff --git a/x11-terms/st/files/0012-swapmouse.patch b/x11-terms/st/files/0012-swapmouse.patch index c0ad202..d1f32f5 100644 --- a/x11-terms/st/files/0012-swapmouse.patch +++ b/x11-terms/st/files/0012-swapmouse.patch @@ -1,4 +1,4 @@ -From 939afa675cbaed38620d509fb9473382b6fa9762 Mon Sep 17 00:00:00 2001 +From dc59c1bca0c5bca5f68829d64d52422397aa5e56 Mon Sep 17 00:00:00 2001 From: odrling Date: Fri, 27 May 2022 02:29:39 +0200 Subject: [PATCH 12/13] 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.35.1 +2.37.2 diff --git a/x11-terms/st/files/0013-relative-border.patch b/x11-terms/st/files/0013-relative-border.patch index 7f6b507..4f8f84a 100644 --- a/x11-terms/st/files/0013-relative-border.patch +++ b/x11-terms/st/files/0013-relative-border.patch @@ -1,4 +1,4 @@ -From 9d19e925cb82a6d9dccf0341215e7a718211b8ee Mon Sep 17 00:00:00 2001 +From bea178a82ad8a0eff95dcb70126330598241f4ee 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 2fe66ff..a3f0afb 100644 +index 9bc9177..7236797 100644 --- a/config.def.h +++ b/config.def.h @@ -27,7 +27,7 @@ static const int pseudotransparency = 0; @@ -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.35.1 +2.37.2