[PR PATCH] New package: font-awesome6-6.1.1

[PR PATCH] New package: font-awesome6-6.1.1

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]

There is a new pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages font-awesome6
https://github.com/void-linux/void-packages/pull/37019

New package: font-awesome6-6.1.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

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


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37019.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-font-awesome6-37019.patch --]
[-- Type: text/x-diff, Size: 1275 bytes --]

From 386a69ee4ccafb317f97c9553010c5d0ce37a9a7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 14:28:06 +0300
Subject: [PATCH] New package: font-awesome6-6.1.1

---
 srcpkgs/font-awesome6/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/font-awesome6/template

diff --git a/srcpkgs/font-awesome6/template b/srcpkgs/font-awesome6/template
new file mode 100644
index 000000000000..dae11ac1fa32
--- /dev/null
+++ b/srcpkgs/font-awesome6/template
@@ -0,0 +1,21 @@
+# Template file for 'font-awesome6'
+pkgname=font-awesome6
+version=6.1.1
+revision=1
+wrksrc="fontawesome-free-${version}-desktop"
+#create_wrksrc=yes
+hostmakedepends="font-util"
+short_desc="Iconic SVG, font, and CSS toolkit - desktop fonts"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="OFL-1.1"
+homepage="https://fontawesome.com/"
+changelog="https://fontawesome.com/docs/changelog/"
+distfiles="https://github.com/FortAwesome/Font-Awesome/releases/download/${version}/fontawesome-free-${version}-desktop.zip"
+checksum=73366012c82155f4ba78e842d15f5e49597bb21320d85c63ea984d788791b267
+font_dirs="/usr/share/fonts/OTF"
+
+do_install() {
+        install -Dm644 otfs/*.otf -t ${DESTDIR}/usr/share/fonts/OTF
+}
+
+

Re: [PR PATCH] [Updated] New package: font-awesome6-6.1.1

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages font-awesome6
https://github.com/void-linux/void-packages/pull/37019

New package: font-awesome6-6.1.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

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


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37019.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-font-awesome6-37019.patch --]
[-- Type: text/x-diff, Size: 1262 bytes --]

From 0824fa63c5444ba790d937f76a83f5f529e7ae36 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 14:28:06 +0300
Subject: [PATCH] New package: font-awesome6-6.1.1

---
 srcpkgs/font-awesome6/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/font-awesome6/template

diff --git a/srcpkgs/font-awesome6/template b/srcpkgs/font-awesome6/template
new file mode 100644
index 000000000000..d6334deb16ff
--- /dev/null
+++ b/srcpkgs/font-awesome6/template
@@ -0,0 +1,19 @@
+# Template file for 'font-awesome6'
+pkgname=font-awesome6
+version=6.1.1
+revision=1
+wrksrc="fontawesome-free-${version}-desktop"
+#create_wrksrc=yes
+hostmakedepends="font-util"
+short_desc="Iconic SVG, font, and CSS toolkit - desktop fonts"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="OFL-1.1"
+homepage="https://fontawesome.com/"
+changelog="https://fontawesome.com/docs/changelog/"
+distfiles="https://github.com/FortAwesome/Font-Awesome/releases/download/${version}/fontawesome-free-${version}-desktop.zip"
+checksum=73366012c82155f4ba78e842d15f5e49597bb21320d85c63ea984d788791b267
+font_dirs="/usr/share/fonts/OTF"
+
+do_install() {
+	install -Dm644 otfs/*.otf -t ${DESTDIR}/usr/share/fonts/OTF
+}

Re: [PR PATCH] [Updated] New package: font-awesome6-6.1.1

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages font-awesome6
https://github.com/void-linux/void-packages/pull/37019

New package: font-awesome6-6.1.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

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


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37019.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-font-awesome6-37019.patch --]
[-- Type: text/x-diff, Size: 1241 bytes --]

From c39f6821c4b4c8283958438ccd1b311d822b1128 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 14:28:06 +0300
Subject: [PATCH] New package: font-awesome6-6.1.1

---
 srcpkgs/font-awesome6/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/font-awesome6/template

diff --git a/srcpkgs/font-awesome6/template b/srcpkgs/font-awesome6/template
new file mode 100644
index 000000000000..d004b2b31579
--- /dev/null
+++ b/srcpkgs/font-awesome6/template
@@ -0,0 +1,18 @@
+# Template file for 'font-awesome6'
+pkgname=font-awesome6
+version=6.1.1
+revision=1
+wrksrc="fontawesome-free-${version}-desktop"
+hostmakedepends="font-util"
+short_desc="Iconic SVG, font, and CSS toolkit - desktop fonts"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="OFL-1.1"
+homepage="https://fontawesome.com/"
+changelog="https://fontawesome.com/docs/changelog/"
+distfiles="https://github.com/FortAwesome/Font-Awesome/releases/download/${version}/fontawesome-free-${version}-desktop.zip"
+checksum=73366012c82155f4ba78e842d15f5e49597bb21320d85c63ea984d788791b267
+font_dirs="/usr/share/fonts/OTF"
+
+do_install() {
+	install -Dm644 otfs/*.otf -t ${DESTDIR}/usr/share/fonts/OTF
+}

Re: New package: font-awesome6-6.1.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37019#issuecomment-1120227378

Comment:
> 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.

Re: New package: font-awesome6-6.1.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37019#issuecomment-1126676878

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

Add this to the template -
```sh
conflicts="font-awesome>=0"
```
Refer to the template for `font-awesome5`

Re: New package: font-awesome6-6.1.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37019#issuecomment-1126676878

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

Add this to the template -
```sh
conflicts="font-awesome>=0"
```
Refer to the template for `font-awesome5`

<br/>
<br/>

Other than that, LGTM :+1: 

Re: New package: font-awesome6-6.1.1

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 530 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/37019#issuecomment-1126684815

Comment:
> 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 -
> 
> ```shell
> 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!

Re: New package: font-awesome6-6.1.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37019#issuecomment-1126692229

Comment:
> Isn't it supposed to conflict with the other `font-awesome` packages?

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

Re: New package: font-awesome6-6.1.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/37019#issuecomment-1126700063

Comment:
:shrug: 

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

Re: New package: font-awesome6-6.1.1

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/37019#issuecomment-1126714840

Comment:
> 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...

Re: New package: font-awesome6-6.1.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 605 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37019#issuecomment-1126730983

Comment:
it should be fine to remove the 4/5 conflict:
```diff
$ 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
```

Re: [PR PATCH] [Updated] New package: font-awesome6-6.1.1

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages font-awesome6
https://github.com/void-linux/void-packages/pull/37019

New package: font-awesome6-6.1.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

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


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37019.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-font-awesome6-37019.patch --]
[-- Type: text/x-diff, Size: 2370 bytes --]

From 2a93116c6cf4fd30960640f1959fb314b0a8917f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 14:28:06 +0300
Subject: [PATCH 1/2] New package: font-awesome6-6.1.1

---
 srcpkgs/font-awesome6/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/font-awesome6/template

diff --git a/srcpkgs/font-awesome6/template b/srcpkgs/font-awesome6/template
new file mode 100644
index 000000000000..d004b2b31579
--- /dev/null
+++ b/srcpkgs/font-awesome6/template
@@ -0,0 +1,18 @@
+# Template file for 'font-awesome6'
+pkgname=font-awesome6
+version=6.1.1
+revision=1
+wrksrc="fontawesome-free-${version}-desktop"
+hostmakedepends="font-util"
+short_desc="Iconic SVG, font, and CSS toolkit - desktop fonts"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="OFL-1.1"
+homepage="https://fontawesome.com/"
+changelog="https://fontawesome.com/docs/changelog/"
+distfiles="https://github.com/FortAwesome/Font-Awesome/releases/download/${version}/fontawesome-free-${version}-desktop.zip"
+checksum=73366012c82155f4ba78e842d15f5e49597bb21320d85c63ea984d788791b267
+font_dirs="/usr/share/fonts/OTF"
+
+do_install() {
+	install -Dm644 otfs/*.otf -t ${DESTDIR}/usr/share/fonts/OTF
+}

From 9005638b87ad606f6cadfe812456a706ce11c99d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 6 Jun 2022 21:51:25 +0300
Subject: [PATCH 2/2] font-awesome5: remove conflict with font-awesome.

- suggested by @classabbyamp
---
 srcpkgs/font-awesome5/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..638813c8450b 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,7 +1,7 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
 version=5.15.4
-revision=1
+revision=2
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
 short_desc="Iconic font (version 5)"
@@ -11,7 +11,6 @@ homepage="https://fontawesome.com"
 changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
 checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
-conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
 do_install() {

Re: New package: font-awesome6-6.1.1

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/37019#issuecomment-1147779062

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

Re: [PR PATCH] [Merged]: New package: font-awesome6-6.1.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1144 bytes --]

There's a merged pull request on the void-packages repository

New package: font-awesome6-6.1.1
https://github.com/void-linux/void-packages/pull/37019

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

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


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->