commit dc9ec6c
hovercats
·
2025-01-13 09:57:12 +0000 UTC
parent 67e50f4
surf: dont set default fontsize
10 files changed,
+64,
-38
+7,
-6
1@@ -1,7 +1,8 @@
2 6095a698544d69f413e277d4b97913a738fcca4bea7885b325c6fef6fc9c6840b9
3-a65498dae604effe2781f3d3cf707fe7081df338c9e5aee1b6b7dafd2bf7d9d938
4-84a76a3dc9e5551c9f248c52df02bc403642b2e1b37dfe57044ea7765e19834c21
5-9b7ed8a6af0ae71701d36438af99cb5a4bd7b39f1266dcfa18edc410009935fe33
6-34c332ffd3ce2cc543c07e76ba1b27454c189023e53165b3843764762b22b9f186
7-d9489a73af424f8e0651756ab45bc5477a220b301fa4658413dc763bf8f48bd5c8
8-7b2580e3ad50da24b93d5a6cc248377084582f431782f8c1866181337b704f96ca
9+e21d4dedd6ddf80fe54ac39c7470328d6c8eb2eefd3722ee54d30cc2e5cfe2cf5f
10+58713963e01a2c9da5c2499bd71bf4b9785884ab8d44e5d5860e7033e53807d76d
11+f3f3a5fa2fed7b019f8c58cdf966813b6f894e280425c91bb9f2396a75f8006031
12+1a1756f3b84cd832c79c38e03c99ea6e1eb15a6176adb9166cae036eaaa8234548
13+c5d832459a7dd6a24fe5c4b60f53d96ca7155c4d50d69eb73833239d71f1f39e49
14+bbc4b66c6281e7fef6dc6de883418ecf1eaa509af5c570dad92e311ead5d45e0d6
15+9767fab366cca2aba002f1ea17cb55d90b76af9eff60a1d39829ac5fd4664dd869
1@@ -1,7 +1,7 @@
2-From 9e58d334893f059a1bc4fb45bba79debeef211af Mon Sep 17 00:00:00 2001
3+From 847d9f04844e150626db39db9c67a91fd1d33c4a Mon Sep 17 00:00:00 2001
4 From: hovercats <hovercatswithlasereyes@protonmail.com>
5 Date: Tue, 29 Aug 2023 22:56:07 +0200
6-Subject: [PATCH 1/4] remove the need for gcr
7+Subject: [PATCH] remove the need for gcr
8
9 ---
10 Makefile | 2 +-
11@@ -14,7 +14,7 @@ Subject: [PATCH 1/4] remove the need for gcr
12 delete mode 100644 arg.h
13
14 diff --git a/Makefile b/Makefile
15-index 1edf820..e071a91 100644
16+index e5d4172..db98eda 100644
17 --- a/Makefile
18 +++ b/Makefile
19 @@ -22,7 +22,7 @@ options:
20@@ -226,5 +226,5 @@ index af0fa74..9186fc7 100644
21 clipboard(Client *c, const Arg *a)
22 {
23 --
24-2.42.0
25+2.45.1
26
1@@ -1,7 +1,7 @@
2-From f79c9427db7f671362dbae79ca03d0b149cb8037 Mon Sep 17 00:00:00 2001
3+From 1aabf78be1168a0f727d33acc08f7ea6792c0b4e Mon Sep 17 00:00:00 2001
4 From: hovercats <hovercatswithlasereyes@protonmail.com>
5 Date: Tue, 29 Aug 2023 22:58:53 +0200
6-Subject: [PATCH 2/4] set cache/cookiedir to /tmp, and the rest to ~/etc/surf
7+Subject: [PATCH] set cache/cookiedir to /tmp, and the rest to ~/etc/surf
8
9 ---
10 config.def.h | 10 +++++-----
11@@ -29,5 +29,5 @@ index 2745e79..71d5890 100644
12 /* Webkit default features */
13 /* Highest priority value will be used.
14 --
15-2.42.0
16+2.45.1
17
1@@ -1,4 +1,4 @@
2-From 678b2e7872358e7e67be0780d58456e356c15a17 Mon Sep 17 00:00:00 2001
3+From c485576bf781e99bc6770ba43d92b2d1e7935b48 Mon Sep 17 00:00:00 2001
4 From: hovercats <hovercatswithlasereyes@protonmail.com>
5 Date: Sun, 3 Dec 2023 16:44:06 +0100
6 Subject: [PATCH] add quit hotkey
7@@ -10,7 +10,7 @@ Subject: [PATCH] add quit hotkey
8 3 files changed, 13 insertions(+)
9
10 diff --git a/config.def.h b/config.def.h
11-index ef44721..57f78d7 100644
12+index 71d5890..bbff6f0 100644
13 --- a/config.def.h
14 +++ b/config.def.h
15 @@ -134,6 +134,8 @@ static Key keys[] = {
16@@ -23,7 +23,7 @@ index ef44721..57f78d7 100644
17 { MODKEY|GDK_SHIFT_MASK, GDK_KEY_r, reload, { .i = 1 } },
18 { MODKEY, GDK_KEY_r, reload, { .i = 0 } },
19 diff --git a/surf.1 b/surf.1
20-index 496afb9..a42be2f 100644
21+index 78e8f9c..7fee3c3 100644
22 --- a/surf.1
23 +++ b/surf.1
24 @@ -134,6 +134,9 @@ which surf should use.
25@@ -37,10 +37,10 @@ index 496afb9..a42be2f 100644
26 Walks back the history.
27 .TP
28 diff --git a/surf.c b/surf.c
29-index af0fa74..16f28f4 100644
30+index 9186fc7..7abb207 100644
31 --- a/surf.c
32 +++ b/surf.c
33-@@ -228,6 +228,7 @@ static void scrollv(Client *c, const Arg *a);
34+@@ -260,6 +260,7 @@ static void scrollv(Client *c, const Arg *a);
35 static void scrollh(Client *c, const Arg *a);
36 static void navigate(Client *c, const Arg *a);
37 static void stop(Client *c, const Arg *a);
38@@ -48,7 +48,7 @@ index af0fa74..16f28f4 100644
39 static void toggle(Client *c, const Arg *a);
40 static void togglefullscreen(Client *c, const Arg *a);
41 static void togglecookiepolicy(Client *c, const Arg *a);
42-@@ -1900,6 +1901,13 @@ stop(Client *c, const Arg *a)
43+@@ -1908,6 +1909,13 @@ stop(Client *c, const Arg *a)
44 webkit_web_view_stop_loading(c->view);
45 }
46
47@@ -63,5 +63,5 @@ index af0fa74..16f28f4 100644
48 toggle(Client *c, const Arg *a)
49 {
50 --
51-2.43.0
52+2.45.1
53
1@@ -1,7 +1,7 @@
2-From 444ac633cedab97d6227b63665fa43a65aebca70 Mon Sep 17 00:00:00 2001
3+From 203324d5e4fc84440ff4a494c9c802a05c5292e4 Mon Sep 17 00:00:00 2001
4 From: hovercats <hovercatswithlasereyes@protonmail.com>
5 Date: Tue, 29 Aug 2023 23:34:53 +0200
6-Subject: [PATCH 4/4] apply searchengines patch
7+Subject: [PATCH] apply searchengines patch
8
9 ---
10 config.def.h | 6 ++++++
11@@ -9,7 +9,7 @@ Subject: [PATCH 4/4] apply searchengines patch
12 2 files changed, 27 insertions(+), 1 deletion(-)
13
14 diff --git a/config.def.h b/config.def.h
15-index a6a4692..6c26c34 100644
16+index bbff6f0..f47c36d 100644
17 --- a/config.def.h
18 +++ b/config.def.h
19 @@ -7,6 +7,12 @@ static char *certdir = "~/etc/surf/certificates/";
20@@ -80,5 +80,5 @@ index 7abb207..f0e361f 100644
21 pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
22 {
23 --
24-2.42.0
25+2.45.1
26
R repo/surf/patches/0005-use-clipboard.patch =>
repo/surf/patches/0005-Added-choice-between-PRIMARY-and-CLIPBOARD-Gtk-selec.patch
+8,
-8
1@@ -1,4 +1,4 @@
2-From a6a8878bb6a203b589d559025b94a78214f22878 Mon Sep 17 00:00:00 2001
3+From 73f7772765667140052c978570c580789f0bbffa Mon Sep 17 00:00:00 2001
4 From: Olivier Moreau <m242@protonmail.com>
5 Date: Sun, 12 Jan 2020 11:23:11 +0000
6 Subject: [PATCH] Added choice between PRIMARY and CLIPBOARD Gtk selections, as
7@@ -10,10 +10,10 @@ Subject: [PATCH] Added choice between PRIMARY and CLIPBOARD Gtk selections, as
8 2 files changed, 10 insertions(+), 2 deletions(-)
9
10 diff --git a/config.def.h b/config.def.h
11-index 34265f6..03bbe2b 100644
12+index f47c36d..8057e88 100644
13 --- a/config.def.h
14 +++ b/config.def.h
15-@@ -48,6 +48,7 @@ static Parameter defconfig[ParameterLast] = {
16+@@ -53,6 +53,7 @@ static Parameter defconfig[ParameterLast] = {
17 [Style] = { { .i = 1 }, },
18 [WebGL] = { { .i = 0 }, },
19 [ZoomLevel] = { { .f = 1.0 }, },
20@@ -22,10 +22,10 @@ index 34265f6..03bbe2b 100644
21
22 static UriParameters uriparams[] = {
23 diff --git a/surf.c b/surf.c
24-index 2b54e3c..b8a9b2f 100644
25+index f0e361f..2d2ef12 100644
26 --- a/surf.c
27 +++ b/surf.c
28-@@ -82,6 +82,7 @@ typedef enum {
29+@@ -116,6 +116,7 @@ typedef enum {
30 Style,
31 WebGL,
32 ZoomLevel,
33@@ -33,7 +33,7 @@ index 2b54e3c..b8a9b2f 100644
34 ParameterLast
35 } ParamName;
36
37-@@ -291,6 +292,7 @@ static ParamName loadcommitted[] = {
38+@@ -330,6 +331,7 @@ static ParamName loadcommitted[] = {
39 SpellLanguages,
40 Style,
41 ZoomLevel,
42@@ -41,7 +41,7 @@ index 2b54e3c..b8a9b2f 100644
43 ParameterLast
44 };
45
46-@@ -1816,13 +1818,18 @@ showcert(Client *c, const Arg *a)
47+@@ -1856,13 +1858,18 @@ print(Client *c, const Arg *a)
48 void
49 clipboard(Client *c, const Arg *a)
50 {
51@@ -63,5 +63,5 @@ index 2b54e3c..b8a9b2f 100644
52 }
53 }
54 --
55-2.24.1
56+2.45.1
57
1@@ -1,4 +1,4 @@
2-From cd4785280b4c02d1c71ea30d9278fea8f8bdca65 Mon Sep 17 00:00:00 2001
3+From 8a6738460f48af138953852e7e8a39d0d89fdf4e Mon Sep 17 00:00:00 2001
4 From: hovercats <hovercatswithlasereyes@protonmail.com>
5 Date: Sun, 3 Dec 2023 16:36:54 +0100
6 Subject: [PATCH] add bookmarking using bmks
7@@ -45,10 +45,10 @@ index 8057e88..99dbf50 100644
8 { MODKEY, GDK_KEY_c, stop, { 0 } },
9
10 diff --git a/surf.1 b/surf.1
11-index 78e8f9c..d9734cc 100644
12+index 7fee3c3..ac32ba2 100644
13 --- a/surf.1
14 +++ b/surf.1
15-@@ -158,6 +158,15 @@ Scroll horizontally to the right.
16+@@ -161,6 +161,15 @@ Scroll horizontally to the right.
17 .B Ctrl\-u
18 Scroll horizontally to the left.
19 .TP
20@@ -65,5 +65,5 @@ index 78e8f9c..d9734cc 100644
21 Zooms page in.
22 .TP
23 --
24-2.43.0
25+2.45.1
26
1@@ -0,0 +1,24 @@
2+From 7a70a2da1e33bab652f71da5f2d5c6fd5669610d Mon Sep 17 00:00:00 2001
3+From: "Franc[e]sco" <lolisamurai@tfwno.gf>
4+Date: Thu, 11 Jun 2020 04:19:13 +0200
5+Subject: [PATCH] don't set default font size
6+
7+---
8+ surf.c | 1 -
9+ 1 file changed, 1 deletion(-)
10+
11+diff --git a/surf.c b/surf.c
12+index 2d2ef12..262efd2 100644
13+--- a/surf.c
14++++ b/surf.c
15+@@ -1150,7 +1150,6 @@ newview(Client *c, WebKitWebView *rv)
16+ "allow-universal-access-from-file-urls", curconfig[FileURLsCrossAccess].val.i,
17+ "auto-load-images", curconfig[LoadImages].val.i,
18+ "default-charset", curconfig[DefaultCharset].val.v,
19+- "default-font-size", curconfig[FontSize].val.i,
20+ "enable-caret-browsing", curconfig[CaretBrowsing].val.i,
21+ "enable-developer-extras", curconfig[Inspector].val.i,
22+ "enable-dns-prefetching", curconfig[DNSPrefetch].val.i,
23+--
24+2.45.1
25+
+2,
-1
1@@ -3,5 +3,6 @@ patches/0001-remove-the-need-for-gcr.patch
2 patches/0002-set-cache-cookiedir-to-tmp-and-the-rest-to-etc-surf.patch
3 patches/0003-add-quit-hotkey.patch
4 patches/0004-apply-searchengines-patch.patch
5-patches/0005-use-clipboard.patch
6+patches/0005-Added-choice-between-PRIMARY-and-CLIPBOARD-Gtk-selec.patch
7 patches/0006-add-bookmarking-using-bmks.patch
8+patches/0007-don-t-set-default-font-size.patch
+1,
-1
1@@ -1 +1 @@
2-2.1 4
3+2.1 5