Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] font-cozette: update to 1.13.0, build natively, provide python3-crayons for makedepends
@ 2022-04-03 14:49 Idesmi
  2022-04-03 15:08 ` [PR PATCH] [Updated] " Idesmi
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: Idesmi @ 2022-04-03 14:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Idesmi/void-packages master
https://github.com/void-linux/void-packages/pull/36503

font-cozette: update to 1.13.0, build natively, provide python3-crayons for makedepends
#### 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**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


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

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

From eea4f73a054bc1273e9be314c42c17be930e45b2 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 3 Apr 2022 15:46:15 +0200
Subject: [PATCH 1/5] New package: python3-crayons-0.4.0

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

diff --git a/srcpkgs/python3-crayons/template b/srcpkgs/python3-crayons/template
new file mode 100644
index 000000000000..8cb2397be9b1
--- /dev/null
+++ b/srcpkgs/python3-crayons/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-crayons'
+pkgname=python3-crayons
+version=0.4.0
+revision=1
+wrksrc=crayons-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-colorama"
+short_desc="Text UI colors for Python"
+maintainer="Enrico Belleri <idesmi@protonmail.com>"
+license="MIT"
+homepage="https://github.com/MasterOdin/crayons"
+distfiles="https://github.com/MasterOdin/crayons/archive/v${version}.tar.gz"
+checksum=b4a95433721246b157e057eb6c3119a57746707a9c826ad4692de1d1a2b70f37
+
+do_check() {
+  python3 test_crayons.py
+}

From e113b366a6a808d63a3fbe9f75399044e3e405d7 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 3 Apr 2022 16:14:08 +0200
Subject: [PATCH 2/5] font-cozette: update to 1.13.0, build with fontforge

---
 .../patches/no-git-changelog.patch            | 41 +++++++++++++++++++
 srcpkgs/font-cozette/template                 | 30 ++++++++------
 2 files changed, 58 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/font-cozette/patches/no-git-changelog.patch

diff --git a/srcpkgs/font-cozette/patches/no-git-changelog.patch b/srcpkgs/font-cozette/patches/no-git-changelog.patch
new file mode 100644
index 000000000000..d849bc7b5e32
--- /dev/null
+++ b/srcpkgs/font-cozette/patches/no-git-changelog.patch
@@ -0,0 +1,41 @@
+---
+ Pipfile  |    9 ---------
+ build.py |    1 -
+ 2 files changed, 10 deletions(-)
+
+Index: Cozette-1.13.0/Pipfile
+===================================================================
+--- Cozette-1.13.0.orig/Pipfile
++++ Cozette-1.13.0/Pipfile
+@@ -1,8 +1,3 @@
+-[[source]]
+-name = "pypi"
+-url = "https://pypi.org/simple"
+-verify_ssl = true
+-
+ [dev-packages]
+ black = "*"
+ mypy = "*"
+@@ -13,10 +8,6 @@ numpy = "*"
+ Pillow = ">=8.3.2"
+ fonttools = "*"
+ crayons = "*"
+-gitpython = "*"
+ 
+ [requires]
+ python_version = "3.8"
+-
+-[pipenv]
+-allow_prereleases = true
+Index: Cozette-1.13.0/build.py
+===================================================================
+--- Cozette-1.13.0.orig/build.py
++++ Cozette-1.13.0/build.py
+@@ -22,7 +22,6 @@ from cozette_builder.scanner import (
+     print_codepoints_for_changelog,
+     find_missing_codepoints,
+ )
+-from cozette_builder.changeloggen import get_changelog
+ 
+ REPO_ROOT = Path(__file__).resolve().parent
+ BUILD_DIR = REPO_ROOT / "build"
diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index 7a2e57669380..be55edaa2e15 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -1,24 +1,28 @@
 # Template file for 'font-cozette'
 pkgname=font-cozette
-version=1.11.3
-revision=2
-create_wrksrc=yes
-hostmakedepends="font-util bdftopcf"
+version=1.13.0
+revision=1
+wrksrc=Cozette-v.${version}
+hostmakedepends="font-util bdftopcf fontforge python3"
+makedepends="python3-Pillow>=8.3.2 python3-crayons python3-fonttools python3-numpy"
 depends="font-util"
 short_desc="Bitmap programming font optimized for coziness"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/slavfox/Cozette"
-distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"
-checksum=0976f61ba68b3a261568819bce0b89d43ae2892ad51e5da399dab8a5894cbbc8
+distfiles="https://github.com/slavfox/Cozette/archive/v.${version}.tar.gz"
+checksum=d6c850596dc79d2bd9461a2b07c53284b75378e317d7b5789efb608e300020b0
+changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md"
 font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
 
-do_install() {
-	cd CozetteFonts
+do_build() {
+  python3 build.py fonts
+}
 
-	bdftopcf -t -o cozette.pcf cozette.bdf
-	vinstall cozette.pcf 644 usr/share/fonts/misc
-	vinstall cozette.otb 644 usr/share/fonts/misc
-	vinstall CozetteVector.ttf 644 usr/share/fonts/TTF
-	vlicense LICENSE
+do_install() {
+  bdftopcf -t -o build/cozette.pcf build/cozette.bdf
+  vinstall build/cozette.pcf 644 usr/share/fonts/misc
+  vinstall build/cozette.otb 644 usr/share/fonts/misc
+  vinstall build/CozetteVector.ttf 644 usr/share/fonts/TTF
+  vlicense LICENSE
 }

From c11d6e7ee0896669c9245bb8b23bab49eef31f60 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 3 Apr 2022 16:26:51 +0200
Subject: [PATCH 3/5] python3-crayons: add checkdepends

---
 srcpkgs/python3-crayons/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-crayons/template b/srcpkgs/python3-crayons/template
index 8cb2397be9b1..a03adb64e447 100644
--- a/srcpkgs/python3-crayons/template
+++ b/srcpkgs/python3-crayons/template
@@ -6,6 +6,7 @@ wrksrc=crayons-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-colorama"
+checkdepends="python3 python3-colorama"
 short_desc="Text UI colors for Python"
 maintainer="Enrico Belleri <idesmi@protonmail.com>"
 license="MIT"

From 31845508f76c90302197aea0f1bc660d23e3cd83 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 3 Apr 2022 16:34:20 +0200
Subject: [PATCH 4/5] font-cozette: resolve xlint

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

diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index be55edaa2e15..23b1cfa4f1d7 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -10,19 +10,19 @@ short_desc="Bitmap programming font optimized for coziness"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/slavfox/Cozette"
+changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md"
 distfiles="https://github.com/slavfox/Cozette/archive/v.${version}.tar.gz"
 checksum=d6c850596dc79d2bd9461a2b07c53284b75378e317d7b5789efb608e300020b0
-changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md"
 font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
 
 do_build() {
-  python3 build.py fonts
+	python3 build.py fonts
 }
 
 do_install() {
-  bdftopcf -t -o build/cozette.pcf build/cozette.bdf
-  vinstall build/cozette.pcf 644 usr/share/fonts/misc
-  vinstall build/cozette.otb 644 usr/share/fonts/misc
-  vinstall build/CozetteVector.ttf 644 usr/share/fonts/TTF
-  vlicense LICENSE
+	bdftopcf -t -o build/cozette.pcf build/cozette.bdf
+	vinstall build/cozette.pcf 644 usr/share/fonts/misc
+	vinstall build/cozette.otb 644 usr/share/fonts/misc
+	vinstall build/CozetteVector.ttf 644 usr/share/fonts/TTF
+	vlicense LICENSE
 }

From 7bbf72867cbc035a7c53b73c34dd1963f5ba3533 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 3 Apr 2022 16:40:40 +0200
Subject: [PATCH 5/5] python3-crayons: resolve xlint

---
 srcpkgs/python3-crayons/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-crayons/template b/srcpkgs/python3-crayons/template
index a03adb64e447..5f9d1d391750 100644
--- a/srcpkgs/python3-crayons/template
+++ b/srcpkgs/python3-crayons/template
@@ -15,5 +15,9 @@ distfiles="https://github.com/MasterOdin/crayons/archive/v${version}.tar.gz"
 checksum=b4a95433721246b157e057eb6c3119a57746707a9c826ad4692de1d1a2b70f37
 
 do_check() {
-  python3 test_crayons.py
+	python3 test_crayons.py
+}
+
+post_install() {
+	vlicense LICENSE
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2022-04-13 20:33 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-03 14:49 [PR PATCH] font-cozette: update to 1.13.0, build natively, provide python3-crayons for makedepends Idesmi
2022-04-03 15:08 ` [PR PATCH] [Updated] " Idesmi
2022-04-03 15:10 ` Idesmi
2022-04-06 21:23 ` Idesmi
2022-04-06 21:38 ` Chocimier
2022-04-07  8:22 ` Idesmi
2022-04-13 19:51 ` Chocimier
2022-04-13 20:25 ` [PR PATCH] [Updated] " Idesmi
2022-04-13 20:29 ` Idesmi
2022-04-13 20:33 ` [PR PATCH] [Merged]: " Chocimier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).