From e5ecaf777659e8d3a625002826c4a1a3f8b31801 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 13 Dec 2019 14:06:33 +0100 Subject: badwolf.c: Use SoupURI instead of g_uri_parse_scheme() --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0a58cda..cbd134e 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ DATADIR = $(PREFIX)/share/badwolf APPSDIR = $(PREFIX)/share/applications PACKAGE = Badwolf -DEPS = gtk+-3.0 webkit2gtk-4.0 +DEPS = gtk+-3.0 webkit2gtk-4.0 libsoup-2.4 OBJS = keybindings.o badwolf.o EXE = badwolf TRANS = fr.mo -- cgit v1.3.1-23-gd82d From e352d548e49bb448ba2b1db46a61163f65ec6abb Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 15 Dec 2019 18:10:11 +0100 Subject: Install docs --- Makefile | 10 +++++++++- version.sh | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cbd134e..a215292 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,12 @@ .POSIX: +VERSION = 0.4.0 +VERSION_FULL = $(VERSION)$(shell ./version.sh) + PREFIX = /usr/local BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/share/man +DOCDIR = $(PREFIX)/share/doc/badwolf-$(VERSION) DATADIR = $(PREFIX)/share/badwolf APPSDIR = $(PREFIX)/share/applications PACKAGE = Badwolf @@ -11,10 +15,11 @@ DEPS = gtk+-3.0 webkit2gtk-4.0 libsoup-2.4 OBJS = keybindings.o badwolf.o EXE = badwolf TRANS = fr.mo +DOCS = usr.bin.badwolf README.md KnowledgeBase.md CC = cc CFLAGS = -g -Wall -Wextra -Wconversion -Wsign-conversion -CDEPS = `pkg-config --cflags $(DEPS)` -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_DEFAULT_SOURCE -DVERSION=\"$(shell ./version.sh)\" +CDEPS = `pkg-config --cflags $(DEPS)` -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_DEFAULT_SOURCE -DVERSION=\"$(VERSION_FULL)\" LIBS = `pkg-config --libs $(DEPS)` all: $(EXE) $(TRANS) @@ -47,6 +52,9 @@ install: all cp -r locale/ $(DESTDIR)$(DATADIR) mkdir -p $(DESTDIR)$(APPSDIR) cp -p badwolf.desktop $(DESTDIR)$(APPSDIR)/ + mkdir -p $(DESTDIR)$(DOCDIR) + cp -p $(DOCS) $(DESTDIR)$(DOCDIR)/ + @printf '\nNote: An example AppArmor profile has been installed at '$(DOCDIR)/usr.bin.badwolf'\n' clean: rm -fr locale $(OBJS) $(EXE) diff --git a/version.sh b/version.sh index a87283e..318aa72 100755 --- a/version.sh +++ b/version.sh @@ -1,5 +1,4 @@ #!/bin/sh -echo -n '0.4.0' hash=$(git --git-dir="$(dirname $0)/.git" rev-parse --short HEAD 2>/dev/null) if [ -n "$hash" ] -- cgit v1.3.1-23-gd82d From 94bc1e381baacba8a45f5782f368af11eff279a7 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 15 Dec 2019 19:33:19 +0100 Subject: badwolf.c: Fix access() usage --- Makefile | 2 +- badwolf.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a215292..f2c5cee 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ DOCS = usr.bin.badwolf README.md KnowledgeBase.md CC = cc CFLAGS = -g -Wall -Wextra -Wconversion -Wsign-conversion -CDEPS = `pkg-config --cflags $(DEPS)` -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_DEFAULT_SOURCE -DVERSION=\"$(VERSION_FULL)\" +CDEPS = `pkg-config --cflags $(DEPS)` -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION_FULL)\" LIBS = `pkg-config --libs $(DEPS)` all: $(EXE) $(TRANS) diff --git a/badwolf.c b/badwolf.c index bf42eb2..909df75 100644 --- a/badwolf.c +++ b/badwolf.c @@ -11,7 +11,8 @@ #include /* g_fprintf() */ #include /* soup* */ #include /* LC_* */ -#include /* realpath(), malloc() */ +#include /* malloc() */ +#include /* access() */ const gchar *homepage = "https://hacktivis.me/projects/badwolf"; const gchar *version = VERSION; @@ -67,7 +68,7 @@ badwolf_ensure_uri_scheme(const gchar *text, gboolean try_file) { SoupURI *uri = soup_uri_new(text); - if(uri->path == NULL) + if(uri->path == NULL || text == NULL) { soup_uri_free(uri); return "about:blank"; -- cgit v1.3.1-23-gd82d From 06b34a53c2c7af02fbc673d53b5c13f40c2933a6 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 16 Dec 2019 01:47:12 +0100 Subject: Add tests on badwolf_ensure_uri_scheme --- Makefile | 19 ++++++++++++++----- badwolf.c | 26 +------------------------- badwolf.h | 12 ------------ uri.c | 39 +++++++++++++++++++++++++++++++++++++++ uri.h | 17 +++++++++++++++++ uri_test.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 125 insertions(+), 42 deletions(-) create mode 100644 uri.c create mode 100644 uri.h create mode 100644 uri_test.c (limited to 'Makefile') diff --git a/Makefile b/Makefile index f2c5cee..c065d79 100644 --- a/Makefile +++ b/Makefile @@ -12,13 +12,15 @@ APPSDIR = $(PREFIX)/share/applications PACKAGE = Badwolf DEPS = gtk+-3.0 webkit2gtk-4.0 libsoup-2.4 -OBJS = keybindings.o badwolf.o +OBJS = uri.o keybindings.o badwolf.o +OBJS_test = uri_test.o EXE = badwolf +EXE_test = uri_test TRANS = fr.mo DOCS = usr.bin.badwolf README.md KnowledgeBase.md CC = cc -CFLAGS = -g -Wall -Wextra -Wconversion -Wsign-conversion +CFLAGS = -g -Wall -Wextra -Wconversion -Wsign-conversion -O2 CDEPS = `pkg-config --cflags $(DEPS)` -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION_FULL)\" LIBS = `pkg-config --libs $(DEPS)` @@ -43,6 +45,14 @@ badwolf: $(OBJS) .c.o: $(CC) -std=c11 $(CFLAGS) $(CDEPS) -c -o $@ $< +uri_test: uri.o uri_test.o + $(CC) -std=c11 -o $@ uri.o uri_test.o $(LDFLAGS) $(LIBS) + ./$@ + +.PHONY: test +test: $(EXE_test) + +.PHONY: install install: all mkdir -p $(DESTDIR)$(BINDIR) cp -p badwolf $(DESTDIR)$(BINDIR)/badwolf @@ -56,10 +66,9 @@ install: all cp -p $(DOCS) $(DESTDIR)$(DOCDIR)/ @printf '\nNote: An example AppArmor profile has been installed at '$(DOCDIR)/usr.bin.badwolf'\n' +.PHONY: clean clean: - rm -fr locale $(OBJS) $(EXE) + rm -fr locale $(OBJS) $(OBJS_test) $(EXE) $(EXE_test) format: *.c *.h clang-format -style=file -assume-filename=.clang-format -i *.c *.h - -.PHONY: clean install diff --git a/badwolf.c b/badwolf.c index 909df75..627cb3f 100644 --- a/badwolf.c +++ b/badwolf.c @@ -6,13 +6,13 @@ #include "config.h" #include "keybindings.h" +#include "uri.h" #include /* _() and other internationalization/localization helpers */ #include /* g_fprintf() */ #include /* soup* */ #include /* LC_* */ #include /* malloc() */ -#include /* access() */ const gchar *homepage = "https://hacktivis.me/projects/badwolf"; const gchar *version = VERSION; @@ -63,30 +63,6 @@ static void closeCb_clicked(GtkButton *close, gpointer user_data); static void notebookCb_switch__page(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer user_data); -const gchar * -badwolf_ensure_uri_scheme(const gchar *text, gboolean try_file) -{ - SoupURI *uri = soup_uri_new(text); - - if(uri->path == NULL || text == NULL) - { - soup_uri_free(uri); - return "about:blank"; - } - - if(uri->scheme != NULL) - { - soup_uri_free(uri); - return text; - } - - soup_uri_free(uri); - - if(try_file && (access(text, R_OK) == 0)) return g_strdup_printf("file://%s", text); - - return g_strdup_printf("http://%s", text); -} - static gboolean WebViewCb_close(WebKitWebView *webView, gpointer user_data) { diff --git a/badwolf.h b/badwolf.h index 971ffa3..91c05a4 100644 --- a/badwolf.h +++ b/badwolf.h @@ -30,18 +30,6 @@ struct Client GtkWidget *search; }; -/* badwolf_ensure_uri_scheme: tries to add a scheme on a pseudo-URL missing a scheme - * - gchar text: pseudo-URL missing a scheme - * - gboolean try_file: when TRUE check try first if it can be a file:// path - * - * When `text` isn't exploitable (ie. NULL), returns "about:blank", - * when the URL seems to be valid, return it, - * if try_file is TRUE, check if it can be file:// path, - * some other checks might be added. - * In the end use the fallback (`http://` for now, might get configuration), - * might get some safeguard. - */ -const gchar *badwolf_ensure_uri_scheme(const gchar *text, gboolean try_file); GtkWidget *badwolf_new_tab_box(const gchar *title, struct Client *browser); void webView_tab_label_change(struct Client *browser, const gchar *title); struct Client * diff --git a/uri.c b/uri.c new file mode 100644 index 0000000..bc2bc01 --- /dev/null +++ b/uri.c @@ -0,0 +1,39 @@ +// BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser +// Copyright © 2019 Haelwenn (lanodan) Monnier +// SPDX-License-Identifier: BSD-3-Clause + +#include "uri.h" + +#include /* g_fprintf() */ +#include /* soup* */ +#include /* access() */ + +const gchar * +badwolf_ensure_uri_scheme(const gchar *text, gboolean try_file) +{ + const gchar *fallback = "about:blank"; + SoupURI *uri; + + uri = soup_uri_new(text); + if(!uri) return fallback; + + //g_fprintf(stderr, "uri->scheme = %s, uri->path = %s\n", uri->scheme, uri->path); + + if(!uri->path) + { + soup_uri_free(uri); + return fallback; + } + + if(uri->scheme) + { + soup_uri_free(uri); + return text; + } + + soup_uri_free(uri); + + if(try_file && (access(text, R_OK) == 0)) return g_strdup_printf("file://%s", text); + + return g_strdup_printf("http://%s", text); +} diff --git a/uri.h b/uri.h new file mode 100644 index 0000000..cef50b4 --- /dev/null +++ b/uri.h @@ -0,0 +1,17 @@ +#ifndef URI_H_INCLUDED +#define URI_H_INCLUDED +#include + +/* badwolf_ensure_uri_scheme: tries to add a scheme on a pseudo-URL missing a scheme + * - gchar text: pseudo-URL missing a scheme + * - gboolean try_file: when TRUE check try first if it can be a file:// path + * + * When `text` isn't exploitable (ie. NULL), returns "about:blank", + * when the URL seems to be valid, return it, + * if try_file is TRUE, check if it can be file:// path, + * some other checks might be added. + * In the end use the fallback (`http://` for now, might get configuration), + * might get some safeguard. + */ +const gchar *badwolf_ensure_uri_scheme(const gchar *text, gboolean try_file); +#endif /* URI_H_INCLUDED */ diff --git a/uri_test.c b/uri_test.c new file mode 100644 index 0000000..c5ebe7e --- /dev/null +++ b/uri_test.c @@ -0,0 +1,54 @@ +// BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser +// Copyright © 2019 Haelwenn (lanodan) Monnier +// SPDX-License-Identifier: BSD-3-Clause + +#include "uri.h" + +#include +#include + +static void +badwolf_ensure_uri_scheme_test(void) +{ + const gchar *fallback = "about:blank"; + + struct + { + const gchar *expect; + const gchar *text; + gboolean try_file; + } cases[] = { + // clang formatting hack + {fallback, NULL, FALSE}, + {fallback, NULL, TRUE}, + {fallback, "", FALSE}, + {fallback, "", TRUE}, + {fallback, "/dev/null", FALSE}, + //{"file://dev/null", "/dev/null", TRUE}, + //{"http://example.org", "example.org", FALSE}, + //{"http://example.org", "example.org", TRUE}, + //{fallback, "http://", FALSE}, + //{fallback, "http://", TRUE} + }; + + for(size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) + { + g_info("badwolf_ensure_uri_scheme(\"%s\", %s)", + cases[i].text, + cases[i].try_file ? "TRUE" : "FALSE"); + + const gchar *got = badwolf_ensure_uri_scheme(cases[i].text, cases[i].try_file); + + if(got != cases[i].expect) g_error("expected: \"%s\", got: \"%s\"", cases[i].expect, got); + } +} + +int +main(int argc, char *argv[]) +{ + g_test_init(&argc, &argv, NULL); + + g_test_add_func("/badwolf_ensure_uri_scheme/test", badwolf_ensure_uri_scheme_test); + + return g_test_run(); +} -- cgit v1.3.1-23-gd82d From 9579ef40ff0c16b905a444903688f2f343ff91a6 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 16 Dec 2019 03:24:30 +0100 Subject: uri_test.c: fixup --- Makefile | 2 +- uri_test.c | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c065d79..2612ad5 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ badwolf: $(OBJS) uri_test: uri.o uri_test.o $(CC) -std=c11 -o $@ uri.o uri_test.o $(LDFLAGS) $(LIBS) - ./$@ + $(DBG) ./$@ .PHONY: test test: $(EXE_test) diff --git a/uri_test.c b/uri_test.c index c5ebe7e..13fa3eb 100644 --- a/uri_test.c +++ b/uri_test.c @@ -18,17 +18,21 @@ badwolf_ensure_uri_scheme_test(void) const gchar *text; gboolean try_file; } cases[] = { - // clang formatting hack + // + {"http://uri.c", "http://uri.c", FALSE}, + {"http://uri.c", "http://uri.c", TRUE}, + {"file:///dev/null", "file:///dev/null", FALSE}, + {"file:///dev/null", "file:///dev/null", TRUE}, {fallback, NULL, FALSE}, {fallback, NULL, TRUE}, {fallback, "", FALSE}, {fallback, "", TRUE}, - {fallback, "/dev/null", FALSE}, - //{"file://dev/null", "/dev/null", TRUE}, - //{"http://example.org", "example.org", FALSE}, - //{"http://example.org", "example.org", TRUE}, - //{fallback, "http://", FALSE}, - //{fallback, "http://", TRUE} + {"http:///dev/null", "/dev/null", FALSE}, + {"file:///dev/null", "/dev/null", TRUE}, + {"http://example.org", "example.org", FALSE}, + {"http://example.org", "example.org", TRUE}, + {"http://", "http://", FALSE}, + {"http://", "http://", TRUE} // }; for(size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) @@ -39,7 +43,10 @@ badwolf_ensure_uri_scheme_test(void) const gchar *got = badwolf_ensure_uri_scheme(cases[i].text, cases[i].try_file); - if(got != cases[i].expect) g_error("expected: \"%s\", got: \"%s\"", cases[i].expect, got); + if(g_strcmp0(got, cases[i].expect) != 0) + { + g_error("expected: \"%s\", got: \"%s\"", cases[i].expect, got); + } } } -- cgit v1.3.1-23-gd82d From 5659b01a5069b36cfd23e35b5a3caa5371f4f446 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 16 Dec 2019 04:09:23 +0100 Subject: Makefile: fix for NetBSD make --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2612ad5..0d9344f 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ TRANS = fr.mo DOCS = usr.bin.badwolf README.md KnowledgeBase.md CC = cc +DBG = CFLAGS = -g -Wall -Wextra -Wconversion -Wsign-conversion -O2 CDEPS = `pkg-config --cflags $(DEPS)` -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION_FULL)\" LIBS = `pkg-config --libs $(DEPS)` -- cgit v1.3.1-23-gd82d From 3f954fa3e26f437d436260719fb9d3ab4110aa74 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 16 Dec 2019 05:32:40 +0100 Subject: Update translation --- Makefile | 8 ++++--- po/fr.po | 66 ++++++++++++++++++++++++++++++++++++++++++------------- po/messages.pot | 68 +++++++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 108 insertions(+), 34 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0d9344f..8a5dd69 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ APPSDIR = $(PREFIX)/share/applications PACKAGE = Badwolf DEPS = gtk+-3.0 webkit2gtk-4.0 libsoup-2.4 +SRCS = uri.c uri_test.c keybindings.c badwolf.c OBJS = uri.o keybindings.o badwolf.o OBJS_test = uri_test.o EXE = badwolf @@ -24,18 +25,19 @@ DBG = CFLAGS = -g -Wall -Wextra -Wconversion -Wsign-conversion -O2 CDEPS = `pkg-config --cflags $(DEPS)` -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION_FULL)\" LIBS = `pkg-config --libs $(DEPS)` +MSGFMT = msgfmt all: $(EXE) $(TRANS) -po/messages.pot: badwolf.c - xgettext --keyword=_ --language=C -o $@ --add-comments --sort-output -j --copyright-holder="Haelwenn (lanodan) Monnier " --package-name="$(PACKAGE)" --package-version="$(shell ./version.sh)" --msgid-bugs-address="contact+badwolf-msgid@hacktivis.me" badwolf.c +po/messages.pot: $(SRCS) + xgettext --keyword=_ --language=C -o $@ --add-comments --sort-output -j --copyright-holder="Haelwenn (lanodan) Monnier " --package-name="$(PACKAGE)" --package-version="$(VERSION_FULL)" --msgid-bugs-address="contact+badwolf-msgid@hacktivis.me" $(SRCS) po/%.po: po/messages.pot msgmerge --update $@ $< ${TRANS}: po/${@:.mo=.po} mkdir -p locale/${@:.mo=}/LC_MESSAGES - msgfmt -o locale/${@:.mo=}/LC_MESSAGES/$(PACKAGE).mo po/${@:.mo=.po} + $(MSGFMT) -o locale/${@:.mo=}/LC_MESSAGES/$(PACKAGE).mo po/${@:.mo=.po} badwolf: $(OBJS) $(CC) -std=c11 -o $@ $(OBJS) $(LDFLAGS) $(LIBS) diff --git a/po/fr.po b/po/fr.po index 2b99fcb..0bf9863 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Badwolf 0.3.0+gd88f2e7\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2019-10-31 14:09+0100\n" +"POT-Creation-Date: 2019-12-16 05:26+0100\n" "PO-Revision-Date: 2019-05-11 05:03+0200\n" "Last-Translator: Haelwenn (lanodan) Monnier \n" "Language-Team: French\n" @@ -17,30 +17,66 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: badwolf.c:527 badwolf.c:692 badwolf.c:719 +#: badwolf.c:378 +msgid "Add Exception" +msgstr "Ajouter une Exception" + +#: badwolf.c:527 badwolf.c:692 badwolf.c:719 badwolf.c:753 #, c-format msgid "Buildtime WebKit version: %d.%d.%d\n" msgstr "Version WebKit à la compilation: %d.%d.%d\n" -#: badwolf.c:457 badwolf.c:621 badwolf.c:643 +#: badwolf.c:378 +msgid "Ignore" +msgstr "Ignorer" + +#: badwolf.c:457 badwolf.c:621 badwolf.c:643 badwolf.c:680 msgid "New tab" msgstr "Nouvel onglet" -#: badwolf.c:549 badwolf.c:714 badwolf.c:740 +#: badwolf.c:549 badwolf.c:714 badwolf.c:740 badwolf.c:775 msgid "Open new tab" msgstr "Ouvrir un nouvel onglet" -#: badwolf.c:690 badwolf.c:717 +#: badwolf.c:690 badwolf.c:717 badwolf.c:751 #, c-format msgid "Running Badwolf version: %s\n" msgstr "Version de Badwolf: %s\n" -#: badwolf.c:532 badwolf.c:697 badwolf.c:724 +#: badwolf.c:532 badwolf.c:697 badwolf.c:724 badwolf.c:758 #, c-format msgid "Runtime WebKit version: %d.%d.%d\n" msgstr "Version WebKit au lancement: %d.%d.%d\n" -#: badwolf.c:373 badwolf.c:532 +#: badwolf.c:352 +msgid "Some unknown error occurred validating the certificate\n" +msgstr "Une error inconnue est apparue pendant la validation du certificat\n" + +#: badwolf.c:334 +msgid "The Certificate Authority is unknown.\n" +msgstr "L'autoritée de certification (CA) est inconnue.\n" + +#: badwolf.c:346 +msgid "The certificate has been revoked.\n" +msgstr "Le certificat à été révoqué.\n" + +#: badwolf.c:343 +msgid "The certificate has expired.\n" +msgstr "Le certificat à expiré.\n" + +#: badwolf.c:349 +msgid "The certificate is considered to be insecure.\n" +msgstr "Le certificat est considéré comme non-sécurisé.\n" + +#: badwolf.c:340 +msgid "The certificate isn't valid yet.\n" +msgstr "Le certificat n'est pas encore valide.\n" + +#: badwolf.c:337 +msgid "The given identity doesn't match the expected one.\n" +msgstr "L'identitée ne correspond pas à celle attendue.\n" + +#: badwolf.c:373 badwolf.c:532 badwolf.c:565 msgid "Toggle javascript" msgstr "Activer/Désactiver javascript" @@ -52,38 +88,38 @@ msgstr "A_rrêter" msgid "_Save" msgstr "_Sauvegarder" -#: badwolf.c:413 badwolf.c:572 badwolf.c:573 +#: badwolf.c:413 badwolf.c:572 badwolf.c:573 badwolf.c:606 msgid "search in current page" msgstr "recherche dans la page courante" -#: badwolf.c:100 badwolf.c:234 badwolf.c:118 +#: badwolf.c:100 badwolf.c:234 badwolf.c:118 badwolf.c:94 #, fuzzy msgid "the web process crashed.\n" msgstr "le processus web à cessé de fonctionner.\n" -#: badwolf.c:104 badwolf.c:238 badwolf.c:122 +#: badwolf.c:104 badwolf.c:238 badwolf.c:122 badwolf.c:98 #, fuzzy msgid "the web process exceeded the memory limit.\n" msgstr "le processus web à dépassé la limitation de mémoire.\n" -#: badwolf.c:108 badwolf.c:242 badwolf.c:126 +#: badwolf.c:108 badwolf.c:242 badwolf.c:126 badwolf.c:102 #, fuzzy msgid "the web process terminated for an unknown reason.\n" msgstr "le processus web s’est interrompu pour une raison inconnue.\n" -#: badwolf.c:101 badwolf.c:235 badwolf.c:119 +#: badwolf.c:101 badwolf.c:235 badwolf.c:119 badwolf.c:95 msgid "title|Crashed" msgstr "Crash" -#: badwolf.c:105 badwolf.c:239 badwolf.c:123 +#: badwolf.c:105 badwolf.c:239 badwolf.c:123 badwolf.c:99 msgid "title|Out of Memory" msgstr "Dépassement Mémoire" -#: badwolf.c:109 badwolf.c:243 badwolf.c:127 +#: badwolf.c:109 badwolf.c:243 badwolf.c:127 badwolf.c:103 msgid "title|Unknown Crash" msgstr "Crash inconnu" -#: badwolf.c:730 +#: badwolf.c:730 badwolf.c:765 #, c-format msgid "webkit-web-extension directory set to: %s\n" msgstr "Répertoire webkit-web-extension configuré à %s\n" diff --git a/po/messages.pot b/po/messages.pot index 61da5d2..c50f501 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Badwolf 0.3.0+g4b96925\n" +"Project-Id-Version: Badwolf 0.4.0+g5659b01\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2019-10-31 17:40+0100\n" +"POT-Creation-Date: 2019-12-16 05:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,30 +17,66 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: badwolf.c:527 badwolf.c:692 badwolf.c:719 +#: badwolf.c:378 +msgid "Add Exception" +msgstr "" + +#: badwolf.c:527 badwolf.c:692 badwolf.c:719 badwolf.c:753 #, c-format msgid "Buildtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:457 badwolf.c:621 badwolf.c:643 +#: badwolf.c:378 +msgid "Ignore" +msgstr "" + +#: badwolf.c:457 badwolf.c:621 badwolf.c:643 badwolf.c:680 msgid "New tab" msgstr "" -#: badwolf.c:549 badwolf.c:714 badwolf.c:740 +#: badwolf.c:549 badwolf.c:714 badwolf.c:740 badwolf.c:775 msgid "Open new tab" msgstr "" -#: badwolf.c:690 badwolf.c:717 +#: badwolf.c:690 badwolf.c:717 badwolf.c:751 #, c-format msgid "Running Badwolf version: %s\n" msgstr "" -#: badwolf.c:532 badwolf.c:697 badwolf.c:724 +#: badwolf.c:532 badwolf.c:697 badwolf.c:724 badwolf.c:758 #, c-format msgid "Runtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:373 badwolf.c:532 +#: badwolf.c:352 +msgid "Some unknown error occurred validating the certificate\n" +msgstr "" + +#: badwolf.c:334 +msgid "The Certificate Authority is unknown.\n" +msgstr "" + +#: badwolf.c:346 +msgid "The certificate has been revoked.\n" +msgstr "" + +#: badwolf.c:343 +msgid "The certificate has expired.\n" +msgstr "" + +#: badwolf.c:349 +msgid "The certificate is considered to be insecure.\n" +msgstr "" + +#: badwolf.c:340 +msgid "The certificate isn't valid yet.\n" +msgstr "" + +#: badwolf.c:337 +msgid "The given identity doesn't match the expected one.\n" +msgstr "" + +#: badwolf.c:373 badwolf.c:532 badwolf.c:565 msgid "Toggle javascript" msgstr "" @@ -52,35 +88,35 @@ msgstr "" msgid "_Save" msgstr "" -#: badwolf.c:413 badwolf.c:572 badwolf.c:573 +#: badwolf.c:413 badwolf.c:572 badwolf.c:573 badwolf.c:606 msgid "search in current page" msgstr "" -#: badwolf.c:100 badwolf.c:234 badwolf.c:118 +#: badwolf.c:100 badwolf.c:234 badwolf.c:118 badwolf.c:94 msgid "the web process crashed.\n" msgstr "" -#: badwolf.c:104 badwolf.c:238 badwolf.c:122 +#: badwolf.c:104 badwolf.c:238 badwolf.c:122 badwolf.c:98 msgid "the web process exceeded the memory limit.\n" msgstr "" -#: badwolf.c:108 badwolf.c:242 badwolf.c:126 +#: badwolf.c:108 badwolf.c:242 badwolf.c:126 badwolf.c:102 msgid "the web process terminated for an unknown reason.\n" msgstr "" -#: badwolf.c:101 badwolf.c:235 badwolf.c:119 +#: badwolf.c:101 badwolf.c:235 badwolf.c:119 badwolf.c:95 msgid "title|Crashed" msgstr "Crashed" -#: badwolf.c:105 badwolf.c:239 badwolf.c:123 +#: badwolf.c:105 badwolf.c:239 badwolf.c:123 badwolf.c:99 msgid "title|Out of Memory" msgstr "Out of Memory" -#: badwolf.c:109 badwolf.c:243 badwolf.c:127 +#: badwolf.c:109 badwolf.c:243 badwolf.c:127 badwolf.c:103 msgid "title|Unknown Crash" msgstr "Unknown Crash" -#: badwolf.c:730 +#: badwolf.c:730 badwolf.c:765 #, c-format msgid "webkit-web-extension directory set to: %s\n" msgstr "" -- cgit v1.3.1-23-gd82d From 3c2ee134e9f6aae03aa28edce2d185d6c3e582a8 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 22 Dec 2019 01:14:37 +0100 Subject: Update translation --- Makefile | 2 +- badwolf.c | 6 +++ po/fr.po | 129 +++++++++++++++++++++++++++++--------------------------- po/messages.pot | 112 ++++++++++++++++++++++++------------------------ 4 files changed, 133 insertions(+), 116 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8a5dd69..f3fcbc5 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ MSGFMT = msgfmt all: $(EXE) $(TRANS) po/messages.pot: $(SRCS) - xgettext --keyword=_ --language=C -o $@ --add-comments --sort-output -j --copyright-holder="Haelwenn (lanodan) Monnier " --package-name="$(PACKAGE)" --package-version="$(VERSION_FULL)" --msgid-bugs-address="contact+badwolf-msgid@hacktivis.me" $(SRCS) + xgettext --keyword=_ --language=C --from-code=UTF-8 -o $@ --add-comments --sort-output --copyright-holder="Haelwenn (lanodan) Monnier " --package-name="$(PACKAGE)" --package-version="$(VERSION_FULL)" --msgid-bugs-address="contact+badwolf-msgid@hacktivis.me" $(SRCS) po/%.po: po/messages.pot msgmerge --update $@ $< diff --git a/badwolf.c b/badwolf.c index 1c94da4..c513bf1 100644 --- a/badwolf.c +++ b/badwolf.c @@ -807,5 +807,11 @@ main(int argc, char *argv[]) gtk_widget_show_all(window->main_window); gtk_main(); + +#if 0 + /* TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext. */ + _("ø"); +#endif + return 0; } diff --git a/po/fr.po b/po/fr.po index d8af0f3..e83eab4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Badwolf 0.3.0+gd88f2e7\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2019-12-16 05:37+0100\n" -"PO-Revision-Date: 2019-12-16 05:37+0100\n" +"POT-Creation-Date: 2019-12-22 00:57+0100\n" +"PO-Revision-Date: 2019-12-22 00:57+0100\n" "Last-Translator: Haelwenn (lanodan) Monnier \n" "Language-Team: French\n" "Language: fr\n" @@ -17,118 +17,125 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: badwolf.c:378 -msgid "Add Exception" -msgstr "Ajouter une Exception" - -#: badwolf.c:527 badwolf.c:692 badwolf.c:719 badwolf.c:753 +#: badwolf.c:760 #, c-format msgid "Buildtime WebKit version: %d.%d.%d\n" msgstr "Version WebKit à la compilation: %d.%d.%d\n" #: badwolf.c:378 -msgid "Ignore" -msgstr "Ignorer" +msgid "Continue" +msgstr "Continuer" + +#: badwolf.c:331 +msgid "" +"Couldn't verify the TLS certificate to ensure a better security of the " +"connection. You might want to verify your machine and network.\n" +"\n" +msgstr "" +"Impossibilitée de vérifier le certificat TLS pour assurer une meilleure " +"sécurité de la connection. Penser potentiellement à vérifier votre machine " +"et son réseau.\n" +"\n" + +#: badwolf.c:352 +msgid "Error: Some unknown error occurred validating the certificate.\n" +msgstr "" +"Erreur : Une error inconnue est apparue pendant la validation du " +"certificat.\n" + +#: badwolf.c:334 +msgid "Error: The X509 Certificate Authority is unknown.\n" +msgstr "Erreur : L'autoritée de certification (CA X509) est inconnue.\n" + +#: badwolf.c:346 +msgid "Error: The certificate has been revoked.\n" +msgstr "Erreur : Le certificat à été révoqué.\n" + +#: badwolf.c:343 +msgid "Error: The certificate has expired. Check your system's clock.\n" +msgstr "Erreur : Le certificat à expiré.\n" + +#: badwolf.c:349 +msgid "Error: The certificate is considered to be insecure.\n" +msgstr "Erreur : Le certificat est considéré comme non-sécurisé.\n" + +#: badwolf.c:340 +msgid "Error: The certificate isn't valid yet. Check your system's clock.\n" +msgstr "Erreur : Le certificat n'est pas encore valide.\n" + +#: badwolf.c:337 +msgid "Error: The given identity doesn't match the expected one.\n" +msgstr "Erreur : L'identitée ne correspond pas à celle attendue.\n" -#: keybindings.c:14 +#: keybindings.c:39 msgid "Minimalist and privacy-oriented WebKitGTK+ browser" msgstr "Navigateur WebKitGTK+ minimaliste et orienté vie privée" -#: badwolf.c:457 badwolf.c:621 badwolf.c:643 badwolf.c:680 +#: badwolf.c:680 msgid "New tab" msgstr "Nouvel onglet" -#: badwolf.c:549 badwolf.c:714 badwolf.c:740 badwolf.c:775 +#: badwolf.c:782 msgid "Open new tab" msgstr "Ouvrir un nouvel onglet" -#: badwolf.c:690 badwolf.c:717 badwolf.c:751 +#: badwolf.c:758 #, c-format msgid "Running Badwolf version: %s\n" msgstr "Version de Badwolf: %s\n" -#: badwolf.c:532 badwolf.c:697 badwolf.c:724 badwolf.c:758 +#: badwolf.c:765 #, c-format msgid "Runtime WebKit version: %d.%d.%d\n" msgstr "Version WebKit au lancement: %d.%d.%d\n" -#: badwolf.c:352 -msgid "Some unknown error occurred validating the certificate\n" -msgstr "Une error inconnue est apparue pendant la validation du certificat\n" - #: badwolf.c:376 #, c-format msgid "TLS Error for %s." msgstr "Erreur TLS pour %s." -#: badwolf.c:334 -msgid "The Certificate Authority is unknown.\n" -msgstr "L'autoritée de certification (CA) est inconnue.\n" - -#: badwolf.c:346 -msgid "The certificate has been revoked.\n" -msgstr "Le certificat à été révoqué.\n" - -#: badwolf.c:343 -msgid "The certificate has expired.\n" -msgstr "Le certificat à expiré.\n" - -#: badwolf.c:349 -msgid "The certificate is considered to be insecure.\n" -msgstr "Le certificat est considéré comme non-sécurisé.\n" - -#: badwolf.c:340 -msgid "The certificate isn't valid yet.\n" -msgstr "Le certificat n'est pas encore valide.\n" - -#: badwolf.c:337 -msgid "The given identity doesn't match the expected one.\n" -msgstr "L'identitée ne correspond pas à celle attendue.\n" +#: badwolf.c:378 +msgid "Temporarly Add Exception" +msgstr "Ajouter Temporairement une Exception" -#: badwolf.c:373 badwolf.c:532 badwolf.c:565 +#: badwolf.c:565 msgid "Toggle javascript" msgstr "Activer/Désactiver javascript" -#: badwolf.c:382 -msgid "_Cancel" -msgstr "A_rrêter" - -#: badwolf.c:384 -msgid "_Save" -msgstr "_Sauvegarder" - -#: badwolf.c:413 badwolf.c:572 badwolf.c:573 badwolf.c:606 +#: badwolf.c:606 msgid "search in current page" msgstr "recherche dans la page courante" -#: badwolf.c:100 badwolf.c:234 badwolf.c:118 badwolf.c:94 -#, fuzzy +#: badwolf.c:92 msgid "the web process crashed.\n" msgstr "le processus web à cessé de fonctionner.\n" -#: badwolf.c:104 badwolf.c:238 badwolf.c:122 badwolf.c:98 -#, fuzzy +#: badwolf.c:96 msgid "the web process exceeded the memory limit.\n" msgstr "le processus web à dépassé la limitation de mémoire.\n" -#: badwolf.c:108 badwolf.c:242 badwolf.c:126 badwolf.c:102 -#, fuzzy +#: badwolf.c:100 msgid "the web process terminated for an unknown reason.\n" msgstr "le processus web s’est interrompu pour une raison inconnue.\n" -#: badwolf.c:101 badwolf.c:235 badwolf.c:119 badwolf.c:95 +#: badwolf.c:93 msgid "title|Crashed" msgstr "Crash" -#: badwolf.c:105 badwolf.c:239 badwolf.c:123 badwolf.c:99 +#: badwolf.c:97 msgid "title|Out of Memory" msgstr "Dépassement Mémoire" -#: badwolf.c:109 badwolf.c:243 badwolf.c:127 badwolf.c:103 +#: badwolf.c:101 msgid "title|Unknown Crash" msgstr "Crash inconnu" -#: badwolf.c:730 badwolf.c:765 +#: badwolf.c:772 #, c-format msgid "webkit-web-extension directory set to: %s\n" msgstr "Répertoire webkit-web-extension configuré à %s\n" + +#. TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext. +#: badwolf.c:811 +msgid "ø" +msgstr "" diff --git a/po/messages.pot b/po/messages.pot index a6321ff..3e497fd 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Badwolf 0.4.0+g3f954fa\n" +"Project-Id-Version: Badwolf 0.4.0+g607300e\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2019-12-16 05:37+0100\n" +"POT-Creation-Date: 2019-12-22 00:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,115 +17,119 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: badwolf.c:378 -msgid "Add Exception" -msgstr "" - -#: badwolf.c:527 badwolf.c:692 badwolf.c:719 badwolf.c:753 +#: badwolf.c:760 #, c-format msgid "Buildtime WebKit version: %d.%d.%d\n" msgstr "" #: badwolf.c:378 -msgid "Ignore" +msgid "Continue" msgstr "" -#: keybindings.c:14 -msgid "Minimalist and privacy-oriented WebKitGTK+ browser" +#: badwolf.c:331 +msgid "" +"Couldn't verify the TLS certificate to ensure a better security of the " +"connection. You might want to verify your machine and network.\n" +"\n" msgstr "" -#: badwolf.c:457 badwolf.c:621 badwolf.c:643 badwolf.c:680 -msgid "New tab" +#: badwolf.c:352 +msgid "Error: Some unknown error occurred validating the certificate.\n" msgstr "" -#: badwolf.c:549 badwolf.c:714 badwolf.c:740 badwolf.c:775 -msgid "Open new tab" +#: badwolf.c:334 +msgid "Error: The X509 Certificate Authority is unknown.\n" msgstr "" -#: badwolf.c:690 badwolf.c:717 badwolf.c:751 -#, c-format -msgid "Running Badwolf version: %s\n" +#: badwolf.c:346 +msgid "Error: The certificate has been revoked.\n" msgstr "" -#: badwolf.c:532 badwolf.c:697 badwolf.c:724 badwolf.c:758 -#, c-format -msgid "Runtime WebKit version: %d.%d.%d\n" +#: badwolf.c:343 +msgid "Error: The certificate has expired. Check your system's clock.\n" msgstr "" -#: badwolf.c:352 -msgid "Some unknown error occurred validating the certificate\n" +#: badwolf.c:349 +msgid "Error: The certificate is considered to be insecure.\n" msgstr "" -#: badwolf.c:376 -#, c-format -msgid "TLS Error for %s." +#: badwolf.c:340 +msgid "Error: The certificate isn't valid yet. Check your system's clock.\n" msgstr "" -#: badwolf.c:334 -msgid "The Certificate Authority is unknown.\n" +#: badwolf.c:337 +msgid "Error: The given identity doesn't match the expected one.\n" msgstr "" -#: badwolf.c:346 -msgid "The certificate has been revoked.\n" +#: keybindings.c:39 +msgid "Minimalist and privacy-oriented WebKitGTK+ browser" msgstr "" -#: badwolf.c:343 -msgid "The certificate has expired.\n" +#: badwolf.c:680 +msgid "New tab" msgstr "" -#: badwolf.c:349 -msgid "The certificate is considered to be insecure.\n" +#: badwolf.c:782 +msgid "Open new tab" msgstr "" -#: badwolf.c:340 -msgid "The certificate isn't valid yet.\n" +#: badwolf.c:758 +#, c-format +msgid "Running Badwolf version: %s\n" msgstr "" -#: badwolf.c:337 -msgid "The given identity doesn't match the expected one.\n" +#: badwolf.c:765 +#, c-format +msgid "Runtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:373 badwolf.c:532 badwolf.c:565 -msgid "Toggle javascript" +#: badwolf.c:376 +#, c-format +msgid "TLS Error for %s." msgstr "" -#: badwolf.c:382 -msgid "_Cancel" +#: badwolf.c:378 +msgid "Temporarly Add Exception" msgstr "" -#: badwolf.c:384 -msgid "_Save" +#: badwolf.c:565 +msgid "Toggle javascript" msgstr "" -#: badwolf.c:413 badwolf.c:572 badwolf.c:573 badwolf.c:606 +#: badwolf.c:606 msgid "search in current page" msgstr "" -#: badwolf.c:100 badwolf.c:234 badwolf.c:118 badwolf.c:94 +#: badwolf.c:92 msgid "the web process crashed.\n" msgstr "" -#: badwolf.c:104 badwolf.c:238 badwolf.c:122 badwolf.c:98 +#: badwolf.c:96 msgid "the web process exceeded the memory limit.\n" msgstr "" -#: badwolf.c:108 badwolf.c:242 badwolf.c:126 badwolf.c:102 +#: badwolf.c:100 msgid "the web process terminated for an unknown reason.\n" msgstr "" -#: badwolf.c:101 badwolf.c:235 badwolf.c:119 badwolf.c:95 +#: badwolf.c:93 msgid "title|Crashed" -msgstr "Crashed" +msgstr "" -#: badwolf.c:105 badwolf.c:239 badwolf.c:123 badwolf.c:99 +#: badwolf.c:97 msgid "title|Out of Memory" -msgstr "Out of Memory" +msgstr "" -#: badwolf.c:109 badwolf.c:243 badwolf.c:127 badwolf.c:103 +#: badwolf.c:101 msgid "title|Unknown Crash" -msgstr "Unknown Crash" +msgstr "" -#: badwolf.c:730 badwolf.c:765 +#: badwolf.c:772 #, c-format msgid "webkit-web-extension directory set to: %s\n" msgstr "" + +#. TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext. +#: badwolf.c:811 +msgid "ø" +msgstr "" -- cgit v1.3.1-23-gd82d From e6bdb683651e3dc75cb16ee5bc81a2d810a262f4 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 22 Jan 2020 03:24:20 +0100 Subject: Makefile: Add pt_BR translation --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f3fcbc5..0a5aa3e 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ OBJS = uri.o keybindings.o badwolf.o OBJS_test = uri_test.o EXE = badwolf EXE_test = uri_test -TRANS = fr.mo +TRANS = fr.mo pt_BR.mo DOCS = usr.bin.badwolf README.md KnowledgeBase.md CC = cc -- cgit v1.3.1-23-gd82d From d4a4b0ab1b5809a7a85b786135627bf9e0448908 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 22 Jan 2020 16:30:15 +0100 Subject: Update copyright to (2019-)2020 Badwolf Authors --- Makefile | 2 +- README.md | 2 +- badwolf.1 | 2 +- badwolf.c | 2 +- keybindings.c | 2 +- po/fr.po | 59 ++++++++++++++++++++++++---------------------- po/messages.pot | 61 +++++++++++++++++++++++++----------------------- po/pt_BR.po | 72 ++++++++++++++++++++++++++++----------------------------- uri.c | 2 +- uri_test.c | 2 +- usr.bin.badwolf | 2 +- 11 files changed, 106 insertions(+), 102 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0a5aa3e..024eb56 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ MSGFMT = msgfmt all: $(EXE) $(TRANS) po/messages.pot: $(SRCS) - xgettext --keyword=_ --language=C --from-code=UTF-8 -o $@ --add-comments --sort-output --copyright-holder="Haelwenn (lanodan) Monnier " --package-name="$(PACKAGE)" --package-version="$(VERSION_FULL)" --msgid-bugs-address="contact+badwolf-msgid@hacktivis.me" $(SRCS) + xgettext --keyword=_ --language=C --from-code=UTF-8 -o $@ --add-comments --sort-output --copyright-holder="Badwolf Authors " --package-name="$(PACKAGE)" --package-version="$(VERSION_FULL)" --msgid-bugs-address="contact+badwolf-msgid@hacktivis.me" $(SRCS) po/%.po: po/messages.pot msgmerge --update $@ $< diff --git a/README.md b/README.md index 2e3d245..75752b0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Minimalist and privacy-oriented WebKitGTK+ browser. Homepage: ``` -Copyright © 2019 Haelwenn (lanodan) Monnier +Copyright © 2019-2020 Badwolf Authors SPDX-License-Identifier: BSD-3-Clause ``` diff --git a/badwolf.1 b/badwolf.1 index 0b044d5..6f8ecb8 100644 --- a/badwolf.1 +++ b/badwolf.1 @@ -1,5 +1,5 @@ ./" BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -./" Copyright © 2019 Haelwenn (lanodan) Monnier +./" Copyright © 2019-2020 Badwolf Authors ./" SPDX-License-Identifier: BSD-3-Clause .Dd 2019-10-31 .Dt badwolf 1 diff --git a/badwolf.c b/badwolf.c index 74f6a7f..64136f7 100644 --- a/badwolf.c +++ b/badwolf.c @@ -1,5 +1,5 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019 Haelwenn (lanodan) Monnier +// Copyright © 2019-2020 Badwolf Authors // SPDX-License-Identifier: BSD-3-Clause #include "badwolf.h" diff --git a/keybindings.c b/keybindings.c index b5e9228..86713c2 100644 --- a/keybindings.c +++ b/keybindings.c @@ -1,5 +1,5 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019 Haelwenn (lanodan) Monnier +// Copyright © 2019-2020 Badwolf Authors // SPDX-License-Identifier: BSD-3-Clause #include "keybindings.h" diff --git a/po/fr.po b/po/fr.po index e4d49cc..5691800 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,5 +1,5 @@ # BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -# Copyright (C) 2019 Haelwenn (lanodan) Monnier +# Copyright (C) 2019-2020 Badwolf Authors # This file is distributed under the same license as the Badwolf package. # Haelwenn (lanodan) Monnier , 2019 # @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Badwolf 0.3.0+gd88f2e7\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2019-12-22 00:57+0100\n" +"POT-Creation-Date: 2020-01-22 16:20+0100\n" "PO-Revision-Date: 2019-12-22 00:57+0100\n" "Last-Translator: Haelwenn (lanodan) Monnier \n" "Language-Team: French\n" @@ -17,16 +17,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: badwolf.c:760 +#: badwolf.c:771 #, c-format msgid "Buildtime WebKit version: %d.%d.%d\n" msgstr "Version WebKit à la compilation: %d.%d.%d\n" -#: badwolf.c:378 +#: badwolf.c:384 msgid "Continue" msgstr "Continuer" -#: badwolf.c:331 +#: badwolf.c:334 msgid "" "Couldn't verify the TLS certificate to ensure a better security of the " "connection. You might want to verify your machine and network.\n" @@ -37,33 +37,33 @@ msgstr "" "et son réseau.\n" "\n" -#: badwolf.c:352 +#: badwolf.c:357 msgid "Error: Some unknown error occurred validating the certificate.\n" msgstr "" "Erreur : Une erreur inconnue est apparue pendant la validation du " "certificat.\n" -#: badwolf.c:334 +#: badwolf.c:338 msgid "Error: The X509 Certificate Authority is unknown.\n" msgstr "Erreur : L'autorité de certification (CA X509) est inconnue.\n" -#: badwolf.c:346 +#: badwolf.c:351 msgid "Error: The certificate has been revoked.\n" msgstr "Erreur : Le certificat à été révoqué.\n" -#: badwolf.c:343 +#: badwolf.c:348 msgid "Error: The certificate has expired. Check your system's clock.\n" msgstr "Erreur : Le certificat a expiré.\n" -#: badwolf.c:349 +#: badwolf.c:354 msgid "Error: The certificate is considered to be insecure.\n" msgstr "Erreur : Le certificat est considéré comme non-sécurisé.\n" -#: badwolf.c:340 +#: badwolf.c:345 msgid "Error: The certificate isn't valid yet. Check your system's clock.\n" msgstr "Erreur : Le certificat n'est pas encore valide.\n" -#: badwolf.c:337 +#: badwolf.c:341 msgid "Error: The given identity doesn't match the expected one.\n" msgstr "Erreur : L'identité ne correspond pas à celle attendue.\n" @@ -71,71 +71,74 @@ msgstr "Erreur : L'identité ne correspond pas à celle attendue.\n" msgid "Minimalist and privacy-oriented WebKitGTK+ browser" msgstr "Navigateur WebKitGTK+ minimaliste et orienté vie privée" -#: badwolf.c:680 +#: badwolf.c:686 msgid "New tab" msgstr "Nouvel onglet" -#: badwolf.c:782 +#: badwolf.c:793 msgid "Open new tab" msgstr "Ouvrir un nouvel onglet" -#: badwolf.c:758 +#: badwolf.c:769 #, c-format msgid "Running Badwolf version: %s\n" msgstr "Version de Badwolf: %s\n" -#: badwolf.c:765 +#: badwolf.c:776 #, c-format msgid "Runtime WebKit version: %d.%d.%d\n" msgstr "Version WebKit au lancement: %d.%d.%d\n" -#: badwolf.c:376 +#: badwolf.c:381 #, c-format msgid "TLS Error for %s." msgstr "Erreur TLS pour %s." -#: badwolf.c:378 +#: badwolf.c:384 msgid "Temporarly Add Exception" msgstr "Ajouter Temporairement une Exception" -#: badwolf.c:565 +#: badwolf.c:571 msgid "Toggle javascript" msgstr "Activer/Désactiver javascript" -#: badwolf.c:606 +#: badwolf.c:612 msgid "search in current page" msgstr "recherche dans la page courante" -#: badwolf.c:92 +#: badwolf.c:94 +#, c-format msgid "the web process crashed.\n" msgstr "le processus web a cessé de fonctionner.\n" -#: badwolf.c:96 +#: badwolf.c:98 +#, c-format msgid "the web process exceeded the memory limit.\n" msgstr "le processus web a dépassé la limitation de mémoire.\n" -#: badwolf.c:100 +#: badwolf.c:102 +#, c-format msgid "the web process terminated for an unknown reason.\n" msgstr "le processus web s’est interrompu pour une raison inconnue.\n" -#: badwolf.c:93 +#: badwolf.c:95 msgid "title|Crashed" msgstr "Crash" -#: badwolf.c:97 +#: badwolf.c:99 msgid "title|Out of Memory" msgstr "Dépassement Mémoire" -#: badwolf.c:101 +#: badwolf.c:103 msgid "title|Unknown Crash" msgstr "Crash inconnu" -#: badwolf.c:772 +#: badwolf.c:783 #, c-format msgid "webkit-web-extension directory set to: %s\n" msgstr "Répertoire webkit-web-extension configuré à %s\n" #. TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext. -#: badwolf.c:811 +#: badwolf.c:822 msgid "ø" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index 3e497fd..fc77c19 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Haelwenn (lanodan) Monnier +# Copyright (C) YEAR Badwolf Authors # This file is distributed under the same license as the Badwolf package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Badwolf 0.4.0+g607300e\n" +"Project-Id-Version: Badwolf 0.4.0+ge6bdb68\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2019-12-22 00:57+0100\n" +"POT-Creation-Date: 2020-01-22 16:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,47 +17,47 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: badwolf.c:760 +#: badwolf.c:771 #, c-format msgid "Buildtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:378 +#: badwolf.c:384 msgid "Continue" msgstr "" -#: badwolf.c:331 +#: badwolf.c:334 msgid "" "Couldn't verify the TLS certificate to ensure a better security of the " "connection. You might want to verify your machine and network.\n" "\n" msgstr "" -#: badwolf.c:352 +#: badwolf.c:357 msgid "Error: Some unknown error occurred validating the certificate.\n" msgstr "" -#: badwolf.c:334 +#: badwolf.c:338 msgid "Error: The X509 Certificate Authority is unknown.\n" msgstr "" -#: badwolf.c:346 +#: badwolf.c:351 msgid "Error: The certificate has been revoked.\n" msgstr "" -#: badwolf.c:343 +#: badwolf.c:348 msgid "Error: The certificate has expired. Check your system's clock.\n" msgstr "" -#: badwolf.c:349 +#: badwolf.c:354 msgid "Error: The certificate is considered to be insecure.\n" msgstr "" -#: badwolf.c:340 +#: badwolf.c:345 msgid "Error: The certificate isn't valid yet. Check your system's clock.\n" msgstr "" -#: badwolf.c:337 +#: badwolf.c:341 msgid "Error: The given identity doesn't match the expected one.\n" msgstr "" @@ -65,71 +65,74 @@ msgstr "" msgid "Minimalist and privacy-oriented WebKitGTK+ browser" msgstr "" -#: badwolf.c:680 +#: badwolf.c:686 msgid "New tab" msgstr "" -#: badwolf.c:782 +#: badwolf.c:793 msgid "Open new tab" msgstr "" -#: badwolf.c:758 +#: badwolf.c:769 #, c-format msgid "Running Badwolf version: %s\n" msgstr "" -#: badwolf.c:765 +#: badwolf.c:776 #, c-format msgid "Runtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:376 +#: badwolf.c:381 #, c-format msgid "TLS Error for %s." msgstr "" -#: badwolf.c:378 +#: badwolf.c:384 msgid "Temporarly Add Exception" msgstr "" -#: badwolf.c:565 +#: badwolf.c:571 msgid "Toggle javascript" msgstr "" -#: badwolf.c:606 +#: badwolf.c:612 msgid "search in current page" msgstr "" -#: badwolf.c:92 +#: badwolf.c:94 +#, c-format msgid "the web process crashed.\n" msgstr "" -#: badwolf.c:96 +#: badwolf.c:98 +#, c-format msgid "the web process exceeded the memory limit.\n" msgstr "" -#: badwolf.c:100 +#: badwolf.c:102 +#, c-format msgid "the web process terminated for an unknown reason.\n" msgstr "" -#: badwolf.c:93 +#: badwolf.c:95 msgid "title|Crashed" msgstr "" -#: badwolf.c:97 +#: badwolf.c:99 msgid "title|Out of Memory" msgstr "" -#: badwolf.c:101 +#: badwolf.c:103 msgid "title|Unknown Crash" msgstr "" -#: badwolf.c:772 +#: badwolf.c:783 #, c-format msgid "webkit-web-extension directory set to: %s\n" msgstr "" #. TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext. -#: badwolf.c:811 +#: badwolf.c:822 msgid "ø" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 5e57452..e1aac75 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,13 +1,12 @@ # BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -# Copyright (C) 2020 Haelwenn (lanodan) Monnier +# Copyright (C) 2020 Badwolf Authors # This file is distributed under the same license as the Badwolf package. -# Haelwenn (lanodan) Monnier , 2020 # msgid "" msgstr "" "Project-Id-Version: Badwolf 0.4.0+g607300e\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2019-12-22 00:57+0100\n" +"POT-Creation-Date: 2020-01-22 16:20+0100\n" "PO-Revision-Date: 2020-01-20 22:17-0300\n" "Last-Translator: Pedro Lucas Porcellis \n" "Language-Team: Brazilian Portuguese\n" @@ -17,57 +16,53 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: badwolf.c:760 +#: badwolf.c:771 #, c-format msgid "Buildtime WebKit version: %d.%d.%d\n" msgstr "Versão do WebKit %d.%d.%d\n" -#: badwolf.c:378 +#: badwolf.c:384 msgid "Continue" msgstr "Continuar" -#: badwolf.c:331 +#: badwolf.c:334 msgid "" "Couldn't verify the TLS certificate to ensure a better security of the " "connection. You might want to verify your machine and network.\n" "\n" msgstr "" "Não foi possível verificar o certificado TLS para garantir uma melhor " -"segurança da conexão. Talvez você deva verificar a sua máquina e " -"rede.\n" +"segurança da conexão. Talvez você deva verificar a sua máquina e rede.\n" "\n" -#: badwolf.c:352 +#: badwolf.c:357 msgid "Error: Some unknown error occurred validating the certificate.\n" msgstr "" -"Erro: Algum erro desconhecido ocorreu enquanto validava o " -"certificado.\n" +"Erro: Algum erro desconhecido ocorreu enquanto validava o certificado.\n" -#: badwolf.c:334 +#: badwolf.c:338 msgid "Error: The X509 Certificate Authority is unknown.\n" msgstr "Erro: A Autoridade de Certificados X509 é desconhecida.\n" -#: badwolf.c:346 +#: badwolf.c:351 msgid "Error: The certificate has been revoked.\n" msgstr "Erro: O certificado foi revogado.\n" -#: badwolf.c:343 +#: badwolf.c:348 msgid "Error: The certificate has expired. Check your system's clock.\n" msgstr "" "Erro: O certificado foi expirado. Verifique o relógio do seu sistema.\n" -#: badwolf.c:349 +#: badwolf.c:354 msgid "Error: The certificate is considered to be insecure.\n" msgstr "Erro: O certificado é considerado inseguro.\n" -#: badwolf.c:340 -msgid "" -"Error: The certificate isn't valid yet. Check your system's clock.\n" +#: badwolf.c:345 +msgid "Error: The certificate isn't valid yet. Check your system's clock.\n" msgstr "" -"Erro: O certificado não é válido ainda. Verifique o relógio do seu " -"sistema.\n" +"Erro: O certificado não é válido ainda. Verifique o relógio do seu sistema.\n" -#: badwolf.c:337 +#: badwolf.c:341 msgid "Error: The given identity doesn't match the expected one.\n" msgstr "Erro: A identidade não confere com a esperada.\n" @@ -75,71 +70,74 @@ msgstr "Erro: A identidade não confere com a esperada.\n" msgid "Minimalist and privacy-oriented WebKitGTK+ browser" msgstr "Navegador orientado pela privacidade e minimalismo" -#: badwolf.c:680 +#: badwolf.c:686 msgid "New tab" msgstr "Nova aba" -#: badwolf.c:782 +#: badwolf.c:793 msgid "Open new tab" msgstr "Abrir uma Nova aba" -#: badwolf.c:758 +#: badwolf.c:769 #, c-format msgid "Running Badwolf version: %s\n" msgstr "Rodando versão %s do Badwolf\n" -#: badwolf.c:765 +#: badwolf.c:776 #, c-format msgid "Runtime WebKit version: %d.%d.%d\n" msgstr "Versão do WebKit: %d.%d.%d\n" -#: badwolf.c:376 +#: badwolf.c:381 #, c-format msgid "TLS Error for %s." msgstr "Erro TLS para %s." -#: badwolf.c:378 +#: badwolf.c:384 msgid "Temporarly Add Exception" msgstr "Temporáriamente adicionar exceção" -#: badwolf.c:565 +#: badwolf.c:571 msgid "Toggle javascript" msgstr "Habilitar Javascript" -#: badwolf.c:606 +#: badwolf.c:612 msgid "search in current page" msgstr "buscar na página atual" -#: badwolf.c:92 +#: badwolf.c:94 +#, c-format msgid "the web process crashed.\n" msgstr "o processo web travou.\n" -#: badwolf.c:96 +#: badwolf.c:98 +#, c-format msgid "the web process exceeded the memory limit.\n" msgstr "o processo web excedeu o limite de memória.\n" -#: badwolf.c:100 +#: badwolf.c:102 +#, c-format msgid "the web process terminated for an unknown reason.\n" msgstr "o processo web terminou por uma razão desconhecida.\n" -#: badwolf.c:93 +#: badwolf.c:95 msgid "title|Crashed" msgstr "Erro" -#: badwolf.c:97 +#: badwolf.c:99 msgid "title|Out of Memory" msgstr "Sem memória" -#: badwolf.c:101 +#: badwolf.c:103 msgid "title|Unknown Crash" msgstr "Erro desconhecido" -#: badwolf.c:772 +#: badwolf.c:783 #, c-format msgid "webkit-web-extension directory set to: %s\n" msgstr "diretório de extensões configurado para: %s\n" #. TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext. -#: badwolf.c:811 +#: badwolf.c:822 msgid "ø" msgstr "ø" diff --git a/uri.c b/uri.c index b287140..6843e4a 100644 --- a/uri.c +++ b/uri.c @@ -1,5 +1,5 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019 Haelwenn (lanodan) Monnier +// Copyright © 2019-2020 Badwolf Authors // SPDX-License-Identifier: BSD-3-Clause #include "uri.h" diff --git a/uri_test.c b/uri_test.c index 13fa3eb..5881120 100644 --- a/uri_test.c +++ b/uri_test.c @@ -1,5 +1,5 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019 Haelwenn (lanodan) Monnier +// Copyright © 2019-2020 Badwolf Authors // SPDX-License-Identifier: BSD-3-Clause #include "uri.h" diff --git a/usr.bin.badwolf b/usr.bin.badwolf index 4407f31..0ebce5d 100644 --- a/usr.bin.badwolf +++ b/usr.bin.badwolf @@ -1,5 +1,5 @@ # BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -# Copyright © 2019 Haelwenn (lanodan) Monnier +# Copyright © 2019-2020 Badwolf Authors # SPDX-License-Identifier: BSD-3-Clause # # Made on Gentoo Linux with PREFIX=/usr -- cgit v1.3.1-23-gd82d From 90518ee01fe2f0d41a0661b8f4de5cd903de60a1 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 4 Feb 2020 07:29:32 +0100 Subject: Makefile: use $PKGCONFIG, use += and ?= BSD extensions Allows to use cross-compilation for ${triple}-pkg-config on systems like Exherbo without special handling. The BSD extensions += and ?= for variable extension is used to avoid having to explicitely pass a list of variables to make, thus making build recipies simpler. Only issue is when CC is unset, you will get CC=c99, which doesn't works as c11 is used. Consider doing something like the following in your build recipes: make CC=${CC:-cc} Reported-by: danyspin97 --- Makefile | 40 ++++++++++++++++++++++++---------------- README.md | 2 +- 2 files changed, 25 insertions(+), 17 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 024eb56..d8e9195 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,26 @@ .POSIX: +# POSIX Makefile with extensions common to *BSD and GNU such as: +# - Usage of backticks for shell evaluation +# - Usage of ?= for defining variables when not already defined +# - Usage of += for appending to a variable +PACKAGE = Badwolf VERSION = 0.4.0 -VERSION_FULL = $(VERSION)$(shell ./version.sh) +VERSION_FULL = $(VERSION)`./version.sh` -PREFIX = /usr/local -BINDIR = $(PREFIX)/bin -MANDIR = $(PREFIX)/share/man -DOCDIR = $(PREFIX)/share/doc/badwolf-$(VERSION) -DATADIR = $(PREFIX)/share/badwolf -APPSDIR = $(PREFIX)/share/applications -PACKAGE = Badwolf +PREFIX ?= /usr/local +BINDIR ?= $(PREFIX)/bin +MANDIR ?= $(PREFIX)/share/man +DOCDIR ?= $(PREFIX)/share/doc/badwolf-$(VERSION) +DATADIR ?= $(PREFIX)/share/badwolf +APPSDIR ?= $(PREFIX)/share/applications + +CC ?= cc +DBG ?= +PKGCONFIG ?= pkg-config +MSGFMT ?= msgfmt + +CFLAGS ?= -g -Wall -Wextra -Wconversion -Wsign-conversion -O2 DEPS = gtk+-3.0 webkit2gtk-4.0 libsoup-2.4 SRCS = uri.c uri_test.c keybindings.c badwolf.c @@ -20,12 +31,9 @@ EXE_test = uri_test TRANS = fr.mo pt_BR.mo DOCS = usr.bin.badwolf README.md KnowledgeBase.md -CC = cc -DBG = -CFLAGS = -g -Wall -Wextra -Wconversion -Wsign-conversion -O2 -CDEPS = `pkg-config --cflags $(DEPS)` -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION_FULL)\" -LIBS = `pkg-config --libs $(DEPS)` -MSGFMT = msgfmt +CFLAGS += -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION_FULL)\" +CFLAGS += `$(PKGCONFIG) --cflags $(DEPS)` +LIBS = `$(PKGCONFIG) --libs $(DEPS)` all: $(EXE) $(TRANS) @@ -43,10 +51,10 @@ badwolf: $(OBJS) $(CC) -std=c11 -o $@ $(OBJS) $(LDFLAGS) $(LIBS) .c: - $(CC) -std=c11 $(CFLAGS) $(CDEPS) $(LDFLAGS) $(LIBS) -o $@ $< + $(CC) -std=c11 $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $< .c.o: - $(CC) -std=c11 $(CFLAGS) $(CDEPS) -c -o $@ $< + $(CC) -std=c11 $(CFLAGS) -c -o $@ $< uri_test: uri.o uri_test.o $(CC) -std=c11 -o $@ uri.o uri_test.o $(LDFLAGS) $(LIBS) diff --git a/README.md b/README.md index 75752b0..6ce8eef 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Dependencies are: - A pkg-config implementation (pkgconf is recommended) - (optionnal) gettext implementation (such as GNU Gettext) -Compilation is done with `make`, install with `make install`. An example AppArmor profile is provided at `usr.bin.badwolf`, please do runtime checks before deploying. +Compilation is done with `make CC=${CC:-cc}`, install with `make install`. An example AppArmor profile is provided at `usr.bin.badwolf`, please do runtime checks before deploying. ## Notes Most of the privacy/security stuff will be done with patches against WebKit as quite a lot isn’t into [WebKitSettings](https://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html) and with generic WebKit extensions that should be resuseable. -- cgit v1.3.1-23-gd82d From be48f3b29186966f1f4edcdd4ebe2ac800743144 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 4 Feb 2020 08:50:57 +0100 Subject: Makefile: disable backups on msgmerge Git is already used so it makes no sense to have it on. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d8e9195..3e9f2b6 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ po/messages.pot: $(SRCS) xgettext --keyword=_ --language=C --from-code=UTF-8 -o $@ --add-comments --sort-output --copyright-holder="Badwolf Authors " --package-name="$(PACKAGE)" --package-version="$(VERSION_FULL)" --msgid-bugs-address="contact+badwolf-msgid@hacktivis.me" $(SRCS) po/%.po: po/messages.pot - msgmerge --update $@ $< + msgmerge --update --backup=off $@ $< ${TRANS}: po/${@:.mo=.po} mkdir -p locale/${@:.mo=}/LC_MESSAGES -- cgit v1.3.1-23-gd82d From eb974dcccdbcb35fa067ace053bc1fac7406b768 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 4 Feb 2020 09:12:12 +0100 Subject: Makefile: Bump to 0.5.0-rc.1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3e9f2b6..c6092c6 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # - Usage of += for appending to a variable PACKAGE = Badwolf -VERSION = 0.4.0 +VERSION = 0.5.0-rc.1 VERSION_FULL = $(VERSION)`./version.sh` PREFIX ?= /usr/local -- cgit v1.3.1-23-gd82d