From b67d402a1b1fefe3b89a2319fea231eeab8ac49a Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 15 Dec 2019 17:58:09 +0100 Subject: usr.bin.badwolf: Add AppArmor example file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 6d54ea7..e06cfa8 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Dependencies are: - POSIX make (works with GNU or BSD) - A pkg-config implementation (pkg-config and pkgconf are supported) -Compilation is done with `make`, install with `make install`. +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. ## 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 a generic WebKit extension that should be resuseable. -- cgit v1.3.1-23-gd82d From 036fa5a08dac68c69e80f3a4638baac77868359e Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 4 Nov 2019 20:12:00 +0100 Subject: README.md: Update for current codebase status --- README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index e06cfa8..baa5c4d 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,12 @@ The name is a reference to BBC’s Doctor Who Tv serie, I took it simply because Comparing from other small WebKit browsers for unixes found in the wild: - Independent of environment, should just work if GTK and WebKitGTK does +- Storing data should be: + - explicit and optionnal (ie. Applying preferences doesn't imply Saving to disk) + - not queryabe by WebKit (so the web can't use it) + - done in a standard format (like XBEL for bookmarks) - Static UI, no element should be added at runtime, this is to avoid potential tracking via viewport changes -- Small codebase, right now we are well under 1 000 lines +- Small codebase, right now we are under 1 500 lines total - Does not use modal editing (from vi) as that was designed for editing, not browsing - UTF-8 encoding by default @@ -23,11 +27,13 @@ Motivation from other clients , - Mirror: , this one can also be used if you prefer tickets/PRs over emails -### release tarballs +### release assets - Main: - Mirror: -Files ending in `.sig` are OpenPGP signatures done with my [key](https://hacktivis.me/key.asc)(`DDC9 237C 14CF 6F4D D847 F6B3 90D9 3ACC FEFF 61AE`). +- `*.tar.*` files are tarballs archives to be extracted with a program like `tar(1)`, GNU tar and LibArchive bsdtar are known to work. +- `*.sig` files are OpenPGP signatures done with my [key](https://hacktivis.me/key.asc)(`DDC9 237C 14CF 6F4D D847 F6B3 90D9 3ACC FEFF 61AE`). +- `*.sign` files are minisign (OpenBSD `signify(1)` compatible) signatures, they key used for it can be found at as well as other places (feel free to ping me to get it) ## Manual Installation Dependencies are: @@ -39,4 +45,4 @@ Dependencies are: 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. ## 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 a generic WebKit extension that should be resuseable. +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 4e144dd01af4855e02ed394c75e8c04c4dae710b Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 15 Dec 2019 20:20:53 +0100 Subject: README.md: gettext --- README.md | 1 + 1 file changed, 1 insertion(+) (limited to 'README.md') diff --git a/README.md b/README.md index baa5c4d..7fa1da3 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ Dependencies are: - C11 Compiler (such as clang or gcc) - POSIX make (works with GNU or BSD) - A pkg-config implementation (pkg-config and pkgconf are supported) +- (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. -- cgit v1.3.1-23-gd82d From 379690e63f294943c27d64a21e68ffb7aa880b22 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 16 Dec 2019 04:07:41 +0100 Subject: README.md: Add note about LibSoup --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 7fa1da3..f8cda59 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,11 @@ Motivation from other clients Date: Sat, 18 Jan 2020 20:37:24 +0100 Subject: README: Document doing translations --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'README.md') diff --git a/README.md b/README.md index f8cda59..8b5d974 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,14 @@ Comparing from other small WebKit browsers for unixes found in the wild: Motivation from other clients +## Contributing +### Translations +You need to have gettext installed. If you want a GUI, poedit exists and Weblate is a good web platform that I might consider hosting at some point. + +- Syncing POT file with the source code: ``make po/messages.pot`` +- Syncing PO file with the POT file: ``make po/de.po`` +- Initialising a new PO file (example for German, `de_DE`): ``msginit -l de_DE -i po/messages.pot -o po/de.po`` + ## Repositories ### git - Main: , -- cgit v1.3.1-23-gd82d From cdfbd1418e15cc9cdab77619a83ca11286b05b03 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 19 Jan 2020 20:39:01 +0100 Subject: Revert "README.md: Add note about LibSoup" This reverts commit 379690e63f294943c27d64a21e68ffb7aa880b22. --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 8b5d974..dda0791 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,10 @@ You need to have gettext installed. If you want a GUI, poedit exists and Weblate ## Manual Installation Dependencies are: -- POSIX make (works with GNU or BSD) - C11 Compiler (such as clang or gcc) -- A pkgconfig implementation, pkg-config and pkgconf are supported - [WebKitGTK](https://webkitgtk.org/), only the latest stable is supported -- [LibSoup](https://wiki.gnome.org/Projects/libsoup), should be pulled by WebKitGTK +- POSIX make with extension for shell in variables (works with GNU, {Net,Free,Open}BSD) +- 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. -- cgit v1.3.1-23-gd82d From b12dd026a2b6d6202f12da57000ee364acf30992 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 19 Jan 2020 20:44:23 +0100 Subject: README.md: Add link to homepage --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index dda0791..2e3d245 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # BadWolf -Minimalist and privacy-oriented WebKitGTK+ browser +Minimalist and privacy-oriented WebKitGTK+ browser. + +Homepage: + ``` Copyright © 2019 Haelwenn (lanodan) Monnier SPDX-License-Identifier: BSD-3-Clause -- 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 'README.md') 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 'README.md') 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