Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Font Awesome icons with MIT fork (Fork Awesome) #1729

Merged
merged 5 commits into from
Jun 19, 2023

Conversation

m3nu
Copy link
Contributor

@m3nu m3nu commented Jun 13, 2023

Description

Font Awesome's latest license is not compatible with FOSS distros like Debian.

Hence this PR clarifies that icons used are either from Fork Awesome, which was forked off FA in version 4.7 and has a permissive MIT license or (if icons were added after v4.7) replaces them with a free and similar alternative (Google Material icons mostly)
I provide my contribution under the terms of the license of this repository and I affirm the Developer Certificate of Origin.*

I will also update the developer guide to clarify where icons can come from.

Fixes #1218

@m3nu m3nu force-pushed the remove-fontawesome-icons branch from 55684cf to fedc5c6 Compare June 13, 2023 14:46
@m3nu m3nu changed the title Replace FA icons with MIT fork or Google Material Replace Font Awesome icons with MIT fork (Fork Awesome) Jun 13, 2023
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this icon from Fork Awesome?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Luckily yes. It was already there before the fork. I just recolored it a bit for Vorta.

https://github.com/ForkAwesome/Fork-Awesome/blob/015e526ba3c088635e2d2963de430e36badf1335/src/icons/svg/hdd-o.svg?plain=1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small correction: The tray menu icons we use are from Fork Awesome (the hdd-o.svg icon linked above specifically).

The main app icon is from Twitter Bootstrap now, but recolored and with the circles moved to match the other icons.

@m3nu m3nu force-pushed the remove-fontawesome-icons branch 4 times, most recently from c29fc4c to fe6c3c1 Compare June 14, 2023 20:58
@m3nu m3nu force-pushed the remove-fontawesome-icons branch from fe6c3c1 to 5421445 Compare June 14, 2023 20:58
@sten0
Copy link
Contributor

sten0 commented Jun 15, 2023

Hi Manu,

Thanks for the quick response!

Some corrections: Font Awesome's proprietary license is not compatible with any source redistribution, including github.

Fork Awesome's SVG fonts are not MIT licensed; they are SIL OFL 1.1.

Applies to all desktop and webfont files in the following directory: fonts/.
Applies to all glyphs and SVG files in the following directory: src/icons/svg/.

https://forkaweso.me/Fork-Awesome/license/
https://github.com/ForkAwesome/Fork-Awesome/blob/015e526ba3c088635e2d2963de430e36badf1335/LICENSES#L362

There's also a moral clause for attribution when using any icons in Bootstrap that were donated by the GlyphIcons creator. While optional, legally speaking, it would be nice to see this attribution.

@m3nu
Copy link
Contributor Author

m3nu commented Jun 16, 2023

What a rabbit hole.

I've update the license for Fork Awesome in the README.

Regarding the GlyphIcons Halflings icons that were donated to Bootstrap, I can't find this icon on their website. So maybe only some Bootstrap icons are from there?

@sten0
Copy link
Contributor

sten0 commented Jun 16, 2023 via email

@m3nu
Copy link
Contributor Author

m3nu commented Jun 16, 2023

Changed the Vaadin license. Looks like it's shown wrongly on the search site I used.

@sten0
Copy link
Contributor

sten0 commented Jun 19, 2023 via email

@m3nu
Copy link
Contributor Author

m3nu commented Jun 19, 2023

Merging now.

The 0.9 branch will see many changes, while our Google Summer of Code guys are working on it. It will be the new stable release after the program finishes. Hopefully with many useful improvements.

The icon aggregators are useful because often one set won't have the perfect icon for a use case. Would still be good if they got the licenses right.

@m3nu m3nu merged commit 70ad554 into borgbase:master Jun 19, 2023
@sten0
Copy link
Contributor

sten0 commented Jun 19, 2023 via email

@sten0
Copy link
Contributor

sten0 commented Jun 19, 2023 via email

@m3nu
Copy link
Contributor Author

m3nu commented Jun 20, 2023

Sounds simpler to just swap this icon.

@m3nu m3nu mentioned this pull request Jun 20, 2023
@m3nu
Copy link
Contributor Author

m3nu commented Jun 20, 2023

Removed this one icon in #1735, @sten0

Sorry that you went overboard on this license before. I'm not overly attached to a single icon.

Thanks for the heads-up :) Does this mean you'd like to see Vorta 0.8.2 as the most recent fully supported version uploaded to Debian, and that you'd like me to upload 0.9 as "experimental" until fall?

Yes, running this as experimental makes sense. The 0.9 branch has some breaking changes, like Qt6.

@sten0
Copy link
Contributor

sten0 commented Jun 20, 2023 via email

@m3nu
Copy link
Contributor Author

m3nu commented Jun 21, 2023

Better tell us and we'll fix it here. I also want legal icons. 😄

@sten0
Copy link
Contributor

sten0 commented Jun 21, 2023 via email

@sten0
Copy link
Contributor

sten0 commented Jun 21, 2023 via email

@m3nu
Copy link
Contributor Author

m3nu commented Jun 22, 2023

You have work to do for license-compliance with one new icon set

You mean for those new Google icons using Apache 2 license? At this point I feel it will be better to restrict it to one icon set only and accept worse icons. I don't know why will keep up with this.

@sten0
Copy link
Contributor

sten0 commented Jun 22, 2023 via email

@m3nu
Copy link
Contributor Author

m3nu commented Jun 23, 2023

Then we'll stick with Fork Awesome (since we already use many icons from there) and Google Material Icons (as backup) for now. Updated the contributor docs to say as much.

For the Apache license, I read up on it on and think the needed changes are:

  • The original copyright notice: There is none in the SVGs. I added one anyways in a previous PR.
  • A copy of the license itself: We don't have that yet. I wonder if I can put icon licenses in the icons folder?
  • statement of any significant changes made to the original code: Didn't make changes.
  • A copy of the NOTICE file with attribution notes (if the original library has one): There is none, but attribution is already given in the README.

On the right track here? 😬

@sten0
Copy link
Contributor

sten0 commented Jun 25, 2023 via email

@m3nu
Copy link
Contributor Author

m3nu commented Jun 26, 2023

New PR to add licenses and update README.

New README is here

Also verified inclusion of those files on PyPi. As per MANIFEST.in they will be included. How about Flatpak, @Hofer-Julian , will it add .txt files added in src/vorta/asstests/icons?

@Hofer-Julian
Copy link
Collaborator

New PR to add licenses and update README.

New README is here

Also verified inclusion of those files on PyPi. As per MANIFEST.in they will be included. How about Flatpak, @Hofer-Julian , will it add .txt files added in src/vorta/asstests/icons?

No, these are the build steps it follows at the moment:
https://github.com/flathub/com.borgbase.Vorta/blob/983245c3173667cd24687111f6c7444e48a908bb/com.borgbase.Vorta.json#L48

@m3nu
Copy link
Contributor Author

m3nu commented Jun 26, 2023

I only see a few SVGs included. How do the other icons get included?

@Hofer-Julian
Copy link
Collaborator

I only see a few SVGs included. How do the other icons get included?

Ah yes, they get included by setuptools.
So txt files that are included in src/vorta/asstests/icons will probably be included too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch away from fontawesome.
4 participants