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

New package: font-awesome6-6.1.1 #37019

Merged
merged 2 commits into from Jun 25, 2022
Merged

Conversation

mobinmob
Copy link
Contributor

@mobinmob mobinmob commented May 7, 2022

Testing the changes

  • I tested the changes in this PR: YES

New package

Not sure if that should be a new package or replace font-awesome5...

@mobinmob mobinmob force-pushed the font-awesome6 branch 2 times, most recently from 0824fa6 to c39f682 Compare May 7, 2022 11:49
@classabbyamp
Copy link
Member

Not sure if that should be a new package or replace font-awesome5...

as i understand it, each generation of font-awesome is a different set/style of icons. font-awesome 4 and 5 are already packaged separately, so it would make sense to continue that i guess.

@paper42 paper42 added the new-package This PR adds a new package label May 7, 2022
@subnut
Copy link
Contributor

subnut commented May 14, 2022

Isn't it supposed to conflict with the other font-awesome packages?

Add this to the template -

conflicts="font-awesome>=0"

Refer to the template for font-awesome5



Other than that, LGTM 👍

@mobinmob
Copy link
Contributor Author

Isn't it supposed to conflict with the other font-awesome packages?

I am not sure. I did not do it, since there are no file conflicts :)

Add this to the template -

conflicts="font-awesome>=0"

Refer to the template for font-awesome5

Yep, that is my template also :P

Other than that, LGTM +1

Thanks for the review!

@classabbyamp
Copy link
Member

Isn't it supposed to conflict with the other font-awesome packages?

no, they are different fonts. why would they conflict?

@subnut
Copy link
Contributor

subnut commented May 14, 2022

🤷

I just thought that, since font-awesome5 conflicts with font-awesome, font-awesome6 would also conflict with it.

@mobinmob
Copy link
Contributor Author

shrug

I just thought that, since font-awesome5 conflicts with font-awesome, font-awesome6 would also conflict with it.

I have to test this. I think version 6 is not conflicting in any way (I have it in my system alongside v5). I do not remember why I added the conflit in v5 unfortunately...

@classabbyamp
Copy link
Member

it should be fine to remove the 4/5 conflict:

$ diff -u <(xls font-awesome) <(xls font-awesome5)
--- /proc/self/fd/11	2022-05-14 10:53:24.439310999 -0400
+++ /proc/self/fd/12	2022-05-14 10:53:24.440311001 -0400
@@ -1 +1,3 @@
-/usr/share/fonts/OTF/FontAwesome.otf
+/usr/share/fonts/OTF/Font Awesome 5 Brands-Regular-400.otf
+/usr/share/fonts/OTF/Font Awesome 5 Free-Regular-400.otf
+/usr/share/fonts/OTF/Font Awesome 5 Free-Solid-900.otf

@mobinmob
Copy link
Contributor Author

mobinmob commented Jun 6, 2022

  • Rebased on master.
  • Removed conflict from font-awesome5 (thanks @classabbyamp ).

@classabbyamp classabbyamp merged commit e7a98b2 into void-linux:master Jun 25, 2022
@mobinmob mobinmob deleted the font-awesome6 branch April 2, 2023 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new-package This PR adds a new package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants