From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guy Grant Subject: Re: Fwd: [PATCH] Add font-terminus. Date: Tue, 12 Aug 2014 20:37:23 -0500 Message-ID: References: <20140810100446.GA5146@debian> <87lhqvr9rc.fsf@yeeloong.lan> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=90e6ba6e89b8841f83050078d441 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHNVI-000159-5y for guix-devel@gnu.org; Tue, 12 Aug 2014 21:37:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHNVG-0000VF-JZ for guix-devel@gnu.org; Tue, 12 Aug 2014 21:37:28 -0400 Received: from mail-ig0-x235.google.com ([2607:f8b0:4001:c05::235]:58320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHNVG-0000Ul-Aw for guix-devel@gnu.org; Tue, 12 Aug 2014 21:37:26 -0400 Received: by mail-ig0-f181.google.com with SMTP id h3so270461igd.14 for ; Tue, 12 Aug 2014 18:37:25 -0700 (PDT) In-Reply-To: <87lhqvr9rc.fsf@yeeloong.lan> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Mark H Weaver Cc: guix-devel@gnu.org --90e6ba6e89b8841f83050078d441 Content-Type: multipart/alternative; boundary=90e6ba6e89b8841f7d050078d43f --90e6ba6e89b8841f7d050078d43f Content-Type: text/plain; charset=UTF-8 Okay, I think I got it all up to snuff. xorg.scm has a number of fonts which should be native-inputs too, but aren't. I'll handle them if they don't get resolved by the end of the month. Patch attatched. On Sun, Aug 10, 2014 at 10:21 PM, Mark H Weaver wrote: > Guy Grant writes: > > > Okay, patch updated as recomended; Patch attatched. Again, if > > something looks wrong -- feel free to comment. Thanks! > > > > > > From 3244099f65c1c6bd99d6b0921213c0749e04be47 Mon Sep 17 00:00:00 2001 > > From: Guy Grant > > Date: Sun, 10 Aug 2014 08:58:08 -0500 > > Subject: [PATCH 1/1] add terminus-font > > > > --- > > This needs a proper commit message. Look in the git logs for examples. > > > + (inputs > > + `(("bdftopcf" ,bdftopcf) > > + ("font-util", font-util) > > + ("mkfontdir" ,mkfontdir) > > + ("perl" ,perl))) > > + (native-inputs > > + `(("pkg-config" ,pkg-config))) > > I suspect that all of those inputs should instead be native-inputs. If > the code in those packages is executed at build time, then they should > be native-inputs. If the code is executed at run-time, they should be > normal inputs. The distinction is important when cross compiling. > > > + (arguments > > + `(#:configure-flags (list > > + ;; install fonts into subdirectory of package output instead of > > + ;; font-util-?.?.?/share/fonts/X11 > > + (string-append "--with-fontrootdir=" %output > "/share/fonts/X11")) > > + #:tests? #f)) ;; No test target in tarball > > Please fix the indentation here. > > > + (home-page "http://terminus-font.sourceforge.net/") > > + (synopsis "Simple bitmap programming font") > > + (description "Terminus Font is a clean, fixed width bitmap font, > designed for long > > + (8 and more hours per day) work with computers.") > > + (license > > + (license:x11-style > > + "http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web")))) > > Otherwise looks good to me. > > Thanks! > Mark > --90e6ba6e89b8841f7d050078d43f Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Okay, I think I got it all up to snuff.
=
xorg.scm has a number of fonts which should be native-inputs too, but= aren't. I'll handle them if they don't get resolved by the end= of the month.

Patch attatched.

On Sun, Aug 10, 2014 at 10:21 PM, Mark H Weave= r <mhw@netris.org> wrote:
Guy Grant <tadnimi@gmail.com> writes:

> Okay, patch updated as recomended; Patch attatched. Again, if
> something looks wrong -- feel free to comment. Thanks!
>
>
> From 3244099f65c1c6bd99d6b0921213c0749e04be47 Mon Sep 17 00:00:0= 0 2001
> From: Guy Grant <tadnimi@gmail= .com>
> Date: Sun, 10 Aug 2014 08:58:08 -0500
> Subject: [PATCH 1/1] add terminus-font
>
> ---

This needs a proper commit message. =C2=A0Look in the git logs for examples= .

> + =C2=A0 =C2=A0(inputs
> + =C2=A0 =C2=A0 =C2=A0`(("bdftopcf" ,bdftopcf)
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0("font-util", font-util)
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0("mkfontdir" ,mkfontdir)
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0("perl" ,perl)))
> + =C2=A0 =C2=A0(native-inputs
> + =C2=A0 =C2=A0 =C2=A0`(("pkg-config" ,pkg-config)))

I suspect that all of those inputs should instead be native-inputs. =C2=A0I= f
the code in those packages is executed at build time, then they should
be native-inputs. =C2=A0If the code is executed at run-time, they should be=
normal inputs. =C2=A0The distinction is important when cross compiling.

> + =C2=A0 =C2=A0(arguments
> + =C2=A0 =C2=A0 =C2=A0`(#:configure-flags (list
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0;; install fonts into subdirectory of pac= kage output instead of
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0;; font-util-?.?.?/share/fonts/X11
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0(string-append "--with-fontrootdir= =3D" %output "/share/fonts/X11"))
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 #:tests? #f)) ;; No test target in tarba= ll

Please fix the indentation here.

> + =C2=A0 =C2=A0(home-page "http://terminus-font.sourceforge.net/&quo= t;)
> + =C2=A0 =C2=A0(synopsis "Simple bitmap programming font") > + =C2=A0 =C2=A0(description "Terminus Font is a clean, fixed widt= h bitmap font, designed for long
> + (8 and more hours per day) work with computers.")
> + =C2=A0 =C2=A0(license
> + =C2=A0 =C2=A0 (license:x11-style
> + =C2=A0 =C2=A0 =C2=A0"http://scripts.sil.org/cm= s/scripts/page.php?item_id=3DOFL_web"))))

Otherwise looks good to me.

=C2=A0 =C2=A0 Thanks!
=C2=A0 =C2=A0 =C2=A0 Mark

--90e6ba6e89b8841f7d050078d43f-- --90e6ba6e89b8841f83050078d441 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-Add-terminus-font.patch" Content-Disposition: attachment; filename="0001-gnu-Add-terminus-font.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hyrzmvrr0 RnJvbSAxNDM5MDc4ZTU2MjM2OWFlNGY0NWVkZGNhNDFkYjVlNzlmMDc2MjgwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXkgR3JhbnQgPHRhZG5pbWlAZ21haWwuY29tPgpEYXRlOiBU dWUsIDEyIEF1ZyAyMDE0IDIwOjMzOjU4IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gZ251OiBBZGQg dGVybWludXMtZm9udAoKLS0tCiBnbnUvcGFja2FnZXMvZm9udHMuc2NtIHwgNDQgKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCA0MyBp bnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2Zv bnRzLnNjbSBiL2dudS9wYWNrYWdlcy9mb250cy5zY20KaW5kZXggOGVjNTllNC4uNDNmOTZmYiAx MDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2ZvbnRzLnNjbQorKysgYi9nbnUvcGFja2FnZXMvZm9u dHMuc2NtCkBAIC0xLDYgKzEsNyBAQAogOzs7IEdOVSBHdWl4IC0tLSBGdW5jdGlvbmFsIHBhY2th Z2UgbWFuYWdlbWVudCBmb3IgR05VCiA7OzsgQ29weXJpZ2h0IMKpIDIwMTMgTHVkb3ZpYyBDb3Vy dMOocyA8bHVkb0BnbnUub3JnPgogOzs7IENvcHlyaWdodCDCqSAyMDE0IE1hcmsgSCBXZWF2ZXIg PG1od0BuZXRyaXMub3JnPgorOzs7IENvcHlyaWdodCDCqSAyMDE0IEd1eSBHcmFudCA8dGFkbmlt aUBnbnUub3JnPgogOzs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7OzsK QEAgLTIyLDEwICsyMywxNCBAQAogICAgICAgICAgICAgICAgICM6cmVuYW1lciAoc3ltYm9sLXBy ZWZpeC1wcm9jICdsaWNlbnNlOikpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBwYWNrYWdlcykKICAg Izp1c2UtbW9kdWxlIChndWl4IGRvd25sb2FkKQorICAjOnVzZS1tb2R1bGUgKGd1aXggYnVpbGQt c3lzdGVtIGdudSkKICAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSB0cml2aWFsKQog ICAjOnVzZS1tb2R1bGUgKChnbnUgcGFja2FnZXMgYmFzZSkKICAgICAgICAgICAgICAgICAjOnNl bGVjdCAodGFyKSkKLSAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgY29tcHJlc3Npb24pKQor ICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBjb21wcmVzc2lvbikKKyAgIzp1c2UtbW9kdWxl IChnbnUgcGFja2FnZXMgcGVybCkKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgeG9yZykK KyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcGtnLWNvbmZpZykpCiAKIChkZWZpbmUtcHVi bGljIHR0Zi1kZWphdnUKICAgKHBhY2thZ2UKQEAgLTE5OCwzICsyMDMsNDAgQEAgcGFja2FnZSBw cm92aWRlcyB0aGUgVHJ1ZVR5cGUgKFRURikgZmlsZXMuIikKICAoUG9zdFNjcmlwdCBUeXBlMCwg VHJ1ZVR5cGUsIE9wZW5UeXBlLi4uKSBmb250cyBjb3ZlcmluZyB0aGUgSVNPCiAxMDY0Ni9Vbmlj b2RlIFVDUyAoVW5pdmVyc2FsIENoYXJhY3RlciBTZXQpLiIpCiAgICAobGljZW5zZSBsaWNlbnNl OmdwbDMrKSkpCisKKyhkZWZpbmUtcHVibGljIHRlcm1pbnVzLWZvbnQKKyAgKHBhY2thZ2UKKyAg ICAobmFtZSAidGVybWludXMtZm9udCIpCisgICAgKHZlcnNpb24gIjQuMzkiKQorICAgIChzb3Vy Y2UKKyAgICAgIChvcmlnaW4KKyAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCisgICAgICAgICh1 cmkgKHN0cmluZy1hcHBlbmQKKyAgICAgICAgICAgICAgICJtaXJyb3I6Ly9zb3VyY2Vmb3JnZS9w cm9qZWN0L3Rlcm1pbnVzLWZvbnQvdGVybWludXMtZm9udC0iCisgICAgICAgICAgICAgICB2ZXJz aW9uCisgICAgICAgICAgICAgICAiL3Rlcm1pbnVzLWZvbnQtIgorICAgICAgICAgICAgICAgdmVy c2lvbgorICAgICAgICAgICAgICAgIi50YXIuZ3oiKSkKKyAgICAgICAgKHNoYTI1NgorICAgICAg ICAgIChiYXNlMzIKKyAgICAgICAgICAgICIxZ3ptbjd6YWt2eTZ5cnZtc3d5amZrbG5zdnFyam0w aW1ocThyandzOHJka2hxd2toMjFpIikpKSkKKyAgICAoYnVpbGQtc3lzdGVtIGdudS1idWlsZC1z eXN0ZW0pCisgICAgKG5hdGl2ZS1pbnB1dHMKKyAgICAgIGAoKCJwa2ctY29uZmlnIiAscGtnLWNv bmZpZykKKwkoInBlcmwiICxwZXJsKQorICAgICAgICAoImJkZnRvcGNmIiAsYmRmdG9wY2YpCisg ICAgICAgICgiZm9udC11dGlsIiwgZm9udC11dGlsKQorICAgICAgICAoIm1rZm9udGRpciIgLG1r Zm9udGRpcikpKQorICAgIChhcmd1bWVudHMKKyAgICAgYCgjOmNvbmZpZ3VyZS1mbGFncyAobGlz dAorCQkJICA7OyBpbnN0YWxsIGZvbnRzIGludG8gc3ViZGlyZWN0b3J5IG9mIHBhY2thZ2Ugb3V0 cHV0IGluc3RlYWQgb2YKKwkJCSAgOzsgZm9udC11dGlsLT8uPy4/L3NoYXJlL2ZvbnRzL1gxMQor CQkJICAoc3RyaW5nLWFwcGVuZCAiLS13aXRoLWZvbnRyb290ZGlyPSIgJW91dHB1dCAiL3NoYXJl L2ZvbnRzL1gxMSIpKQorCQkJICM6dGVzdHM/ICNmKSkgOzsgTm8gdGVzdCB0YXJnZXQgaW4gdGFy YmFsbAorICAgIChob21lLXBhZ2UgImh0dHA6Ly90ZXJtaW51cy1mb250LnNvdXJjZWZvcmdlLm5l dC8iKQorICAgIChzeW5vcHNpcyAiU2ltcGxlIGJpdG1hcCBwcm9ncmFtbWluZyBmb250IikKKyAg ICAoZGVzY3JpcHRpb24gIlRlcm1pbnVzIEZvbnQgaXMgYSBjbGVhbiwgZml4ZWQgd2lkdGggYml0 bWFwIGZvbnQsIGRlc2lnbmVkIGZvciBsb25nCisgKDggYW5kIG1vcmUgaG91cnMgcGVyIGRheSkg d29yayB3aXRoIGNvbXB1dGVycy4iKQorICAgIChsaWNlbnNlIAorICAgICAobGljZW5zZTp4MTEt c3R5bGUKKyAgICAgICJodHRwOi8vc2NyaXB0cy5zaWwub3JnL2Ntcy9zY3JpcHRzL3BhZ2UucGhw P2l0ZW1faWQ9T0ZMX3dlYiIpKSkpCi0tIAoxLjkuMwoK --90e6ba6e89b8841f83050078d441--