Commit

st: Update patch-config_def_h for 0.8.4
Daniel Moch committed 3 years ago (Tree)

Diffstat

 x11/st/patches/patch-config_def_h | 37 +++++++++++---------------------

x11/st/patches/patch-config_def_h

1 -<<<<<<< patch-config_def_h
2 ---- config.def.h Sat Feb 9 06:50:41 2019
3 -+++ /home/djmoch/src/dotcom-git/pkgbuild/st/config.h Mon Dec 30 19:50:45 2019
1 +--- config.def.h.orig Fri Jun 19 05:29:45 2020
2 ++++ config.def.h Wed Aug 5 12:02:44 2020
4 3 @@ -5,7 +5,7 @@
5 4 *
6 5 * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
. . .
8 7 -static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
9 8 +static char *font = "monospace:size=9:antialias=true:autohint=false,emoji:size=8:antialias=true:autohint=false";
10 9 static int borderpx = 2;
11 -
10 +
12 11 /*
13 -@@ -63,7 +63,7 @@
12 +@@ -74,7 +74,7 @@
14 13 static int bellvolume = 0;
15 -
14 +
16 15 /* default TERM value */
17 16 -char *termname = "st-256color";
18 17 +char *termname = "st";
19 -
18 +
20 19 /*
21 20 * spaces per tab
22 -@@ -85,30 +85,26 @@
21 +@@ -96,30 +96,26 @@
23 22 /* Terminal colors (16 first used in escape sequence) */
24 23 static const char *colorname[] = {
25 24 /* 8 normal colors */
. . .
30 29 - "blue2",
31 30 - "magenta3",
32 31 - "cyan3",
33 -=======
34 -$OpenBSD: patch-config_def_h,v 1.12 2020/05/23 19:32:37 mestre Exp $
35 -Index: config.def.h
36 ---- config.def.h.orig
37 -+++ config.def.h
38 -@@ -94,7 +94,7 @@ static const char *colorname[] = {
39 - "blue2",
40 - "magenta3",
41 - "cyan3",
42 ->>>>>>> 1.12
43 32 - "gray90",
44 33 + "#000000",
45 34 + "#870000",
. . .
49 38 + "#875FAF",
50 39 + "#008080",
51 40 + "#BCBCBC",
52 -
41 +
53 42 /* 8 bright colors */
54 43 - "gray50",
55 44 - "red",
. . .
67 56 + "#D787FF",
68 57 + "#87FF87",
69 58 + "#FFFFFF",
70 -
59 +
71 60 [255] = 0,
72 61 -
73 62 - /* more colors can be added after 255 to use with DefaultXX */
74 63 - "#cccccc",
75 64 - "#555555",
76 65 };
77 -
78 -
79 -@@ -116,10 +112,10 @@
66 +
67 +
68 +@@ -127,10 +123,10 @@
80 69 * Default colors (colorname index)
81 70 * foreground, background, cursor, reverse cursor
82 71 */
. . .
88 77 +unsigned int defaultbg = 15;
89 78 +static unsigned int defaultcs = 0;
90 79 +static unsigned int defaultrcs = 15;
91 -
80 +
92 81 /*
93 82 * Default shape of cursor