Re: [PATCH][v2] gnu: Add perl-curses

[Efraim Flashner <efraim@flashner.co.il>]

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

On Tue, Sep 06, 2016 at 09:39:11PM +0000, ng0 wrote:
> Hi,
> 
> Efraim Flashner <efraim@flashner.co.il> writes:
> 
> > [ Unknown signature status ]
> > On Fri, Aug 19, 2016 at 01:36:27PM +0000, ng0 wrote:
> >> Okay, when I build this without "FORMS" it succeeds. Works for me.
> >> 
> >
> >> From a72020974650298e89b82abda8e07f722f7cf32c Mon Sep 17 00:00:00 2001
> >> From: ng0 <ng0@we.make.ritual.n0.is>
> >> Date: Fri, 19 Aug 2016 13:13:42 +0000
> >> Subject: [PATCH 1/2] gnu: Add perl-curses.
> 
> …
> 
> >> -- 
> >> 2.9.3
> >> 
> >
> > I think this would go better in ncurses.scm than in perl. Can you send
> > an updated patch? Thanks.
> 
> …
> 
> Thanks for reviewing.
> 
> Okay, updated patch appended. I have worked on this without sending an
> update for a while, I had something already fixed in my secushare
> packaging repository.
> 

> From 618b04248f4db327a8fd72c5bd626a4f80c6ccf8 Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Sat, 23 Jul 2016 13:03:22 +0000
> Subject: [PATCH] gnu: Add perl-curses.
> 
> * gnu/packages/ncurses.scm (perl-curses): New variable.
> ---
>  gnu/packages/ncurses.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 46 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
> index 147033a..1c46355 100644
> --- a/gnu/packages/ncurses.scm
> +++ b/gnu/packages/ncurses.scm
> @@ -2,6 +2,7 @@
>  ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
>  ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
>  ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
> +;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -22,7 +23,10 @@
>    #:use-module (guix licenses)
>    #:use-module (guix packages)
>    #:use-module (guix download)
> -  #:use-module (guix build-system gnu))
> +  #:use-module (guix build-system gnu)
> +  #:use-module (guix build-system perl)
> +  #:use-module (gnu packages)
> +  #:use-module (gnu packages perl))
>  
>  (define-public ncurses
>    (let ((patch-makefile-phase
> @@ -161,3 +165,44 @@ curses widgets, such as dialog boxes.")
>      (home-page "http://invisible-island.net/dialog/dialog.html")
>      ;; Includes the gpl3 file "config.sub" from Automake.
>      (license (list lgpl2.1 gpl3))))
> +
> +(define-public perl-curses
> +  (package
> +    (name "perl-curses")
> +    (version "1.36")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "mirror://cpan/authors/id/G/GI/GIRAFFED/"
> +                           "Curses-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0r6xd9wr0c25rr28zixhqipak575zqsfb7r7f2693i9il1dpj554"))))
> +    (build-system perl-build-system)
> +    (inputs
> +     `(("ncurses" ,ncurses)))
> +    (arguments
> +     `(#:make-maker-flags (list "PANELS" "MENUS")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before
> +             'configure 'set-curses-ldflags
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (let* ((ncurses (assoc-ref inputs "ncurses"))
> +                    (include (string-append ncurses "/include"))
> +                    (lib (string-append ncurses "/lib")))
> +               (setenv "CURSES_LIBTYPE" "ncurses")
> +               (setenv "CURSES_CFLAGS" (string-append "-I" include))
> +               (setenv "CURSES_PANEL_CFLAGS" (string-append "-I" include))
> +               (setenv "CURSES_MENU_CFLAGS" (string-append "-I" include))
> +               (setenv "CURSES_FORM_CFLAGS" (string-append "-I" include))
> +               (setenv "CURSES_LDFLAGS" (string-append "-L" lib " -lncurses"))
> +               (setenv "CURSES_PANEL_LDFLAGS" (string-append "-L" lib " -lpanel"))
> +               (setenv "CURSES_MENU_LDFLAGS" (string-append "-L" lib " -lmenu"))
> +               (setenv "CURSES_FORM_LDFLAGS" (string-append "-L" lib " -lform"))))))))
> +    (home-page "http://search.cpan.org/dist/Curses")
> +    (synopsis "Terminal screen handling and optimization")
> +    (description
> +     "@code{Curses} is the interface between Perl and the curses library
> +of your system.")
> +    (license (package-license perl))))
> -- 
> 2.10.0
> 

I added a #t at the end of all the setenv-s and fixed the indentation on
'configure.

Patch pushed!


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]