From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwSMr-0001Or-4J for guix-patches@gnu.org; Mon, 25 Sep 2017 08:20:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwSMk-00025C-JM for guix-patches@gnu.org; Mon, 25 Sep 2017 08:20:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:48737) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dwSMk-000250-CB for guix-patches@gnu.org; Mon, 25 Sep 2017 08:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dwSMk-0001su-3S for guix-patches@gnu.org; Mon, 25 Sep 2017 08:20:02 -0400 Subject: [bug#28594] nototools (required for building Noto from source) Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwSLs-0001KC-4y for guix-patches@gnu.org; Mon, 25 Sep 2017 08:19:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwSLo-0001Ut-Rd for guix-patches@gnu.org; Mon, 25 Sep 2017 08:19:08 -0400 Received: from aibo.runbox.com ([91.220.196.211]:54408) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dwSLo-0001UM-D0 for guix-patches@gnu.org; Mon, 25 Sep 2017 08:19:04 -0400 Received: from [10.9.9.212] (helo=mailfront12.runbox.com) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1dwSLm-0004BF-R4 for guix-patches@gnu.org; Mon, 25 Sep 2017 14:19:02 +0200 Received: from 62-210-37-82.rev.poneytelecom.eu ([62.210.37.82] helo=localhost) by mailfront12.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1dwSLd-0004fo-OP for guix-patches@gnu.org; Mon, 25 Sep 2017 14:18:54 +0200 Date: Mon, 25 Sep 2017 12:18:41 +0000 From: ng0 Message-ID: <20170925121841.hcaukrjxftvbyvnk@abyayala> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="kgwjv74nvj4vh7br" Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28594@debbugs.gnu.org --kgwjv74nvj4vh7br Content-Type: multipart/mixed; boundary="t7zv2ljrqiuy37ik" Content-Disposition: inline --t7zv2ljrqiuy37ik Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable This patch series adds the python2 application set "nototools". It is a requirement for resolving #28404 (Google Noto Fonts). --=20 ng0 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://krosos.org/dist/keys/ https://www.infotropique.org https://krosos.org --t7zv2ljrqiuy37ik Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-python-fonttools-Update-to-3.15.1.patch" Content-Transfer-Encoding: quoted-printable =46rom f47baab3fecf69913409693254460a49cc8c4b24 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Wed, 20 Sep 2017 11:31:51 +0000 Subject: [PATCH 1/7] gnu: python-fonttools: Update to 3.15.1. * gnu/packages/python.scm (python-fonttools): Update to 3.15.1. (source)[uri]: Use 'pypi-uri'. --- gnu/packages/python.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3e266c5ef..fb149d91c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -23,7 +23,7 @@ ;;; Copyright =C2=A9 2016 Daniel Pimentel ;;; Copyright =C2=A9 2016 Sou Bunnbu ;;; Copyright =C2=A9 2016 Troy Sankey -;;; Copyright =C2=A9 2016, 2017 ng0 +;;; Copyright =C2=A9 2016, 2017 ng0 ;;; Copyright =C2=A9 2016 Dylan Jeffers ;;; Copyright =C2=A9 2016 David Craven ;;; Copyright =C2=A9 2016, 2017 Marius Bakke @@ -7360,15 +7360,13 @@ add functionality and customization to your project= s with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "2.5") + (version "3.15.1") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/F/FontTools/" - "fonttools-" version ".tar.gz")) + (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "08ay3x4ijarwhl60gqx2i9jzq6pxs20p4snc2d1q5jagh4rn39lb")))) + "1hhj97izwliy0vybmza72d90l5d4mcn50y8akq7kyccfl82vdx4d")))) (build-system python-build-system) (arguments '(#:test-target "check" @@ -7382,6 +7380,8 @@ add functionality and customization to your projects = with their own plugins.") (substitute* "setup.py" (("^[ \t]*extra_path *=3D *'FontTools',") "")) #t))))) + (native-inputs + `(("unzip" ,unzip))) (home-page "https://github.com/behdad/fonttools") (synopsis "Tools to manipulate font files") (description --=20 2.14.1 --t7zv2ljrqiuy37ik Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0002-gnu-Add-python2-ufolib.patch" Content-Transfer-Encoding: quoted-printable =46rom d73dfb5b471adaa7752f4ce2140e879f629d303c Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Wed, 20 Sep 2017 11:39:29 +0000 Subject: [PATCH 2/7] gnu: Add python2-ufolib. * gnu/packages/python.scm (python2-ufolib): New variable. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fb149d91c..3a9a39a7d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7397,6 +7397,32 @@ from an XML-based format.") (define-public python2-fonttools (package-with-python2 python-fonttools)) =20 +(define-public python2-ufolib + (package + (name "python2-ufolib") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ufoLib" version ".zip")) + (sha256 + (base32 "1njin1465qqzshnrvcl5sbv0bsy15gj6fycbw4lmcnwkx5sldgyx")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (propagated-inputs + `(("python2-fonttools" ,python2-fonttools))) + (native-inputs + `(("unzip" ,unzip) + ("python2-pytest-3.0" ,python2-pytest-3.0) + ("python2-pytest-runner" ,python2-pytest-runner))) + (home-page "https://github.com/unified-font-object/ufoLib") + (synopsis "Low-level UFO reader and writer.") + (description + "ufoLib reads and writes Unified Font Object (UFO) +files. UFO is a file format that stores fonts source files.") + (license license:bsd-3))) + (define-public python-ly (package (name "python-ly") --=20 2.14.1 --t7zv2ljrqiuy37ik Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0003-gnu-Add-python2-setuptools-scm-git-archive.patch" Content-Transfer-Encoding: quoted-printable =46rom e34aa6f3d4ca6f0e989b1d8fbaf7985cd2891099 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Wed, 20 Sep 2017 11:49:31 +0000 Subject: [PATCH 3/7] gnu: Add python2-setuptools-scm-git-archive. * gnu/packages/python.scm (python2-setuptools-scm-git-archive): New variabl= e. --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3a9a39a7d..ae11c3b3b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7423,6 +7423,28 @@ from an XML-based format.") files. UFO is a file format that stores fonts source files.") (license license:bsd-3))) =20 +(define-public python2-setuptools-scm-git-archive + (package + (name "python2-setuptools-scm-git-archive") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "setuptools_scm_git_archive" version)) + (sha256 + (base32 + "1nii1sz5jq75ilf18bjnr11l9rz1lvdmyk66bxl7q90qan85yhjj")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (propagated-inputs + `(("python2-setuptools-scm" ,python2-setuptools-scm))) + (home-page "https://github.com/Changaco/setuptools_scm_git_archive/") + (synopsis "setuptools_scm plugin for git archives") + (description + "setuptools_scm plugin for git archives") + (license license:expat))) + (define-public python-ly (package (name "python-ly") --=20 2.14.1 --t7zv2ljrqiuy37ik Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0004-gnu-Add-python2-pyclipper.patch" Content-Transfer-Encoding: quoted-printable =46rom 560acb742a36d97f20d78a5ac5d388a44c3b2ed2 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Wed, 20 Sep 2017 12:00:41 +0000 Subject: [PATCH 4/7] gnu: Add python2-pyclipper. * gnu/packages/python.scm (python2-pyclipper): New variable. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ae11c3b3b..2a13a6466 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7445,6 +7445,32 @@ files. UFO is a file format that stores fonts sourc= e files.") "setuptools_scm plugin for git archives") (license license:expat))) =20 +(define-public python2-pyclipper +(package + (name "python2-pyclipper") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyclipper" version ".zip")) + (sha256 + (base32 + "1zpmwv3bya3j984y5cf9x9d5108kf6mxldcba68wiq0frv5qrssw")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:tests? #f)); 8 Tests fail, 37 succeed + (propagated-inputs + `(("python2-setuptools-scm-git-archive" ,python2-setuptools-scm-git-arc= hive))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://github.com/greginvm/pyclipper") + (synopsis "Wrapper for Angus Johnson's Clipper library") + (description + "Pyclipper is a Cython wrapper for the C++ translation of the +Angus Johnson's Clipper library (ver. 6.2.1)") + (license license:expat))) + (define-public python-ly (package (name "python-ly") --=20 2.14.1 --t7zv2ljrqiuy37ik Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0005-gnu-Add-python2-booleanoperations.patch" Content-Transfer-Encoding: quoted-printable =46rom 05901d74378199516472562eaa175a4025bd438b Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Wed, 20 Sep 2017 18:07:47 +0000 Subject: [PATCH 5/7] gnu: Add python2-booleanoperations. * gnu/packages/python.scm (python2-booleanoperations): New variable. --- gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2a13a6466..4bdd05a78 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7471,6 +7471,35 @@ files. UFO is a file format that stores fonts sourc= e files.") Angus Johnson's Clipper library (ver. 6.2.1)") (license license:expat))) =20 +(define-public python2-booleanoperations + (package + (name "python2-booleanoperations") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "booleanOperations" version ".zip")) + (sha256 + (base32 + "1hw42fazdpvsn77glx96hwsj9l17mvx37sc5707s08y5w6fx16mn")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (native-inputs + `(("unzip" ,unzip) + ("python2-pytest-3.0" ,python2-pytest-3.0) + ("python2-pytest-runner" ,python2-pytest-runner))) + (propagated-inputs + `(("python-fonttools" ,python2-fonttools) + ("python-pyclipper" ,python2-pyclipper) + ("python-ufolib" ,python2-ufolib))) + (home-page "https://github.com/typemytype/booleanOperations") + (synopsis "Boolean operations on paths") + (description + "BooleanOperations provides a python library that enables +boolean operations on paths.") + (license license:expat))) + (define-public python-ly (package (name "python-ly") --=20 2.14.1 --t7zv2ljrqiuy37ik Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0006-gnu-Add-python2-defcon.patch" Content-Transfer-Encoding: quoted-printable =46rom a72beedccffc8c6baef91bf2548dfec4ff286d87 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Mon, 25 Sep 2017 11:13:03 +0000 Subject: [PATCH 6/7] gnu: Add python2-defcon. * gnu/packages/python.scm (python2-defcon): New variable. --- gnu/packages/python.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4bdd05a78..75bf2ab13 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7500,6 +7500,39 @@ Angus Johnson's Clipper library (ver. 6.2.1)") boolean operations on paths.") (license license:expat))) =20 +(define-public python2-defcon + (package + (name "python2-defcon") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "defcon" version ".zip")) + (sha256 + (base32 + "1f41w54fdjy9izxcwzqa142kd56whqsg9nq5k4508jb6iip84h89")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (native-inputs + `(("unzip" ,unzip) + ("python2-pytest-3.0" ,python2-pytest-3.0) + ("python2-pytest-runner" ,python2-pytest-runner))) + (propagated-inputs + `(("python2-fonttools" ,python2-fonttools) + ("python2-ufolib" ,python2-ufolib))) + (home-page "https://pypi.python.org/pypi/defcon") + (synopsis "set of flexible objects for representing UFO data") + (description + "Defcon is a set of UFO based objects optimized for use in +font editing applications. The objects are built to be lightweight, +fast and flexible. The objects are very bare-bones and they are not +meant to be end-all, be-all objects. Rather, they are meant to provide +base functionality so that you can focus on your application=E2=80=99s beh= avior, +not object observing or maintaining cached data. Defcon implements +UFO3 as described by the UFO font format.") + (license license:expat))) + (define-public python-ly (package (name "python-ly") --=20 2.14.1 --t7zv2ljrqiuy37ik Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0007-gnu-Add-nototools.patch" Content-Transfer-Encoding: quoted-printable =46rom 53930f87fa54a13fde52246ad30d74e409b4020e Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Mon, 25 Sep 2017 12:12:55 +0000 Subject: [PATCH 7/7] gnu: Add nototools. * gnu/packages/fontutils.scm (nototools): New variable. --- gnu/packages/fontutils.scm | 47 ++++++++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 102def93d..3aec84414 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -5,6 +5,7 @@ ;;; Copyright =C2=A9 2016, 2017 Efraim Flashner ;;; Copyright =C2=A9 2017 Rene Saavedra ;;; Copyright =C2=A9 2017 Leo Famulari +;;; Copyright =C2=A9 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,7 +45,8 @@ #:use-module (guix svn-download) #:use-module (guix git-download) #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python)) =20 (define-public freetype (package @@ -565,3 +567,46 @@ opentype fonts. You can save fonts in many different = outline formats, and generate bitmaps.") (license license:gpl3+) (home-page "https://fontforge.github.io/en-US/"))) + +(define-public nototools + (let ((commit "fecf378cf98af95bf603707b99861ce698e4c384") + (revision "1")) + (package + (name "nototools") + (version (string-append "0.0.1-" revision "." + (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/googlei18n/nototools.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0b2yx4kwniccc8v221rwrzavy1gchm7q658f46cp0wdx44bsr4xj")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (propagated-inputs + `(("python2-booleanoperations" ,python2-booleanoperations) + ("python2-defcon" ,python2-defcon) + ("python2-fonttools" ,python2-fonttools) + ("python2-pillow" ,python2-pillow) + ("python2-pyclipper" ,python2-pyclipper) + ("python2-ufolib" ,python2-ufolib))) + (home-page "https://github.com/googlei18n/nototools") + (synopsis "Noto fonts support tools and scripts") + (description + "Nototools is a python package containing python scripts used to +maintain the Noto Fonts project.") + (license (list license:asl2.0 + ;; Sample texts are attributed to UN and OHCHR. + ;; The permissions on the UDHR are pretty lax: + ;; http://www.ohchr.org/EN/UDHR/Pages/Introduction.as= px + ;; "If UDHR translations or materials are reproduced,= users + ;; should make reference to this website as a source = by + ;; providing a link." + license:public-domain + license:non-copyleft "file://sample_texts/attribution= s.txt" + "See sample_texts/attributions.txt in the distributio= n."))))) --=20 2.14.1 --t7zv2ljrqiuy37ik-- --kgwjv74nvj4vh7br Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlnI9CAACgkQ4i+bv+40 hYib2xAAltwA63n3BkD2m1cmtqYuTXJ71utFxtAGch/Vrmkv5ZYgsYZ5mWuDqEZO +vI+sL27USaLwDecO8mWcn+FB5/W2+VwsLBIR6vbiUq8AsBfB5AS0U9mVOReoQS6 T8sTtLbvKVO7z/fX5fXBx9qgoDI0BJGZTh61vZA+PmQPKF+sQFbiCZHY9Sf+/62F rJ2CUnTkpm7B4osaKfa2m10mTZXKMYou/zd5Vx8qRfxbiQBYHaMe5VbjurvtgSaX 1067ZqYUAnvsZSYv8JbYUwJbVjYoPmts9VjXhuFdkhkVZmkAbxDkR0p92Jh/48Oh qksN63aYwQlUmpLhvODyDmmGhxio5K7S4xFaf761sInmfnK698mvvCt8rAukXdy8 jFS+WZVWbrqBxGqMshPyIbrSBMe7bJwibynTyjLbv9+6LY5tf2qX3dZCXDvsy/EG 2oU2f4eUUWJFU93yLIRA41wbRCoTULaiSAVEB4ajI95TX6k3fbSfqu53CsxrHZ8o 5g1Q/ysR99/Kd+iwmXmjFEAmsoIErggNNrHNa33GBihUHbELk1PLXY+DXEbRlNk/ STe8r+UZ0TEgG2oIUBRmmK9pF0TNl/fuQbBRoawKxZgMMMNFKtFz7wsYkdB1pW+P AGahxFrFVFq/nyPFruXDgT5XbERmZvAZPrenxu3usTB0v5/eOj8= =Rl09 -----END PGP SIGNATURE----- --kgwjv74nvj4vh7br--