[PR PATCH] font-cozette: update to 1.23.2.

[PR PATCH] font-cozette: update to 1.23.2.

[moeishome]

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

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

https://github.com/moeishome/void-packages font-cozette
https://github.com/void-linux/void-packages/pull/49199

font-cozette: update to 1.23.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-glibc
  - armv6l-glibc
  
Note: new to this and accidentally closed previous PR when squashing commits. Sorry for that; this one I tested more thoroughly and fixed an upstream bug, so no revisions should be needed.


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

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

From 42163b148f851e376ee1ea4a09f6fbe943458014 Mon Sep 17 00:00:00 2001
From: moe <moemmakki@gmail.com>
Date: Fri, 8 Mar 2024 14:48:15 -0500
Subject: [PATCH] font-cozette: update to 1.23.2.

---
 srcpkgs/font-cozette/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index 2b53366b9ce77e..8747a3674f64f0 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -1,6 +1,6 @@
 # Template file for 'font-cozette'
 pkgname=font-cozette
-version=1.18.0
+version=1.23.2
 revision=1
 create_wrksrc=yes
 hostmakedepends="font-util bdftopcf"
@@ -10,16 +10,20 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/slavfox/Cozette"
 changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md"
-distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"
-checksum=710966cb1d310c1af2340bfe77e67741d92ac38d4060d284e0090495c1534b8b
+distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-1-23-2.zip"
+checksum=88428fabfb47bed97878e485d6dd22023bed8bd3ca0f4aea5bf11b8d4473b748
 font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
 
 do_install() {
 	cd CozetteFonts
 
 	bdftopcf -t -o cozette.pcf cozette.bdf
+	bdftopcf -t -o cozette_hidpi.pcf cozette_hidpi.bdf
 	vinstall cozette.pcf 644 usr/share/fonts/misc
 	vinstall cozette.otb 644 usr/share/fonts/misc
+	vinstall cozette_hidpi.pcf 644 usr/share/fonts/misc
+	vinstall cozette_hidpi.otb 644 usr/share/fonts/misc
 	vinstall CozetteVector.ttf 644 usr/share/fonts/TTF
+	vinstall CozetteVectorBold.ttf 644 usr/share/fonts/TTF
 	vlicense LICENSE
 }

Re: [PR REVIEW] font-cozette: update to 1.23.2.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49199#discussion_r1518402616

Comment:
```suggestion
distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${version//./-}.zip"
```

Re: [PR PATCH] [Updated] font-cozette: update to 1.23.2.

[moeishome]

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

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

https://github.com/moeishome/void-packages font-cozette
https://github.com/void-linux/void-packages/pull/49199

font-cozette: update to 1.23.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-glibc
  - armv6l-glibc
  
Note: new to this and accidentally closed previous PR when squashing commits. Sorry for that; this one I tested more thoroughly and fixed an upstream bug, so no revisions should be needed.


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

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

From 42163b148f851e376ee1ea4a09f6fbe943458014 Mon Sep 17 00:00:00 2001
From: moe <moemmakki@gmail.com>
Date: Fri, 8 Mar 2024 14:48:15 -0500
Subject: [PATCH 1/2] font-cozette: update to 1.23.2.

---
 srcpkgs/font-cozette/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index 2b53366b9ce77e..8747a3674f64f0 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -1,6 +1,6 @@
 # Template file for 'font-cozette'
 pkgname=font-cozette
-version=1.18.0
+version=1.23.2
 revision=1
 create_wrksrc=yes
 hostmakedepends="font-util bdftopcf"
@@ -10,16 +10,20 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/slavfox/Cozette"
 changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md"
-distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"
-checksum=710966cb1d310c1af2340bfe77e67741d92ac38d4060d284e0090495c1534b8b
+distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-1-23-2.zip"
+checksum=88428fabfb47bed97878e485d6dd22023bed8bd3ca0f4aea5bf11b8d4473b748
 font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
 
 do_install() {
 	cd CozetteFonts
 
 	bdftopcf -t -o cozette.pcf cozette.bdf
+	bdftopcf -t -o cozette_hidpi.pcf cozette_hidpi.bdf
 	vinstall cozette.pcf 644 usr/share/fonts/misc
 	vinstall cozette.otb 644 usr/share/fonts/misc
+	vinstall cozette_hidpi.pcf 644 usr/share/fonts/misc
+	vinstall cozette_hidpi.otb 644 usr/share/fonts/misc
 	vinstall CozetteVector.ttf 644 usr/share/fonts/TTF
+	vinstall CozetteVectorBold.ttf 644 usr/share/fonts/TTF
 	vlicense LICENSE
 }

From f7bcc11583cdf5093abc80c0769910d5a6a047b1 Mon Sep 17 00:00:00 2001
From: moe <128649563+moeishome@users.noreply.github.com>
Date: Sat, 9 Mar 2024 17:11:56 +0000
Subject: [PATCH 2/2] Apply suggestions from code review

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/font-cozette/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index 8747a3674f64f0..5deec12ee2fdf5 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/slavfox/Cozette"
 changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md"
-distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-1-23-2.zip"
+distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${version//./-}.zip"
 checksum=88428fabfb47bed97878e485d6dd22023bed8bd3ca0f4aea5bf11b8d4473b748
 font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
 

Re: font-cozette: update to 1.23.2.

[moeishome]

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

New comment by moeishome on void-packages repository

https://github.com/void-linux/void-packages/pull/49199#issuecomment-1987015730

Comment:
what could i do here to get it submitted? i dont want to mess up and push like last time. i tried git rebase --root -i to squash but that gave me lots of errors during the interactive rebase. thanks.

Re: font-cozette: update to 1.23.2.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49199#issuecomment-1987017694

Comment:
git rebase -i master, then change the last commit from pick to fixup

Re: font-cozette: update to 1.23.2.

[moeishome]

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

New comment by moeishome on void-packages repository

https://github.com/void-linux/void-packages/pull/49199#issuecomment-1987021474

Comment:
i've done this now and have one commit locally. should i force push now? trying to push normally requires me to pull which seems to pull the second commit. thanks.

Re: font-cozette: update to 1.23.2.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49199#issuecomment-1987022955

Comment:
git push -f

Re: [PR PATCH] [Updated] font-cozette: update to 1.23.2.

[moeishome]

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

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

https://github.com/moeishome/void-packages font-cozette
https://github.com/void-linux/void-packages/pull/49199

font-cozette: update to 1.23.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-glibc
  - armv6l-glibc
  
Note: new to this and accidentally closed previous PR when squashing commits. Sorry for that; this one I tested more thoroughly and fixed an upstream bug, so no revisions should be needed.


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

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

From f0f7f44f12b2065bdc8f03ae9fa7bfa10414ba6d Mon Sep 17 00:00:00 2001
From: moe <moemmakki@gmail.com>
Date: Fri, 8 Mar 2024 14:48:15 -0500
Subject: [PATCH] font-cozette: update to 1.23.2.

---
 srcpkgs/font-cozette/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index 2b53366b9ce77e..5deec12ee2fdf5 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -1,6 +1,6 @@
 # Template file for 'font-cozette'
 pkgname=font-cozette
-version=1.18.0
+version=1.23.2
 revision=1
 create_wrksrc=yes
 hostmakedepends="font-util bdftopcf"
@@ -10,16 +10,20 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/slavfox/Cozette"
 changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md"
-distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"
-checksum=710966cb1d310c1af2340bfe77e67741d92ac38d4060d284e0090495c1534b8b
+distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${version//./-}.zip"
+checksum=88428fabfb47bed97878e485d6dd22023bed8bd3ca0f4aea5bf11b8d4473b748
 font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
 
 do_install() {
 	cd CozetteFonts
 
 	bdftopcf -t -o cozette.pcf cozette.bdf
+	bdftopcf -t -o cozette_hidpi.pcf cozette_hidpi.bdf
 	vinstall cozette.pcf 644 usr/share/fonts/misc
 	vinstall cozette.otb 644 usr/share/fonts/misc
+	vinstall cozette_hidpi.pcf 644 usr/share/fonts/misc
+	vinstall cozette_hidpi.otb 644 usr/share/fonts/misc
 	vinstall CozetteVector.ttf 644 usr/share/fonts/TTF
+	vinstall CozetteVectorBold.ttf 644 usr/share/fonts/TTF
 	vlicense LICENSE
 }

Re: font-cozette: update to 1.23.2.

[moeishome]

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

New comment by moeishome on void-packages repository

https://github.com/void-linux/void-packages/pull/49199#issuecomment-1987024062

Comment:
done, and thanks. issue was trying to rebase the entire fucking repository last time, this worked much better and ill keep it in mind for next time. appreciate all the help!

Re: [PR PATCH] [Merged]: font-cozette: update to 1.23.2.

[classabbyamp]

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

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

font-cozette: update to 1.23.2.
https://github.com/void-linux/void-packages/pull/49199

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-glibc
  - armv6l-glibc
  
Note: new to this and accidentally closed previous PR when squashing commits. Sorry for that; this one I tested more thoroughly and fixed an upstream bug, so no revisions should be needed.

Re: font-cozette: update to 1.23.2.

[moeishome]

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

New comment by moeishome on void-packages repository

https://github.com/void-linux/void-packages/pull/49181#issuecomment-1986326133

Comment:
fuck. extremely sorry, new to this and pushed while trying to squash my commits, which seems to have closed the pr. ill try to figure out how to reconcile this if wanted. should i open again to have it approved properly (discouraged, i know, but i dont know if this pr would be deleted now)? please let me know; thank you. i do have the template file ready to pr again if wanted.

Re: font-cozette: update to 1.23.2.

[moeishome]

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

New comment by moeishome on void-packages repository

https://github.com/void-linux/void-packages/pull/49181#issuecomment-1986326133

Comment:
fuck. extremely sorry, new to this and pushed while trying to squash my commits, which seems to have closed the pr. ill try to figure out how to reconcile this if wanted. should i open again to have it approved properly (discouraged, i know, but i dont know if this pr would be deleted now)? please let me know; thank you. i do have the template file ready to pr again if wanted.

Re: font-cozette: update to 1.23.2.

[moeishome]

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

New comment by moeishome on void-packages repository

https://github.com/void-linux/void-packages/pull/49181#issuecomment-1986326133

Comment:
fuck. extremely sorry, new to this and pushed while trying to squash my commits, which seems to have closed the pr. ill try to figure out how to reconcile this if wanted. should i open again to have it approved properly (discouraged, i know, but i dont know if this pr would be deleted now)? please let me know; thank you. 

Re: font-cozette: update to 1.23.2.

[moeishome]

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

New comment by moeishome on void-packages repository

https://github.com/void-linux/void-packages/pull/49181#issuecomment-1986326133

Comment:
fuck. extremely sorry, new to this and pushed while trying to squash my commits. ill try to figure out how to reconcile this if wanted. should i open again to have it approved properly (discouraged, i know, but i dont know if this pr would be deleted now)? please let me know; thank you. 

Re: font-cozette: update to 1.23.2.

[moeishome]

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

New comment by moeishome on void-packages repository

https://github.com/void-linux/void-packages/pull/49181#issuecomment-1986326133

Comment:
fuck. extremely sorry, new to this and pushed while trying to squash my commits. ill try to figure out how to reconcile this if wanted, so sorry.

Re: font-cozette: update to 1.23.2.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49181#issuecomment-1985086031

Comment:
please squash this into one commit and reset the revision to 1

Re: font-cozette: update to 1.23.2.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49181#issuecomment-1985086031

Comment:
please squash this into one commit