[Scummvm-git-logs] scummvm master -> a08689672f250ea88f7fb2bee50ba39b6bb5fab8
scemino
noreply at scummvm.org
Thu May 2 20:06:50 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a08689672f DISTS: Add OpenFontIcons.ttf + fonts.dat, fonts-cjk.dat regenerated
Commit: a08689672f250ea88f7fb2bee50ba39b6bb5fab8
https://github.com/scummvm/scummvm/commit/a08689672f250ea88f7fb2bee50ba39b6bb5fab8
Author: scemino (scemino74 at gmail.com)
Date: 2024-05-02T22:06:25+02:00
Commit Message:
DISTS: Add OpenFontIcons.ttf + fonts.dat, fonts-cjk.dat regenerated
Changed paths:
A gui/themes/fonts/OpenFontIcons.ttf
LICENSES/COPYING.MIT
dists/engine-data/fonts-cjk.dat
dists/engine-data/fonts.dat
gui/themes/fonts/README
diff --git a/LICENSES/COPYING.MIT b/LICENSES/COPYING.MIT
index 29242217baf..0f0678f53f7 100644
--- a/LICENSES/COPYING.MIT
+++ b/LICENSES/COPYING.MIT
@@ -54,3 +54,27 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+
+
+
+ScummVM uses OpenFontIcons published under the terms of MIT License
+
+Copyright (c) 2018 Alex Davies
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/dists/engine-data/fonts-cjk.dat b/dists/engine-data/fonts-cjk.dat
index d1a86a348e5..16d329aa262 100644
Binary files a/dists/engine-data/fonts-cjk.dat and b/dists/engine-data/fonts-cjk.dat differ
diff --git a/dists/engine-data/fonts.dat b/dists/engine-data/fonts.dat
index f3a4f30febb..30b463f5f91 100644
Binary files a/dists/engine-data/fonts.dat and b/dists/engine-data/fonts.dat differ
diff --git a/gui/themes/fonts/OpenFontIcons.ttf b/gui/themes/fonts/OpenFontIcons.ttf
new file mode 100644
index 00000000000..804fbc1cdc8
Binary files /dev/null and b/gui/themes/fonts/OpenFontIcons.ttf differ
diff --git a/gui/themes/fonts/README b/gui/themes/fonts/README
index b36d89889cd..1b1c5e53add 100644
--- a/gui/themes/fonts/README
+++ b/gui/themes/fonts/README
@@ -1,5 +1,6 @@
These are fonts used in ScummVM. Most of them come from Xorg.
The GNU FreeFont files are distributed under the license in COPYING.FREEFONT.
+The OpenFontIcons (https://github.com/traverseda/OpenFontIcons) files are distributed under the license in COPYING.MIT.
Also other potentially usable fonts are stored here as well.
More information about the Scummvm-git-logs
mailing list