commit: 4f330a1168e6ba50df63b08c08f274650dcb3812 parent 6e9679c1f6fe3b64ebbeb4a94dcc0060b3e6356d Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Sat, 9 Jul 2022 09:05:36 +0200 Make repository reuse compliantDiffstat:
49 files changed, 416 insertions(+), 98 deletions(-)
diff --git a/.builds/netbsd.yml b/.builds/netbsd.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause + image: netbsd/latest packages: - pkg-config diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause + image: openbsd/latest packages: - webkitgtk4 diff --git a/.clang-format b/.clang-format @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause AlignAfterOpenBracket: true AlignConsecutiveAssignments: true AlignOperands: true diff --git a/.editorconfig b/.editorconfig @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause + # https://EditorConfig.org root = true diff --git a/.gitignore b/.gitignore @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause + /badwolf /locale /config.mk diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause + image: archlinux/base:latest before_script: diff --git a/.mailmap b/.mailmap @@ -0,0 +1,2 @@ +Haelwenn (lanodan) Monnier <contact@hacktivis.me> +Haelwenn (lanodan) Monnier <contact@hacktivis.me> <contact+gitlab.com@hacktivis.me> diff --git a/.reuse/dep5 b/.reuse/dep5 @@ -0,0 +1,16 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: badwolf +Upstream-Contact: Badwolf Authors <https://hacktivis.me/projects/badwolf> +Source: https://hacktivis.me/projects/badwolf + +Files: .mailmap AUTHORS +Copyright: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +License: BSD-3-Clause + +Files: badwolf.svg badwolf.inkscape.svg icons/* +Copyright: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +License: CC-BY-SA-4.0 + +Files: *_test +Copyright: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +License: CC-BY-SA-4.0 diff --git a/AUTHORS b/AUTHORS @@ -0,0 +1,8 @@ +Ben K <ben-k@tutanota.com> +Haelwenn (lanodan) Monnier <contact@hacktivis.me> +Jean-Yves Monnier <jeymon@gmail.com> +Ngô Ngọc Đức Huy <huyngo@disroot.org> +nXecure <j.xecure@gmail.com> +Oğuz Ersen <oguzersen@protonmail.com> +Pedro Lucas Porcellis <porcellis@eletrotupi.com> +striker.sh <strikersh@disroot.org> diff --git a/COPYING b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2019-2021, Badwolf Authors <https://hacktivis.me/projects/badwolf> +Copyright (c) 2019-2022, Badwolf Authors <https://hacktivis.me/projects/badwolf> All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/KnowledgeBase.md b/KnowledgeBase.md @@ -1,3 +1,8 @@ +<!-- +SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +SPDX-License-Identifier: BSD-3-Clause +--> + - Similar WebKitGTK+ browser: https://www.uninformativ.de/git/lariza/ - WebKit2 Extensions Tutorial: https://blogs.igalia.com/carlosgc/2013/09/10/webkit2gtk-web-process-extensions/ - https://trac.torproject.org/projects/tor/wiki/doc/ImportantGoogleChromeBugs / https://trac.torproject.org/projects/tor/ticket/1925 diff --git a/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt @@ -0,0 +1,11 @@ +Copyright (c) <year> <owner>. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSES/CC-BY-SA-4.0.txt b/LICENSES/CC-BY-SA-4.0.txt @@ -0,0 +1,170 @@ +Creative Commons Attribution-ShareAlike 4.0 International + + Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses. + +Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors. + +Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. + +Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public. + +Creative Commons Attribution-ShareAlike 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. + + a. Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + + e. Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. + + i. Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights under this Public License. + + k. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: + + A. reproduce and Share the Licensed Material, in whole or in part; and + + B. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. + + 3. Term. The term of this Public License is specified in Section 6(a). + + 4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. + + 5. Downstream recipients. + + A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. + + B. Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply. + + C. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + + 6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this Public License. + + 3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified form), You must: + + A. retain the following if it is supplied by the Licensor with the Licensed Material: + + i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of warranties; + + v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + + B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and + + C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + + 3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + + b. ShareAlike.In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply. + + 1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; + + b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and + + c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + + a. Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. + + b. To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. + + c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + + a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or + + 2. upon express reinstatement by the Licensor. + + c. For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. + + d. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. + + e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + +Section 8 – Interpretation. + + a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. + + c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. + + d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + +Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/Makefile b/Makefile @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause + # POSIX-ish 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 @@ -12,7 +15,7 @@ EXE = badwolf EXE_test = fmt_test uri_test bookmarks_test TRANS = fr.mo pt_BR.mo tr.mo de.mo vi.mo TRANS_MAN = badwolf.fr.1 -DOCS = usr.bin.badwolf README.md KnowledgeBase.md interface.txt +DOCS = usr.bin.badwolf README.md KnowledgeBase.md interface.md GETTEXT_OPTS = --copyright-holder="Badwolf Authors <https://hacktivis.me/projects/badwolf>" --package-name="$(PACKAGE)" --package-version="$(VERSION_FULL)" --msgid-bugs-address="contact+badwolf-msgid@hacktivis.me" @@ -32,11 +35,13 @@ icons/hicolor/%/apps/badwolf.png: icons/hicolor/scalable/apps/badwolf.svg mkdir -p `dirname $@` $(INKSCAPE) `echo $@ | cut -d/ -f3 | ./icons_size.sh` $< -o $@ -po/messages.pot: $(SRCS) - xgettext --keyword=_ --language=C --from-code=UTF-8 -o $@ --add-comments --sort-output $(GETTEXT_OPTS) $(SRCS) +po/messages.pot: $(SRCS) po/pot_license.ed + xgettext --keyword=_ --language=C --from-code=UTF-8 -o $@ --add-comments --sort-output --foreign-user $(GETTEXT_OPTS) $(SRCS) + $(ED) -s $@ <po/pot_license.ed -po/manpage.pot: badwolf.1 +po/manpage.pot: badwolf.1 po/pot_license.ed po4a-gettextize --format man -M utf-8 --master badwolf.1 $(GETTEXT_OPTS) --po $@ + $(ED) -s $@ <po/pot_license.ed po/%_man.po: po/manpage.pot badwolf.1 po4a-updatepo --format man -M utf-8 --master badwolf.1 --msgmerge-opt '--update' $(GETTEXT_OPTS) --po $@ @@ -81,6 +86,7 @@ lint: $(MANDOC) -Tlint -Wunsupp,error,warning ./badwolf.1 $(TRANS_MAN) $(SHELLCHECK) ./configure $(FLAWFINDER) . + $(REUSE) lint .PHONY: install install: all @@ -110,5 +116,9 @@ clean: distclean: clean rm -fr config.mk +.PHONY: AUTHORS +AUTHORS: .git + git log --use-mailmap --format='format:%aN <%aE>' --date='format:%Y' | sort | uniq > AUTHORS + format: *.c *.h clang-format -style=file -assume-filename=.clang-format -i *.c *.h diff --git a/README.md b/README.md @@ -1,13 +1,13 @@ # BadWolf -Minimalist and privacy-oriented WebKitGTK+ browser. - -Homepage: <https://hacktivis.me/projects/badwolf> - ``` -Copyright © 2019-2021 Badwolf Authors <https://hacktivis.me/projects/badwolf> +SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> SPDX-License-Identifier: BSD-3-Clause ``` +Minimalist and privacy-oriented WebKitGTK+ browser. + +Homepage: <https://hacktivis.me/projects/badwolf> + The name is a reference to BBC’s Doctor Who Tv serie, I took it simply because I wanted to have a specie in the name, like some other web browsers do, but doesn’t go into the “gentle” zone. ## Differencies @@ -60,9 +60,11 @@ You need to have gettext installed. If you want a GUI, poedit exists and Weblate - [libxml-2.0](http://www.xmlsoft.org/), no known version limitation - (optional, translating) [po4a](https://po4a.org/) to modify manpage translations - (optional, translating) gettext implementation (such as GNU Gettext) +- (optional, translating) ed(1), the standard editor - (optional, lint) [mandoc](https://mdocml.bsd.lv/) (the command) for linting the manpage - (optional, lint) [shellcheck](https://www.shellcheck.net/) for linting the `./configure` script - (optional, lint) [flawfinder](https://www.dwheeler.com/flawfinder/) for examining C source code for flaws +- (optional, lint) [reuse](https://reuse.software/) for checking REUSE compliance Note: Packagers can safely ignore the lint dependencies. diff --git a/badwolf.c b/badwolf.c @@ -1,5 +1,5 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019-2021 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> // SPDX-License-Identifier: BSD-3-Clause #include "badwolf.h" diff --git a/badwolf.desktop b/badwolf.desktop @@ -1,4 +1,6 @@ # https://www.freedesktop.org/wiki/Specifications/desktop-entry-spec/ +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause [Desktop Entry] Version=1.1 Type=Application diff --git a/badwolf.h b/badwolf.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-License-Identifier: BSD-3-Clause + #ifndef BADWOLF_H_INCLUDED #define BADWOLF_H_INCLUDED diff --git a/bookmarks.c b/bookmarks.c @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-License-Identifier: BSD-3-Clause + #include "bookmarks.h" #include "badwolf.h" diff --git a/bookmarks.h b/bookmarks.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-License-Identifier: BSD-3-Clause + #include <gtk/gtk.h> GtkTreeModel *bookmarks_completion_init(); void bookmarks_completion_setup(GtkEntryCompletion *location_completion, GtkTreeModel *tree_model); diff --git a/bookmarks_test.c b/bookmarks_test.c @@ -1,5 +1,5 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> // SPDX-License-Identifier: BSD-3-Clause #include "bookmarks.h" diff --git a/bookmarks_test.fixtures/full/badwolf/bookmarks.xbel b/bookmarks_test.fixtures/full/badwolf/bookmarks.xbel @@ -2,6 +2,10 @@ <?xml-stylesheet type="text/xsl" href="bookmarks.xsl"?> <!DOCTYPE xbel PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML" "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd"> +<!-- +SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +SPDX-License-Identifier: BSD-3-Clause +--> <xbel> <folder> diff --git a/config.h b/config.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-License-Identifier: BSD-3-Clause + #ifndef CONFIG_H_INCLUDED #define CONFIG_H_INCLUDED /* BADWOLF_TAB_POSITION: Position of the tab listing, can be one of: diff --git a/configure b/configure @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause + VERSION=1.2.0 VERSION_FULL=${VERSION}$(./version.sh) ICON_SIZES="$(for i in 24 32 48 64 128 256; do printf 'icons/hicolor/%sx%s/apps/badwolf.png ' $i $i ; done)" @@ -24,11 +28,13 @@ Variables: INKSCAPE=BIN CC=BIN CFLAGS=OPTIONS + ED=BIN LDFLAGS=OPTIONS EXTRA_CFLAGS=OPTIONS MANDOC=BIN SHELLCHECK=BIN FLAWFINDER=BIN + REUSE=BIN WITH_WEBKITGTK=(4.0|4.1) WITH_URI_PARSER=(guri|libsoup2) @@ -70,9 +76,11 @@ MSGFMT="${MSGFMT:-msgfmt}" INKSCAPE="${INKSCAPE:-inkscape}" CC="${CC:-cc}" CFLAGS="${CFLAGS:--g -O2 -pie -fPIE}" +ED="${ED:-ed}" MANDOC="${MANDOC:-mandoc}" SHELLCHECK="${SHELLCHECK:-shellcheck}" FLAWFINDER="${FLAWFINDER:-flawfinder}" +REUSE="${REUSE:-reuse}" # Also allow variables through arguments @@ -118,6 +126,15 @@ command -v "${PKGCONFIG}" >/dev/null ; required printf 'Checking %s command existance ...' "${CC}" command -v "${CC}" >/dev/null ; required +printf 'Checking %s command existance ...' "${ED}" +if command -v "${ED}" >/dev/null ; is_ok +then + : +else + printf 'Warning: Fixing copyright in po/*.pot files via ed(1) disabled' + ED="true" +fi + printf 'Checking %s command existance ...' "${MANDOC}" if command -v "${MANDOC}" >/dev/null ; is_ok then @@ -145,6 +162,14 @@ else SHELLCHECK="true" fi +printf 'Checking %s command existance ...' "${REUSE}" +if command -v "${REUSE}" >/dev/null ; is_ok +then + : +else + printf 'Warning: License linting via reuse(1) disabled' + REUSE="true" +fi echo @@ -244,12 +269,14 @@ APPSDIR = ${APPSDIR} PKGCONFIG = ${PKGCONFIG} CC = ${CC} +ED = ${ED} INKSCAPE = ${INKSCAPE} MSGFMT = ${MSGFMT} DBG = ${DBG} MANDOC = ${MANDOC} SHELLCHECK = ${SHELLCHECK} FLAWFINDER = ${FLAWFINDER} +REUSE = ${REUSE} CFLAGS = ${CFLAGS} -DDATADIR=\"\${DATADIR}\" -DPACKAGE=\"\${PACKAGE}\" -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"\${VERSION_FULL}\" ${DEPS_cflags} LDFLAGS = ${LDFLAGS} diff --git a/decisions.md b/decisions.md @@ -1,3 +1,8 @@ +<!-- +SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +SPDX-License-Identifier: BSD-3-Clause +--> + # Decisions taken over the project lifetime ## What is this? See <https://akazlou.com/posts-output/2015-11-09-every-project-should-have-decisions/> diff --git a/downloads.c b/downloads.c @@ -1,5 +1,5 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019 Haelwenn (lanodan) Monnier <contact@hacktivis.me> +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> // SPDX-License-Identifier: BSD-3-Clause #include "downloads.h" diff --git a/downloads.h b/downloads.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-License-Identifier: BSD-3-Clause + #include "badwolf.h" #include <gtk/gtk.h> diff --git a/fmt.c b/fmt.c @@ -1,5 +1,5 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019-2021 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> // SPDX-License-Identifier: BSD-3-Clause #include "fmt.h" diff --git a/fmt.h b/fmt.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-License-Identifier: BSD-3-Clause + #include <stdint.h> // uint64_t #define BADWOLF_CTX_SIZ 7 diff --git a/fmt_test.c b/fmt_test.c @@ -1,5 +1,5 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019-2021 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> // SPDX-License-Identifier: BSD-3-Clause #include "fmt.h" diff --git a/icons_size.sh b/icons_size.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause + # Transforms an icon size from the Icon Theme Specification to rsvg-convert(1) options #sed -r -e 's;^([^x]*)x([^@]*)$;-w \1 -h \2;' -e 's;^([^x]*)x([^@]*)@(.*)$;-w \1 -h \2 -z \3;' sed -r 's;^([^x]*)x([^@]*)$;-w \1 -h \2;' diff --git a/interface.css b/interface.css @@ -1,2 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> + * SPDX-License-Identifier: BSD-3-Clause + */ + #browser__location, #browser__statuslabel, #browser__tabbox__context_label { font-family: monospace; } button:checked label { font-weight: bold; } diff --git a/interface.md b/interface.md @@ -0,0 +1,51 @@ +<!-- +SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +SPDX-License-Identifier: BSD-3-Clause +--> + +# Badwolf +- A tablist with a new tab button at the end +- right-clicking on the tablist gives you the list in a context-menu format +- middle-clicking on the focused tab closes it +- Each tab contains a Browser View or the Downloads View + +## Tab Labels +- An A-Z represented number identifying the webkit process context +- An icon to indicate if a media is playing +- The title of the web view +- A close button + +## Browser View + +The Browser View contains the following items: +- Toolbar +- WebKit WebView +- Status Bar + +### Toolbar +- Backward navigation button followed by a smaller forward navigation button +- Separator +- Javascript-markup toggler marked "JS" followed by an image-loading toggler marked "IMG" +- Potentially some future elements +- Location entry linked to the WebKit WebView, with integrated progress indication also linked to the WebKit WebView +- Potentially some future elements +- Print button +- Potentially some future elements + +The element focused by default is the location entry. + +### Status bar +- Search entry linked to the WebKit WebView +- Potentially some future elements +- Label showing where the mouse is pointing +- Potentially some future elements + +## Downloads View + +The download view is a table contains the following items on each row corresponding to each download: +- Icon linked to the network status +- Progress bar, with integrated received-size indication +- (when downloading) Cancelling button +- Label about the current status +- Link to download destination +- Potentially some future elements diff --git a/interface.txt b/interface.txt @@ -1,46 +0,0 @@ -# Badwolf -- A tablist with a new tab button at the end -- right-clicking on the tablist gives you the list in a context-menu format -- middle-clicking on the focused tab closes it -- Each tab contains a Browser View or the Downloads View - -## Tab Labels -- An A-Z represented number identifying the webkit process context -- An icon to indicate if a media is playing -- The title of the web view -- A close button - -## Browser View - -The Browser View contains the following items: -- Toolbar -- WebKit WebView -- Status Bar - -### Toolbar -- Backward navigation button followed by a smaller forward navigation button -- Separator -- Javascript-markup toggler marked "JS" followed by an image-loading toggler marked "IMG" -- Potentially some future elements -- Location entry linked to the WebKit WebView, with integrated progress indication also linked to the WebKit WebView -- Potentially some future elements -- Print button -- Potentially some future elements - -The element focused by default is the location entry. - -### Status bar -- Search entry linked to the WebKit WebView -- Potentially some future elements -- Label showing where the mouse is pointing -- Potentially some future elements - -## Downloads View - -The download view is a table contains the following items on each row corresponding to each download: -- Icon linked to the network status -- Progress bar, with integrated received-size indication -- (when downloading) Cancelling button -- Label about the current status -- Link to download destination -- Potentially some future elements diff --git a/keybindings.c b/keybindings.c @@ -1,5 +1,5 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019-2021 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> // SPDX-License-Identifier: BSD-3-Clause #include "keybindings.h" @@ -39,7 +39,7 @@ badwolf_about_dialog(GtkWindow *main_window, gpointer user_data) gtk_window_set_destroy_with_parent(GTK_WINDOW(about_dialog), TRUE); gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(about_dialog), - "SPDX-License-Identifier: BSD-3-Clause"); + "SPDX License Identifiers: BSD-3-Clause AND CC-BY-SA-4.0"); gtk_about_dialog_set_copyright( GTK_ABOUT_DIALOG(about_dialog), "2019-2021 Badwolf Authors <https://hacktivis.me/projects/badwolf>"); diff --git a/keybindings.h b/keybindings.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-License-Identifier: BSD-3-Clause + #ifndef KEYBINDINGS_H_INCLUDED #define KEYBINDINGS_H_INCLUDED #include "badwolf.h" diff --git a/po/de.po b/po/de.po @@ -1,8 +1,7 @@ # German translations for Badwolf package. -# Copyright (C) 2021 Badwolf Authors <https://hacktivis.me/projects/badwolf> -# This file is distributed under the same license as the Badwolf package. -# Ben K. <ben-k@tutanota.com>, 2021. -# +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause + msgid "" msgstr "" "Project-Id-Version: Badwolf 1.0.3+g1b10b33.develop\n" diff --git a/po/fr.po b/po/fr.po @@ -1,8 +1,7 @@ # BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -# Copyright (C) 2019-2021 Badwolf Authors <https://hacktivis.me/projects/badwolf> -# This file is distributed under the same license as the Badwolf package. -# Haelwenn (lanodan) Monnier <contact@hacktivis.me>, 2019 -# +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause + msgid "" msgstr "" "Project-Id-Version: Badwolf 0.3.0+gd88f2e7\n" diff --git a/po/fr_man.po b/po/fr_man.po @@ -1,9 +1,8 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause # #, fuzzy + msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" diff --git a/po/manpage.pot b/po/manpage.pot @@ -1,7 +1,5 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR Badwolf Authors <https://hacktivis.me/projects/badwolf> -# This file is distributed under the same license as the Badwolf package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause # #, fuzzy msgid "" diff --git a/po/messages.pot b/po/messages.pot @@ -1,7 +1,5 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Badwolf Authors <https://hacktivis.me/projects/badwolf> -# This file is distributed under the same license as the Badwolf package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause # #, fuzzy msgid "" diff --git a/po/pot_license.ed b/po/pot_license.ed @@ -0,0 +1,8 @@ +1,/^#$/d +i +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause +# +. +w +q diff --git a/po/pt_BR.po b/po/pt_BR.po @@ -1,7 +1,6 @@ # BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -# Copyright (C) 2020 Badwolf Authors <https://hacktivis.me/projects/badwolf> -# This file is distributed under the same license as the Badwolf package. -# +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause msgid "" msgstr "" "Project-Id-Version: Badwolf 0.4.0+g607300e\n" diff --git a/po/tr.po b/po/tr.po @@ -1,13 +1,11 @@ # Turkish translations for Badwolf package. -# Copyright (C) 2020 Badwolf Authors <https://hacktivis.me/projects/badwolf> -# This file is distributed under the same license as the Badwolf package. -# Oğuz Ersen <oguzersen@protonmail.com>, 2020, 2021. -# +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause msgid "" msgstr "" "Project-Id-Version: Badwolf 1.0.2+g17b9802.develop\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2021-04-10 20:38+0300\n" +"POT-Creation-Date: 2021-04-14 18:24-0300\n" "PO-Revision-Date: 2021-04-10 20:38+0300\n" "Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n" "Language-Team: Turkish\n" diff --git a/po/vi.po b/po/vi.po @@ -1,14 +1,12 @@ # Vietnamese translations for Badwolf package # Bản dịch Tiếng Việt dành cho gói Badwolf. -# Copyright (C) 2021 Badwolf Authors <https://hacktivis.me/projects/badwolf> -# This file is distributed under the same license as the Badwolf package. -# Ngô Ngọc Đức Huy <huyngo@disroot.org>, 2021. -# +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause msgid "" msgstr "" "Project-Id-Version: Badwolf 1.0.3+gedbbb27.develop\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2021-04-09 08:48+0200\n" +"POT-Creation-Date: 2021-04-14 18:24-0300\n" "PO-Revision-Date: 2021-09-29 10:51+0700\n" "Last-Translator: Ngô Ngọc Đức Huy <huyngo@disroot.org>\n" "Language-Team: Vietnamese\n" diff --git a/uri.c b/uri.c @@ -1,5 +1,5 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019-2021 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> // SPDX-License-Identifier: BSD-3-Clause #include "uri.h" diff --git a/uri.h b/uri.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-License-Identifier: BSD-3-Clause + #ifndef URI_H_INCLUDED #define URI_H_INCLUDED #include <glib.h> diff --git a/uri_test.c b/uri_test.c @@ -1,5 +1,6 @@ // BadWolf: Minimalist and privacy-oriented WebKitGTK+ browser -// Copyright © 2019-2021 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +// // SPDX-License-Identifier: BSD-3-Clause #include "uri.h" diff --git a/version.sh b/version.sh @@ -1,4 +1,8 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2019-2022 Badwolf Authors <https://hacktivis.me/projects/badwolf> +# SPDX-License-Identifier: BSD-3-Clause + if command -v git 2>/dev/null >/dev/null then hash=$(git --git-dir="$(dirname $0)/.git" rev-parse --short HEAD 2>/dev/null)