From 388bc926a6cd0fde9d4a78f4bab3a425db8efd81 Mon Sep 17 00:00:00 2001 From: hovercats Date: Fri, 17 Jun 2022 10:35:05 +0200 Subject: [PATCH] no longer needs gcr to build --- Makefile | 2 +- README | 1 + arg.h | 48 ------------------------------------- config.def.h | 7 +++--- config.mk | 8 +++---- surf.1 | 3 --- surf.c | 68 +++++++++++++++++++++++++++++----------------------- 7 files changed, 47 insertions(+), 90 deletions(-) delete mode 100644 arg.h diff --git a/Makefile b/Makefile index 1edf820..ce329de 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ options: surf: $(OBJ) $(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) -$(OBJ) $(WOBJ): config.h common.h config.mk +$(OBJ) $(WOBJ): config.h config.mk config.h: cp config.def.h $@ diff --git a/README b/README index 226a1d2..d065594 100644 --- a/README +++ b/README @@ -9,6 +9,7 @@ Patches/Changes - Quit-hotkey - Surf websearch - Fixed manpage accordingly +- Patched out the need for gcr (thanks to kyx0r) Requirements ------------ diff --git a/arg.h b/arg.h deleted file mode 100644 index ba3fb3f..0000000 --- a/arg.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copy me if you can. - * by 20h - */ - -#ifndef ARG_H__ -#define ARG_H__ - -extern char *argv0; - -/* use main(int argc, char *argv[]) */ -#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\ - argv[0] && argv[0][0] == '-'\ - && argv[0][1];\ - argc--, argv++) {\ - char argc_;\ - char **argv_;\ - int brk_;\ - if (argv[0][1] == '-' && argv[0][2] == '\0') {\ - argv++;\ - argc--;\ - break;\ - }\ - for (brk_ = 0, argv[0]++, argv_ = argv;\ - argv[0][0] && !brk_;\ - argv[0]++) {\ - if (argv_ != argv)\ - break;\ - argc_ = argv[0][0];\ - switch (argc_) -#define ARGEND }\ - } - -#define ARGC() argc_ - -#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\ - ((x), abort(), (char *)0) :\ - (brk_ = 1, (argv[0][1] != '\0')?\ - (&argv[0][1]) :\ - (argc--, argv++, argv[0]))) - -#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\ - (char *)0 :\ - (brk_ = 1, (argv[0][1] != '\0')?\ - (&argv[0][1]) :\ - (argc--, argv++, argv[0]))) - -#endif diff --git a/config.def.h b/config.def.h index ba2c3cb..8a7ebac 100644 --- a/config.def.h +++ b/config.def.h @@ -153,11 +153,11 @@ static Key keys[] = { { 0, GDK_KEY_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) }, { 0, GDK_KEY_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND", PROMPT_FIND) }, { 0, GDK_KEY_s, spawn, SEARCH() }, - { 0, GDK_KEY_m, spawn, BM_ADD("_SURF_URI") }, + { 0, GDK_KEY_m, spawn, BM_ADD("_SURF_URI") }, { 0, GDK_KEY_c, stop, { 0 } }, - { 0, GDK_KEY_i, insert, { .i = 1 } }, - { 0, GDK_KEY_Escape, insert, { .i = 0 } }, + { 0, GDK_KEY_i, insert, { .i = 1 } }, + { 0, GDK_KEY_Escape, insert, { .i = 0 } }, { 0, GDK_KEY_q, quit, { 0 } }, { 0, GDK_KEY_r, reload, { .i = 0 } }, @@ -187,7 +187,6 @@ static Key keys[] = { { 0|GDK_SHIFT_MASK, GDK_KEY_n, find, { .i = -1 } }, { 0|GDK_SHIFT_MASK, GDK_KEY_p, print, { 0 } }, - { MODKEY, GDK_KEY_t, showcert, { 0 } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_a, togglecookiepolicy, { 0 } }, { 0, GDK_KEY_F11, togglefullscreen, { 0 } }, diff --git a/config.mk b/config.mk index 2eb9fb0..a3f3ee0 100644 --- a/config.mk +++ b/config.mk @@ -12,10 +12,10 @@ LIBDIR = $(LIBPREFIX)/surf X11INC = `pkg-config --cflags x11` X11LIB = `pkg-config --libs x11` -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` -WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` +GTKINC = `pkg-config --cflags gtk+-3.0 webkit2gtk-4.1` +GTKLIB = `pkg-config --libs gtk+-3.0 webkit2gtk-4.1` +WEBEXTINC = `pkg-config --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` +WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` # includes and libs INCS = $(X11INC) $(GTKINC) diff --git a/surf.1 b/surf.1 index 1b0b806..76b8b6f 100644 --- a/surf.1 +++ b/surf.1 @@ -209,9 +209,6 @@ Open up a searchbar .B m Bookmark current URL .TP -.B Ctrl\-t -Display the current TLS certificate in a popup window. -.TP .B Ctrl\-Shift\-a Toggle through the the .I cookie policies\fR. diff --git a/surf.c b/surf.c index c0307f8..cb39b93 100644 --- a/surf.c +++ b/surf.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -24,15 +23,49 @@ #include #include #include -#include #include #include #include #include -#include -#include "arg.h" -#include "common.h" +/* use main(int argc, char *argv[]) */ +#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\ + argv[0] && argv[0][0] == '-'\ + && argv[0][1];\ + argc--, argv++) {\ + char argc_;\ + char **argv_;\ + int brk_;\ + if (argv[0][1] == '-' && argv[0][2] == '\0') {\ + argv++;\ + argc--;\ + break;\ + }\ + for (brk_ = 0, argv[0]++, argv_ = argv;\ + argv[0][0] && !brk_;\ + argv[0]++) {\ + if (argv_ != argv)\ + break;\ + argc_ = argv[0][0];\ + switch (argc_) +#define ARGEND }\ + } + +#define ARGC() argc_ + +#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\ + ((x), abort(), (char *)0) :\ + (brk_ = 1, (argv[0][1] != '\0')?\ + (&argv[0][1]) :\ + (argc--, argv++, argv[0]))) + +#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\ + (char *)0 :\ + (brk_ = 1, (argv[0][1] != '\0')?\ + (&argv[0][1]) :\ + (argc--, argv++, argv[0]))) + +#define MSGBUFSZ 8 #define LENGTH(x) (sizeof(x) / sizeof(x[0])) #define CLEANMASK(mask) (mask & (MODKEY|GDK_SHIFT_MASK)) @@ -142,7 +175,6 @@ typedef struct { } SiteSpecific; /* Surf */ -static void die(const char *errstr, ...); static void usage(void); static void setup(void); static void sigchld(int unused); @@ -1824,30 +1856,6 @@ print(Client *c, const Arg *a) GTK_WINDOW(c->win)); } -void -showcert(Client *c, const Arg *a) -{ - GTlsCertificate *cert = c->failedcert ? c->failedcert : c->cert; - GcrCertificate *gcrt; - GByteArray *crt; - GtkWidget *win; - GcrCertificateWidget *wcert; - - if (!cert) - return; - - g_object_get(cert, "certificate", &crt, NULL); - gcrt = gcr_simple_certificate_new(crt->data, crt->len); - g_byte_array_unref(crt); - - win = gtk_window_new(GTK_WINDOW_TOPLEVEL); - wcert = gcr_certificate_widget_new(gcrt); - g_object_unref(gcrt); - - gtk_container_add(GTK_CONTAINER(win), GTK_WIDGET(wcert)); - gtk_widget_show_all(win); -} - void clipboard(Client *c, const Arg *a) {