[PATCH] gnu: Add guile-gnome

[PATCH] gnu: Add guile-gnome

[Patrick Hetu]

* gnu/packages/gtk.scm (guile-gnome): New variables.
---
 gnu/packages/gtk.scm | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 1fe52a4..9111781 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
 ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
+;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -51,6 +52,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages libffi)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -822,6 +824,111 @@ includes a tools to generate PDF presentations out of Org mode and Texinfo
 documents.")
     (license license:lgpl3+)))
 
+(define-public guile-g-wrap
+  (package
+    (name "guile-g-wrap")
+    (version "1.9.15")
+    (source (origin
+             (method url-fetch)
+             (uri
+              (string-append "http://savannah.nongnu.org/download/g-wrap/g-wrap-"
+                             version ".tar.gz"))
+             (sha256
+              (base32
+               "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("libffi" ,libffi)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("glib" ,glib)))
+    (inputs `(("guile" ,guile-2.0)))
+    (propagated-inputs
+     `(("guile-cairo" ,guile-cairo)
+       ("guile-lib" ,guile-lib)))
+    (arguments
+     `(#:configure-flags
+       (let ((out (assoc-ref %outputs "out")))
+             (list (string-append "--prefix=" out)))
+       #:phases (alist-cons-before
+               'configure 'pre-configure
+               (lambda* (#:key outputs #:allow-other-keys)
+                 (let ((out (assoc-ref outputs "out")))
+                   (substitute* (find-files "." "^Makefile.in$")
+                     (("guilemoduledir =.*guile/site" all)
+                     (string-append all "/2.0")))
+                   (substitute* "configure"
+                     (("/bin/sh") (which "bash")))))
+                 %standard-phases)))
+    (outputs '("out" "debug"))
+    (synopsis "Guile library for generating function wrappers for inter-language calls")
+    (description "G-Wrap is a tool (and guile library) for generating function
+wrappers for inter-language calls.
+It currently only supports generating Guile wrappers for C functions.
+Other languages may be supported in the future, possibly on both sides.")
+    (home-page "http://www.nongnu.org/g-wrap/")
+    (license license:lgpl2.1+)))
+
+(define-public guile-gnome
+   (package
+    (name "guile-gnome")
+    (version "2.16.4")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "http://ftp.gnu.org/pub/gnu/" name
+                              "/guile-gnome-platform/guile-gnome-platform-"
+                              version ".tar.gz"))
+             (sha256
+              (base32
+               "1hqnqbb2lmr3hgbcv9kds1himn3av6h0lkk0zll8agcrsn7d9axd"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("atk" ,atk)
+;       ("corba" ,corba) ; not packaged yet
+       ("gconf" ,gconf)
+       ("gobject-introspection" ,gobject-introspection)
+;       ("gthread" ,gthread) ; not packaged yet
+       ("gnome-vfs" ,gnome-vfs)
+       ("gdk-pixbuf" ,gdk-pixbuf)
+       ("gtk+" ,gtk+-2)
+       ("libglade" ,libglade)
+       ("libgnome" ,libgnome)
+       ("libgnomecanvas" ,libgnomecanvas)
+       ("libgnomeui" ,libgnomeui)
+       ("pango" ,pango)
+       ("libffi" ,libffi)
+       ("glib" ,glib)))
+    (inputs `(("guile" ,guile-2.0)))
+    (propagated-inputs
+     `(("guile-cairo" ,guile-cairo)
+       ("guile-g-wrap" ,guile-g-wrap)
+       ("guile-lib" ,guile-lib)))
+    (arguments
+      `(#:tests? #f
+        #:phases (alist-cons-before
+                  'configure 'pre-configure
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (let ((out (assoc-ref outputs "out")))
+                      (substitute* (find-files "." "^Makefile.am$")
+                        (("guilesite:=.*guile/site" all)
+                         (string-append all "/2.0")))))
+                  %standard-phases)))
+    (outputs '("out" "debug"))
+    (synopsis "Guile interface for GTK+ programming for GNOME")
+    (description "Guile wrapper collection for the following GNOME core libraries:
+
+Gobject, Glib, Atk, Pango, Pangocairo, Gdk, Gdk-Pixbuf, Gtk, Libglade,
+Gnome-Vfs, Libgnome, Libgnomecanvas, Libgnomeui, Corba")
+    (home-page "http://www.gnu.org/software/guile-gnome/")
+    (license license:gpl2+)))
+
 ;;;
 ;;; C++ bindings.
 ;;;
-- 
2.7.4

Re: [PATCH] gnu: Add guile-gnome

[Ludovic Courtès]

Hi!

Patrick Hetu <patrick.hetu@auf.org> skribis:

> * gnu/packages/gtk.scm (guile-gnome): New variables.

This is a long-overdue addition.

Pushed as 9b381643f009025d97dfc0b82d2c00800c204380 with a few minor
changes:

> +(define-public guile-g-wrap

This one is already available in (gnu packages guile).  :-)

> +              (uri
> +               (string-append "http://ftp.gnu.org/pub/gnu/" name

I changed that to mirror://gnu.

> +      `(#:tests? #f

This should be fixed or explained.

> +        #:phases (alist-cons-before

Changed to ‘modify-phases’.

> +                      (substitute* (find-files "." "^Makefile.am$")

Modified Makefile.in instead so that we don’t need the dependency on
Autoconf, Automake, and Libtool.

> +    (description "Guile wrapper collection for the following GNOME core libraries:

Changed to what ‘guix lint’ recommends.

Thanks!

Ludo’.

Re: [PATCH] gnu: Add guile-gnome

[Patrick Hetu]

Ludovic Courtès @ 2016-05-28 12:06 EDT:

> Pushed as 9b381643f009025d97dfc0b82d2c00800c204380 with a few minor
> changes:
>
>> +(define-public guile-g-wrap
>
> This one is already available in (gnu packages guile).  :-)

Oops, I was looking for guile-g-wrap instead of g-wrap...

Still, the current g-wrap package needs a new patch to fix his Makefile.in
because the native-search-paths hooks won't find it for Guile 2.0.
Also, should I rename it to guile-g-wrap at the same time?

> [...]
>> +                      (substitute* (find-files "." "^Makefile.am$")
>
> Modified Makefile.in instead so that we don’t need the dependency on
> Autoconf, Automake, and Libtool.
>

--

Patrick

Re: [PATCH] gnu: Add guile-gnome

[David Pirotte]

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

Hello,

Le Tue, 07 Jun 2016 13:57:19 -0400,
Patrick Hetu <patrick.hetu@auf.org> a écrit :

> Ludovic Courtès @ 2016-05-28 12:06 EDT:
> 
> > Pushed as 9b381643f009025d97dfc0b82d2c00800c204380 with a few minor
> > changes:
> >  
> >> +(define-public guile-g-wrap  
> >
> > This one is already available in (gnu packages guile).  :-)  
> 
> Oops, I was looking for guile-g-wrap instead of g-wrap...
> 
> Still, the current g-wrap package needs a new patch to fix his Makefile.in
> because the native-search-paths hooks won't find it for Guile 2.0.

Note that I don't develop neither [yet] use guix [shame on me], but I  don't
understand why you should change anything wrt Makefile(s):

	from http://www.nongnu.org/g-wrap/download.html, Notes 3.

	"... G-Wrap's modules will be installed in $prefix/share/guile/site. If it
	differs from Guile's global site directory, then this path must be added to
	Guile's load paths before to use G-Wrap and compile Guile-Gnome or
	Guile-Clutter. ..."

Note that G-wrap compiles and runs fine with both Guile-2.0 and 2.2.  So if Guix
installs G-wrap using the same prefix as the one used for guile, which I recommend,
then nothing needs to be changed since guile's default %load-path already include
(%global-site-dir), and unless $prefix would differ for guix guile-2.0 and
guile-2.2, [hopefully there are the same?], then users can always fire guile
and: ,use (g-wrap), independently from which guile version they are using.

My 2c, but as I [administratively] maintain g-wrap, feedback welcome.

> Also, should I rename it to guile-g-wrap at the same time?

IMO, it's better to keep the original name, which in this case is G-wrap

	http://www.nongnu.org/g-wrap/

Cheers,
David

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] gnu: Add guile-gnome

[Ludovic Courtès]

Patrick Hetu <patrick.hetu@auf.org> skribis:

> Ludovic Courtès @ 2016-05-28 12:06 EDT:
>
>> Pushed as 9b381643f009025d97dfc0b82d2c00800c204380 with a few minor
>> changes:
>>
>>> +(define-public guile-g-wrap
>>
>> This one is already available in (gnu packages guile).  :-)
>
> Oops, I was looking for guile-g-wrap instead of g-wrap...
>
> Still, the current g-wrap package needs a new patch to fix his Makefile.in
> because the native-search-paths hooks won't find it for Guile 2.0.

But it works well to build guile-gnome AFAICS.  When is it a problem?

But yeah, patching it to match the native-search-paths is a good idea.

> Also, should I rename it to guile-g-wrap at the same time?

I don’t think so, because it’s both a program and a library, not just a
library (I see that this rule mine and is not spelled out in “Packaging
Guidelines”; it probably should, if there’s consensus.)

Thanks!

Ludo’.

Re: [PATCH] gnu: Add guile-gnome

[Patrick Hetu]

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


Ludovic Courtès @ 2016-06-08 09:19 EDT:

> Patr

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-g-wrap-Fix-installation-path.patch --]
[-- Type: text/x-diff, Size: 1278 bytes --]

From 66baa02e5683a309588ae0a68a7d1b918ad72d8e Mon Sep 17 00:00:00 2001
From: Patrick Hetu <patrick.hetu@auf.org>
Date: Wed, 8 Jun 2016 13:18:07 -0400
Subject: [PATCH] gnu: g-wrap: Fix installation path

* gnu/packages/guile.scm (g-wrap): Add 2.0/ to the installation path
---
 gnu/packages/guile.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 74e58c4..04c3f03 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -939,6 +939,16 @@ capabilities.")
        ("guile-lib" ,guile-lib)))
     (inputs
      `(("libffi" ,libffi)))
+    (arguments
+      `(#:phases
+        (modify-phases %standard-phases
+          (add-before 'configure 'pre-configure
+               (lambda* (#:key outputs #:allow-other-keys)
+                 (let ((out (assoc-ref outputs "out")))
+                   (substitute* (find-files "." "^Makefile.in$")
+                     (("guilemoduledir =.*guile/site" all)
+                     (string-append all "/2.0")))
+                  #t))))))
     (synopsis "Generate C bindings for Guile")
     (description "G-Wrap is a tool and Guile library for generating function
 wrappers for inter-language calls.  It currently only supports generating Guile
-- 
2.7.4


[-- Attachment #3: Type: text/plain, Size: 1588 bytes --]

ick Hetu <patrick.hetu@auf.org> skribis:
>
>> Ludovic Courtès @ 2016-05-28 12:06 EDT:
>>
>>> Pushed as 9b381643f009025d97dfc0b82d2c00800c204380 with a few minor
>>> changes:
>> [...]
>> Still, the current g-wrap package needs a new patch to fix his Makefile.in
>> because the native-search-paths hooks won't find it for Guile 2.0.
>
> But it works well to build guile-gnome AFAICS.  When is it a problem?

I'm getting this error in a simple test script:

In ice-9/boot-9.scm:
2951: 3 [define-module* (gnome gw gtk) #:filename ...]
2926: 2 [resolve-imports ((#) (#) (#) (#) ...)]
2867: 1 [resolve-interface (g-wrap gw standard) #:select ...]
In unknown file:
   ?: 0 [scm-error misc-error #f ...]

ERROR: In procedure scm-error:
ERROR: no code for module (g-wrap gw standard)

because the g-wrap code is under:

/gnu/store/...-g-wrap-1.9.15/share/guile/site
/gnu/store/...-g-wrap-1.9.15/share/guile/site/g-wrap.scm
/gnu/store/...-g-wrap-1.9.15/share/guile/site/g-wrap
/gnu/store/...-g-wrap-1.9.15/share/guile/site/g-wrap/compat.scm
/gnu/store/...-g-wrap-1.9.15/share/guile/site/g-wrap/config.scm

and not /gnu/..../share/guile/2.0/g-wrap/...

> But yeah, patching it to match the native-search-paths is a good idea.

ok, I've attached the patch.

>> Also, should I rename it to guile-g-wrap at the same time?
>
> I don’t think so, because it’s both a program and a library, not just a
> library (I see that this rule mine and is not spelled out in “Packaging
> Guidelines”; it probably should, if there’s consensus.)

ok.

Patrick

Re: [PATCH] gnu: Add guile-gnome

[David Pirotte]

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

Hello Patrick,

> ...
> +        (modify-phases %standard-phases
> +          (add-before 'configure 'pre-configure
> +               (lambda* (#:key outputs #:allow-other-keys)
> +                 (let ((out (assoc-ref outputs "out")))
> +                   (substitute* (find-files "." "^Makefile.in$")
> +                     (("guilemoduledir =.*guile/site" all)
> +                     (string-append all "/2.0")))
> +                  #t))))))
> ...

Just curious: why do you (string-append all "/2.0")? Is this a guix guideline maybe?

	IMO, G-wrap, Guile-Cairo and Guile-Gnome should all be installed in the
	directory returned by (%global-site-dir)

Cheers,
David

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] gnu: Add guile-gnome

[Efraim Flashner]

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

On Wed, Jun 08, 2016 at 05:37:26PM -0300, David Pirotte wrote:
> Hello Patrick,
> 
> > ...
> > +        (modify-phases %standard-phases
> > +          (add-before 'configure 'pre-configure
> > +               (lambda* (#:key outputs #:allow-other-keys)
> > +                 (let ((out (assoc-ref outputs "out")))
> > +                   (substitute* (find-files "." "^Makefile.in$")
> > +                     (("guilemoduledir =.*guile/site" all)
> > +                     (string-append all "/2.0")))
> > +                  #t))))))
> > ...
> 
> Just curious: why do you (string-append all "/2.0")? Is this a guix guideline maybe?
> 
> 	IMO, G-wrap, Guile-Cairo and Guile-Gnome should all be installed in the
> 	directory returned by (%global-site-dir)
> 
> Cheers,
> David

`guilemoduledir =.*guile/site' is saved in the variable `all' and then
used in the second half of the substitute*.  I have a similar one I
wrote for aria2 in bittorrent.scm



-- 
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 --]

Re: [PATCH] gnu: Add guile-gnome

[David Pirotte]

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


> > > ...
> > > +        (modify-phases %standard-phases
> > > +          (add-before 'configure 'pre-configure
> > > +               (lambda* (#:key outputs #:allow-other-keys)
> > > +                 (let ((out (assoc-ref outputs "out")))
> > > +                   (substitute* (find-files "." "^Makefile.in$")
> > > +                     (("guilemoduledir =.*guile/site" all)
> > > +                     (string-append all "/2.0")))
> > > +                  #t))))))
> > > ...  

> > Just curious: why do you (string-append all "/2.0")? Is this a guix guideline
> > maybe?

> > 	IMO, G-wrap, Guile-Cairo and Guile-Gnome should all be installed in the
> > 	directory returned by (%global-site-dir)

> `guilemoduledir =.*guile/site' is saved in the variable `all' and then
> used in the second half of the substitute*.  I have a similar one I
> wrote for aria2 in bittorrent.scm

ok, but why "/2.0" is appended to it?

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] gnu: Add guile-gnome

[Alex Kost]

David Pirotte (2016-06-09 22:45 +0300) wrote:

>> > > ...
>> > > +        (modify-phases %standard-phases
>> > > +          (add-before 'configure 'pre-configure
>> > > +               (lambda* (#:key outputs #:allow-other-keys)
>> > > +                 (let ((out (assoc-ref outputs "out")))
>> > > +                   (substitute* (find-files "." "^Makefile.in$")
>> > > +                     (("guilemoduledir =.*guile/site" all)
>> > > +                     (string-append all "/2.0")))
>> > > +                  #t))))))
>> > > ...  
>
>> > Just curious: why do you (string-append all "/2.0")? Is this a guix guideline
>> > maybe?
>
>> > 	IMO, G-wrap, Guile-Cairo and Guile-Gnome should all be installed in the
>> > 	directory returned by (%global-site-dir)
>
>> `guilemoduledir =.*guile/site' is saved in the variable `all' and then
>> used in the second half of the substitute*.  I have a similar one I
>> wrote for aria2 in bittorrent.scm
>
> ok, but why "/2.0" is appended to it?

I think the version is not needed, but Ludovic had another opinion.  I
don't remember details but there was some discussion about it:
<http://lists.gnu.org/archive/html/guix-devel/2014-10/msg00408.html>

-- 
Alex

Re: [PATCH] gnu: Add guile-gnome

[David Pirotte]

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

Hi Alex,

> >> > > ...
> >> > > +        (modify-phases %standard-phases
> >> > > +          (add-before 'configure 'pre-configure
> >> > > +               (lambda* (#:key outputs #:allow-other-keys)
> >> > > +                 (let ((out (assoc-ref outputs "out")))
> >> > > +                   (substitute* (find-files "." "^Makefile.in$")
> >> > > +                     (("guilemoduledir =.*guile/site" all)
> >> > > +                     (string-append all "/2.0")))
> >> > > +                  #t))))))
> >> > > ...    

> >> > Just curious: why do you (string-append all "/2.0")? Is this a guix guideline
> >> > maybe?  

> >> > 	IMO, G-wrap, Guile-Cairo and Guile-Gnome should all be installed in
> >> > the directory returned by (%global-site-dir)  

> >> `guilemoduledir =.*guile/site' is saved in the variable `all' and then
> >> used in the second half of the substitute*.  I have a similar one I
> >> wrote for aria2 in bittorrent.scm  

> > ok, but why "/2.0" is appended to it?  

> I think the version is not needed, but Ludovic had another opinion.  I
> don't remember details but there was some discussion about it:
> <http://lists.gnu.org/archive/html/guix-devel/2014-10/msg00408.html>

Thanks for the pointer.  FWIW, I agree with Mark

	(a) (%global-site-dir) as always been part of gule's search paths for
	modules, and that should not be 'altered' for guix, imo;

	(b) it seems to me there has been a confuson, in this thread, in between
	those of you talking about packages that also need to install things in
	$prefix/bin and 'natively' do not distingish themselve from other version(s)
	[1] and those of you talking packages that are compatible with several
	version of guile [the one listed in their configure.ac file] and these
	should be installed in (%global-site-dir), imo.

But then maybe I'm missing something.

Cheers,
David

[1]	the thread sites qt 4 and 5, but guile does that too by the way, even if
	you specify --program-suffix, it installs itself and its scripts, in
	$prefix/bin, without the suffix




[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] gnu: Add guile-gnome

[Ludovic Courtès]

Patrick Hetu <patrick.hetu@auf.org> skribis:

> From 66baa02e5683a309588ae0a68a7d1b918ad72d8e Mon Sep 17 00:00:00 2001
> From: Patrick Hetu <patrick.hetu@auf.org>
> Date: Wed, 8 Jun 2016 13:18:07 -0400
> Subject: [PATCH] gnu: g-wrap: Fix installation path
>
> * gnu/packages/guile.scm (g-wrap): Add 2.0/ to the installation path

Applied, thanks!

I think guile-gnome built successfully even without this patch because
it uses ‘g-wrap-config --guile-module-directory’ to determine what to
add to its load path.

Ludo’.