mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 07:34:11 +00:00
59a91ce153
replace non-free CC BY-ND 3.0 icons with free ones remove compat-list.json and pull from internet archive instead
1184 lines
116 KiB
Diff
1184 lines
116 KiB
Diff
From 23e02aec6ff6b0823c2e66f5cff737e0cd430a22 Mon Sep 17 00:00:00 2001
|
||
From: Kyle K <190571+Docteh@users.noreply.github.com>
|
||
Date: Mon, 28 Mar 2022 14:44:12 -0700
|
||
Subject: [PATCH 1/2] Moving Icons away from CC BY-ND 3.0 for FOSS packaging
|
||
purposes
|
||
|
||
I've seen some comments stating that sharing pre-compiled packages
|
||
of yuzu is problematic for linux distributions due to some contents
|
||
having license of CC BY-ND 3.0
|
||
|
||
Sources for the icons have been updated in the dist/license.md document
|
||
|
||
Also a note has been added to call attention to the two copies of a QT theme
|
||
called QDarkStyleSheet
|
||
---
|
||
dist/license.md | 63 ++++++++++--------
|
||
dist/qt_themes/colorful/icons/48x48/plus.png | Bin 496 -> 232 bytes
|
||
.../colorful/icons/48x48/sd_card.png | Bin 680 -> 760 bytes
|
||
dist/qt_themes/colorful/icons/48x48/star.png | Bin 1248 -> 1330 bytes
|
||
.../qt_themes/default/icons/16x16/checked.png | Bin 657 -> 414 bytes
|
||
dist/qt_themes/default/icons/16x16/failed.png | Bin 524 -> 361 bytes
|
||
dist/qt_themes/default/icons/16x16/lock.png | Bin 279 -> 318 bytes
|
||
.../default/icons/256x256/plus_folder.png | Bin 3135 -> 3521 bytes
|
||
.../default/icons/48x48/bad_folder.png | Bin 1088 -> 1007 bytes
|
||
dist/qt_themes/default/icons/48x48/chip.png | Bin 15070 -> 511 bytes
|
||
dist/qt_themes/default/icons/48x48/folder.png | Bin 410 -> 535 bytes
|
||
dist/qt_themes/default/icons/48x48/plus.png | Bin 316 -> 274 bytes
|
||
.../qt_themes/default/icons/48x48/sd_card.png | Bin 614 -> 638 bytes
|
||
dist/qt_themes/default/icons/48x48/star.png | Bin 686 -> 1029 bytes
|
||
.../qt_themes/qdarkstyle/icons/16x16/lock.png | Bin 304 -> 343 bytes
|
||
.../qdarkstyle/icons/256x256/plus_folder.png | Bin 3438 -> 3931 bytes
|
||
.../qdarkstyle/icons/48x48/bad_folder.png | Bin 1098 -> 1061 bytes
|
||
.../qt_themes/qdarkstyle/icons/48x48/chip.png | Bin 15120 -> 551 bytes
|
||
.../qdarkstyle/icons/48x48/folder.png | Bin 542 -> 594 bytes
|
||
.../qt_themes/qdarkstyle/icons/48x48/plus.png | Bin 339 -> 297 bytes
|
||
.../qdarkstyle/icons/48x48/sd_card.png | Bin 676 -> 679 bytes
|
||
.../qt_themes/qdarkstyle/icons/48x48/star.png | Bin 725 -> 1055 bytes
|
||
.../icons/16x16/lock.png | Bin 304 -> 343 bytes
|
||
.../icons/256x256/plus_folder.png | Bin 3438 -> 3931 bytes
|
||
.../icons/48x48/bad_folder.png | Bin 1098 -> 1061 bytes
|
||
.../icons/48x48/chip.png | Bin 15120 -> 551 bytes
|
||
.../icons/48x48/folder.png | Bin 542 -> 594 bytes
|
||
.../icons/48x48/plus.png | Bin 339 -> 297 bytes
|
||
.../icons/48x48/sd_card.png | Bin 676 -> 679 bytes
|
||
.../icons/48x48/star.png | Bin 725 -> 1055 bytes
|
||
30 files changed, 37 insertions(+), 26 deletions(-)
|
||
|
||
diff --git a/dist/license.md b/dist/license.md
|
||
index 7bdebfec1fccdf97a4cf24a1eddd94638d510d8b..745256c32947aeb5d77bae10bc3cce666542967e 100644
|
||
--- a/dist/license.md
|
||
+++ b/dist/license.md
|
||
@@ -2,34 +2,45 @@ The icons in this folder and its subfolders have the following licenses:
|
||
|
||
Icon Name | License | Origin/Author
|
||
--- | --- | ---
|
||
-qt_themes/default/icons/16x16/checked.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/default/icons/16x16/failed.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/default/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
|
||
+qt_themes/default/icons/16x16/checked.png |Apache 2.0 | https://github.com/google/material-design-icons/ (modified)
|
||
+qt_themes/default/icons/16x16/failed.png | Apache 2.0 | https://github.com/google/material-design-icons/ (modified)
|
||
+qt_themes/default/icons/16x16/lock.png | Apache 2.0 | https://github.com/google/material-design-icons/
|
||
qt_themes/default/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
|
||
-qt_themes/default/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/default/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/default/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/default/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/default/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
|
||
-qt_themes/default/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/default/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/qdarkstyle/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
|
||
+qt_themes/default/icons/256x256/plus_folder.png | MIT | https://github.com/tailwindlabs/heroicons
|
||
+qt_themes/default/icons/48x48/bad_folder.png | MIT | https://github.com/tailwindlabs/heroicons
|
||
+qt_themes/default/icons/48x48/chip.png | MIT | https://github.com/tailwindlabs/heroicons
|
||
+qt_themes/default/icons/48x48/folder.png | MIT | https://github.com/tailwindlabs/heroicons
|
||
+qt_themes/default/icons/48x48/plus.png | MIT | https://github.com/tailwindlabs/heroicons
|
||
+qt_themes/default/icons/48x48/sd_card.png | CC0 1.0 | SVG Repo https://www.svgrepo.com/svg/70351/sd-card
|
||
+qt_themes/default/icons/48x48/star.png | MIT | https://github.com/tailwindlabs/heroicons
|
||
+qt_themes/qdarkstyle/icons/16x16/lock.png | Apache 2.0 | https://github.com/google/material-design-icons/
|
||
qt_themes/qdarkstyle/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
|
||
-qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/qdarkstyle/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/qdarkstyle/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
|
||
+qt_themes/qdarkstyle/icons/256x256/plus_folder.png | MIT | https://github.com/tailwindlabs/heroicons
|
||
+qt_themes/qdarkstyle/icons/48x48/bad_folder.png | MIT | https://github.com/tailwindlabs/heroicons
|
||
+qt_themes/qdarkstyle/icons/48x48/chip.png | MIT | https://github.com/tailwindlabs/heroicons
|
||
+qt_themes/qdarkstyle/icons/48x48/folder.png | MIT | https://github.com/tailwindlabs/heroicons
|
||
qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
|
||
-qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/qdarkstyle/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
|
||
+qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC0 1.0 | SVG Repo https://www.svgrepo.com/svg/70351/sd-card
|
||
+qt_themes/qdarkstyle/icons/48x48/star.png | MIT | https://github.com/tailwindlabs/heroicons
|
||
+qt_themes/qdarkstyle/ | MIT/CC BY 4.0 | Upstream https://github.com/ColinDuquesnoy/QDarkStyleSheet
|
||
+
|
||
+qt_themes/qdarkstyle_midnight_blue/icons | See above | See the above qt_themes/qdarkstyle/icons entries
|
||
+qt_themes/qdarkstyle_midnight_blue/ | MIT/CC BY 4.0 | Upstream https://github.com/ColinDuquesnoy/QDarkStyleSheet
|
||
+
|
||
+qt_themes/colorful/icons/16x16/lock.png | MIT | https://github.com/icons8/flat-color-icons
|
||
qt_themes/colorful/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
|
||
-qt_themes/colorful/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/colorful/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/colorful/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/colorful/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/colorful/icons/48x48/plus.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/colorful/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
|
||
-qt_themes/colorful/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com
|
||
+qt_themes/colorful/icons/256x256/plus_folder.png | MIT | https://github.com/icons8/flat-color-icons (modified)
|
||
+qt_themes/colorful/icons/48x48/bad_folder.png | MIT | https://github.com/icons8/flat-color-icons (modified)
|
||
+qt_themes/colorful/icons/48x48/chip.png | MIT | https://github.com/icons8/flat-color-icons (modified)
|
||
+qt_themes/colorful/icons/48x48/folder.png | MIT | https://github.com/icons8/flat-color-icons
|
||
+qt_themes/colorful/icons/48x48/plus.png | Apache 2.0 | https://remixicon.com/ (modified)
|
||
+qt_themes/colorful/icons/48x48/sd_card.png | CC0 1.0 | https://www.svgrepo.com/svg/276818/sd-card
|
||
+qt_themes/colorful/icons/48x48/star.png | CC0 1.0 | https://www.svgrepo.com/svg/13674/star
|
||
+
|
||
+qt_themes/colorful_dark/icons/16x16/lock.png | MIT | https://github.com/icons8/flat-color-icons (modified)
|
||
+qt_themes/colorful_dark/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
|
||
+
|
||
+qt_themes/colorful_midnight_blue/icons/16x16/lock.png | MIT | https://github.com/icons8/flat-color-icons (modified)
|
||
+qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
|
||
|
||
-<!-- TODO: Add the license of the yuzu icon -->
|
||
\ No newline at end of file
|
||
+<!-- TODO: Add the license of the yuzu icon -->
|
||
diff --git a/dist/qt_themes/colorful/icons/48x48/plus.png b/dist/qt_themes/colorful/icons/48x48/plus.png
|
||
index bc2c47c91a761228dc4ebdc8df8713119d5fec3a..ff3cf889e467cfa18e1af577ceff6b3931c5290c 100644
|
||
--- a/dist/qt_themes/colorful/icons/48x48/plus.png
|
||
+++ b/dist/qt_themes/colorful/icons/48x48/plus.png
|
||
@@ -1,3 +1,3 @@
|
||
<20>PNG
|
||
|
||
- |