summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2022-09-08 15:46:48 -0400
committerDavid Robillard <d@drobilla.net>2022-09-08 15:47:18 -0400
commitf51ad87e28f7580f674569cd9a9345c50d50c935 (patch)
treed9478cddae1e814a71a91cd17eef37b4145f6139
parentab14ad84404e2bffbaa8996ac1d797f8caf40cc6 (diff)
downloadpatchage-f51ad87e28f7580f674569cd9a9345c50d50c935.tar.gz
patchage-f51ad87e28f7580f674569cd9a9345c50d50c935.tar.bz2
patchage-f51ad87e28f7580f674569cd9a9345c50d50c935.zip
Use 0BSD for trivial "public domain intent" things
Fedora takes issue with CC0. Although it doesn't really matter for this stuff (dual licensed anyway, questionably "software", certainly not patentable, and so on), this is simpler and more consistent with the ISC license used for the actual software anyway.
-rw-r--r--.clang-format2
-rw-r--r--.clang-tidy2
-rw-r--r--.gitignore2
-rw-r--r--.reuse/dep56
-rw-r--r--LICENSES/0BSD.txt12
-rw-r--r--LICENSES/CC0-1.0.txt121
-rw-r--r--icons/meson.build2
-rw-r--r--meson.build2
-rw-r--r--meson/suppressions/meson.build2
-rw-r--r--meson/warnings/meson.build2
-rwxr-xr-xosx/bundleify.sh2
-rw-r--r--po/LINGUAS2
-rw-r--r--po/POTFILES2
-rw-r--r--po/meson.build2
-rw-r--r--subprojects/fmt/meson.build2
15 files changed, 27 insertions, 136 deletions
diff --git a/.clang-format b/.clang-format
index 9688e2f..40d32ed 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,5 +1,5 @@
# Copyright 2020-2021 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
---
AlignConsecutiveAssignments: true
diff --git a/.clang-tidy b/.clang-tidy
index f613b3a..e9e208a 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,5 @@
# Copyright 2020-2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
Checks: >
*,
diff --git a/.gitignore b/.gitignore
index 7b74174..c41acb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
# Copyright 2020-2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
build/
diff --git a/.reuse/dep5 b/.reuse/dep5
index 1731c62..b2f01c6 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -5,11 +5,11 @@ Source: https://gitlab.com/drobilla/patchage
Files: .clant.json .includes.imp INSTALL.md NEWS meson_options.txt
Copyright: 2020-2021 David Robillard <d@drobilla.net>
-License: CC0-1.0 OR GPL-3.0-or-later
+License: 0BSD OR GPL-3.0-or-later
Files: AUTHORS README.md patchage.desktop.in
Copyright: 2006-2014 David Robillard <d@drobilla.net>
-License: CC0-1.0 OR GPL-3.0-or-later
+License: 0BSD OR GPL-3.0-or-later
Files: src/patchage.gladep src/patchage.ui.in
Copyright: 2006-2014 David Robillard <d@drobilla.net>
@@ -17,7 +17,7 @@ License: GPL-3.0-or-later
Files: osx/Info.plist.in osx/gtkrc osx/loaders.cache osx/pango.modules osx/pangorc
Copyright: 2011-2017 David Robillard <d@drobilla.net>
-License: CC0-1.0 OR GPL-3.0-or-later
+License: 0BSD OR GPL-3.0-or-later
Files: osx/Patchage.icns
Copyright: 2011 David Robillard <d@drobilla.net>
diff --git a/LICENSES/0BSD.txt b/LICENSES/0BSD.txt
new file mode 100644
index 0000000..8a1f019
--- /dev/null
+++ b/LICENSES/0BSD.txt
@@ -0,0 +1,12 @@
+Copyright 2006-2022 David Robillard <d@drobilla.net>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt
deleted file mode 100644
index 0e259d4..0000000
--- a/LICENSES/CC0-1.0.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
- LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
- REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
- PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
- THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
- HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
- i. the right to reproduce, adapt, distribute, perform, display,
- communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
- likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
- subject to the limitations in paragraph 4(a), below;
- v. rights protecting the extraction, dissemination, use and reuse of data
- in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
- European Parliament and of the Council of 11 March 1996 on the legal
- protection of databases, and under any national implementation
- thereof, including any amended or successor version of such
- directive); and
-vii. other similar, equivalent or corresponding rights throughout the
- world based on applicable law or treaty, and any national
- implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
- surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
- warranties of any kind concerning the Work, express, implied,
- statutory or otherwise, including without limitation warranties of
- title, merchantability, fitness for a particular purpose, non
- infringement, or the absence of latent or other defects, accuracy, or
- the present or absence of errors, whether or not discoverable, all to
- the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
- that may apply to the Work or any use thereof, including without
- limitation any person's Copyright and Related Rights in the Work.
- Further, Affirmer disclaims responsibility for obtaining any necessary
- consents, permissions or other rights required for any use of the
- Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
- party to this document and has no duty or obligation with respect to
- this CC0 or use of the Work.
diff --git a/icons/meson.build b/icons/meson.build
index 30e78b1..3348cfe 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -1,5 +1,5 @@
# Copyright 2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
svg_icon_sizes = [
'16x16',
diff --git a/meson.build b/meson.build
index e5a5969..89dc9e1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
# Copyright 2020-2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
project('patchage', ['c', 'cpp'],
version: '1.0.9',
diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build
index 0875ccd..c2e4a8d 100644
--- a/meson/suppressions/meson.build
+++ b/meson/suppressions/meson.build
@@ -1,5 +1,5 @@
# Copyright 2020-2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
# Project-specific warning suppressions.
#
diff --git a/meson/warnings/meson.build b/meson/warnings/meson.build
index fcf06ec..a28d2a2 100644
--- a/meson/warnings/meson.build
+++ b/meson/warnings/meson.build
@@ -1,5 +1,5 @@
# Copyright 2020-2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
# General code to enable approximately all warnings in GCC 12, clang, and MSVC.
#
diff --git a/osx/bundleify.sh b/osx/bundleify.sh
index 786eb48..559795b 100755
--- a/osx/bundleify.sh
+++ b/osx/bundleify.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2011-2017 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
if [ "$#" != 3 ]; then
echo "USAGE: $0 LIB_PREFIX BUNDLE EXE";
diff --git a/po/LINGUAS b/po/LINGUAS
index d51c244..d7e570d 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,4 +1,4 @@
# Copyright 2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
de fr ko
diff --git a/po/POTFILES b/po/POTFILES
index 0f392b7..a5b038c 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,5 +1,5 @@
# Copyright 2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
src/Action.hpp
src/ActionSink.hpp
diff --git a/po/meson.build b/po/meson.build
index 689ed1b..26c1bf4 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,5 +1,5 @@
# Copyright 2020-2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
i18n = import('i18n')
diff --git a/subprojects/fmt/meson.build b/subprojects/fmt/meson.build
index 60ccda6..c221ca1 100644
--- a/subprojects/fmt/meson.build
+++ b/subprojects/fmt/meson.build
@@ -1,5 +1,5 @@
# Copyright 2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: CC0-1.0 OR GPL-3.0-or-later
+# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later
project('fmt', ['cpp'],
version: '9.0.0',