epaint: cover default fonts in the license field (#2327)

This commit is contained in:
Emil Ernerfeldt 2022-11-22 13:44:01 +01:00 committed by GitHub
parent 8602326af5
commit bde47c9957
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions

View file

@ -6,7 +6,7 @@ description = "Minimal 2D graphics library for GUI work"
edition = "2021" edition = "2021"
rust-version = "1.65" rust-version = "1.65"
homepage = "https://github.com/emilk/egui/tree/master/crates/epaint" homepage = "https://github.com/emilk/egui/tree/master/crates/epaint"
license = "MIT OR Apache-2.0" license = "(MIT OR Apache-2.0) AND OFL-1.1 AND LicenseRef-UFL-1.0" # OFL and UFL used by default_fonts. See https://github.com/emilk/egui/issues/2321
readme = "README.md" readme = "README.md"
repository = "https://github.com/emilk/egui/tree/master/crates/epaint" repository = "https://github.com/emilk/egui/tree/master/crates/epaint"
categories = ["graphics", "gui"] categories = ["graphics", "gui"]
@ -18,6 +18,8 @@ include = [
"Cargo.toml", "Cargo.toml",
"fonts/*.ttf", "fonts/*.ttf",
"fonts/*.txt", "fonts/*.txt",
"fonts/OFL.txt",
"fonts/UFL.txt",
] ]
[package.metadata.docs.rs] [package.metadata.docs.rs]

View file

@ -36,7 +36,7 @@ skip = [
{ name = "ttf-parser" }, # different versions pulled in by ab_glyph and usvg { name = "ttf-parser" }, # different versions pulled in by ab_glyph and usvg
] ]
skip-tree = [ skip-tree = [
{ name = "criterion" }, # dev-dependnecy { name = "criterion" }, # dev-dependency
{ name = "glium" }, # legacy crate, lots of old dependencies { name = "glium" }, # legacy crate, lots of old dependencies
{ name = "rfd" }, # example dependency { name = "rfd" }, # example dependency
{ name = "three-d" }, # example dependency { name = "three-d" }, # example dependency
@ -49,15 +49,16 @@ allow-osi-fsf-free = "neither"
confidence-threshold = 0.92 # We want really high confidence when inferring licenses from text confidence-threshold = 0.92 # We want really high confidence when inferring licenses from text
copyleft = "deny" copyleft = "deny"
allow = [ allow = [
# "Apache-2.0 WITH LLVM-exception", # https://spdx.org/licenses/LLVM-exception.html
"Apache-2.0", # https://tldrlegal.com/license/apache-license-2.0-(apache-2.0) "Apache-2.0", # https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)
"BSD-2-Clause", # https://tldrlegal.com/license/bsd-2-clause-license-(freebsd) "BSD-2-Clause", # https://tldrlegal.com/license/bsd-2-clause-license-(freebsd)
"BSD-3-Clause", # https://tldrlegal.com/license/bsd-3-clause-license-(revised) "BSD-3-Clause", # https://tldrlegal.com/license/bsd-3-clause-license-(revised)
"BSL-1.0", # https://tldrlegal.com/license/boost-software-license-1.0-explained "BSL-1.0", # https://tldrlegal.com/license/boost-software-license-1.0-explained
"CC0-1.0", # https://creativecommons.org/publicdomain/zero/1.0/ "CC0-1.0", # https://creativecommons.org/publicdomain/zero/1.0/
"ISC", # https://tldrlegal.com/license/-isc-license "ISC", # https://tldrlegal.com/license/-isc-license
"LicenseRef-UFL-1.0", # https://tldrlegal.com/license/ubuntu-font-license,-1.0 - no official SPDX, see https://github.com/emilk/egui/issues/2321
"MIT", # https://tldrlegal.com/license/mit-license "MIT", # https://tldrlegal.com/license/mit-license
"MPL-2.0", # https://www.mozilla.org/en-US/MPL/2.0/FAQ/ - see Q11 "MPL-2.0", # https://www.mozilla.org/en-US/MPL/2.0/FAQ/ - see Q11
"OFL-1.1", # https://spdx.org/licenses/OFL-1.1.html
"OpenSSL", # https://www.openssl.org/source/license.html "OpenSSL", # https://www.openssl.org/source/license.html
"Unicode-DFS-2016", # https://spdx.org/licenses/Unicode-DFS-2016.html "Unicode-DFS-2016", # https://spdx.org/licenses/Unicode-DFS-2016.html
"Zlib", # https://tldrlegal.com/license/zlib-libpng-license-(zlib) "Zlib", # https://tldrlegal.com/license/zlib-libpng-license-(zlib)