scfbuild: 1.0.3 -> 2.0.0

This commit is contained in:
Francesco Gazzetta 2020-09-16 11:23:38 +02:00
parent 33f73db2e5
commit 14a1a01c4e
2 changed files with 3 additions and 55 deletions

View file

@ -2,23 +2,17 @@
buildPythonApplication {
pname = "scfbuild";
version = "1.0.3";
version = "2.0.0";
format = "other";
src = fetchFromGitHub {
owner = "13rac1";
repo = "scfbuild";
rev = "9acc7fc5fedbf48683d8932dd5bd7583bf922bae";
sha256 = "1zlqsxkpg7zvmhdjgbqwwc9qgac2b8amzq8c5kwyh5cv95zcp6qn";
rev = "6d84339512a892972185d894704efa67dd82e87a";
sha256 = "0wkyzkhshlax9rvdmn441gv87n9abfr0qqmgs8bkg9kbcjb4bhad";
};
patches = [
# Convert to Python 3
# https://github.com/13rac1/scfbuild/pull/19
./python-3.patch
];
propagatedBuildInputs = [ pyyaml fonttools fontforge ];
installPhase = ''

View file

@ -1,46 +0,0 @@
--- a/bin/scfbuild
+++ b/bin/scfbuild
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
from __future__ import (absolute_import, division, print_function,
--- a/scfbuild/builder.py
+++ b/scfbuild/builder.py
@@ -287,8 +287,8 @@ def _add_name_record(self, text, name_id, platform_id, plat_enc_id, lang_id):
# TODO: The installed version of fontTools doesn't have
# table__n_a_m_e.setName().
record = NameRecord()
- # PyYAML creates strings, force to Unicode
- record.string = unicode(text)
+ # PyYAML creates strings, which are unicode as of Python3
+ record.string = text
record.nameID = name_id
record.platformID = platform_id
record.platEncID = plat_enc_id
--- a/scfbuild/fforge.py
+++ b/scfbuild/fforge.py
@@ -84,7 +84,7 @@ def add_glyphs(font, svg_filepaths, conf):
u_ids = [int(u_id, 16) for u_id in filename.split("-")]
# Example: (0x1f441, 0x1f5e8)
- u_str = ''.join(map(unichr, u_ids))
+ u_str = ''.join(map(chr, u_ids))
# Example: "U\0001f441U\0001f5e8"
# Replace sequences with correct ZWJ/VS16 versions as needed
--- a/scfbuild/main.py
+++ b/scfbuild/main.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# SCFBuild is released under the GNU General Public License v3.
index 0000000..99418b5
--- /dev/null
+++ b/scfbuild/requirements.txt
@@ -0,0 +1,2 @@
+fonttools>=3.41.2
+PyYAML>=5.1