[PATCH] gnu: Add gobject-introspection.

[PATCH] gnu: Add gobject-introspection.

[Cyril Roelandt]

* gnu/packages/gnome.scm: New file.
* gnu-system.am: Add it.
---
 gnu-system.am          |    1 +
 gnu/packages/gnome.scm |   72 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 gnu/packages/gnome.scm


This works fine on i686, but fails on x86-64 with:

"ERROR: can't resolve libraries to shared libraries: gobject-2.0, glib-2.0"

Any idea why ? 

Also, some bits are gpl2+, other are lgpl2+, what should I use in the 'license'
field ?


Cyril.
diff --git a/gnu-system.am b/gnu-system.am
index 8712546..3c9e0db 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -69,6 +69,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/gkrellm.scm			\
   gnu/packages/glib.scm				\
   gnu/packages/global.scm			\
+  gnu/packages/gnome.scm 			\
   gnu/packages/gnunet.scm			\
   gnu/packages/gnupg.scm			\
   gnu/packages/gnutls.scm			\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
new file mode 100644
index 0000000..f85b4bc
--- /dev/null
+++ b/gnu/packages/gnome.scm
@@ -0,0 +1,72 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages gnome)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages libffi)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python))
+
+(define-public gobject-introspection
+  (package
+    (name "gobject-introspection")
+    (version "1.37.6")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://ftp.gnome.org/pub/GNOME/sources/"
+	           "gobject-introspection/1.37/gobject-introspection-"
+                   version ".tar.xz"))
+             (sha256
+              (base32 "1ks0lfh8x72pgvgmnys19caajj34klqjfkqqp8fz9qhvk3vb9svf"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("bison" ,bison)
+       ("cairo" ,cairo)
+       ("flex" ,flex)
+       ("glib" ,glib)
+       ("libffi" ,libffi)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python)))
+    (arguments
+     `(#:phases
+        (alist-replace
+         'configure
+         (lambda* (#:key #:allow-other-keys #:rest args)
+          (let ((configure (assoc-ref %standard-phases 'configure)))
+           ;; giscanner/sourcescanner.py looks for 'CC', let's set it here.
+           (setenv "CC" "gcc")
+           (apply configure args)))
+         %standard-phases)))
+    (home-page "https://wiki.gnome.org/GObjectIntrospection")
+    (synopsis "Generate interface introspection data for GObject libraries")
+    (description
+     "GObject introspection is a middleware layer between C libraries (using
+GObject) and language bindings.  The C library can be scanned at compile time
+and generate a metadata file, in addition to the actual native C library.  Then
+at runtime, language bindings can read this metadata and automatically provide
+bindings to call into the C library.")
+    ; Some bits are distributed under the LGPL2+, others under the GPL2+
+    (license gpl2+)))
-- 
1.7.10.4

Re: [PATCH] gnu: Add gobject-introspection.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> * gnu/packages/gnome.scm: New file.

I’d have put it in glib.scm maybe; thoughts?

> * gnu-system.am: Add it.
> ---
>  gnu-system.am          |    1 +
>  gnu/packages/gnome.scm |   72 ++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 73 insertions(+)
>  create mode 100644 gnu/packages/gnome.scm
>
>
> This works fine on i686, but fails on x86-64 with:
>
> "ERROR: can't resolve libraries to shared libraries: gobject-2.0, glib-2.0"
>
> Any idea why ? 

No.  Could you try to grep the source to see what produces this message?

> Also, some bits are gpl2+, other are lgpl2+, what should I use in the 'license'
> field ?

‘license’ should refer to the resulting license, so in that case it’s
gpl2+.  However, it’s good to add a comment stating that some files are
LGPLv2+ as well.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add gobject-introspection.

[Cyril Roelandt]

On 09/12/2013 10:41 AM, Ludovic Courtès wrote:
> No.  Could you try to grep the source to see what produces this message?

Oh, I thought the message was directly produced by libtool or the 
linker, but yes, it's definitely an error message from 
gobject-introspection. I investigated this a bit. During the 'build' 
phase, the '_resolve_non_libtool' method is called from 
giscanner/shlibs.py. It tries to get the path to some libraries (here, 
gobject-2.0 and glib-2.0). In order to do this, it runs this command:

$ /nix/store/2awqnfxjrcm2b8s481zwsnfdic3inkdi-bash-4.2/bin/bash \
./libtool --mode=execute ldd \
/tmp/nix-build-gobject-introspection-1.37.6.drv-0/gobject-introspection-1.37.6/tmp-introspectS0TNXv/GLib-2.0

(tmp-instropectS0TNXv is a random directory)

On i686, this works perfectly. On x86-64, I get:

'not a dynamic executable'

If I 'cheat' by replacing 'ldd' by '/usr/bin/ldd', then everything works 
as expected.

More info:
$ ldd --version
ldd (GNU libc) 2.17
...
$ /usr/bin/ldd --version
ldd (Debian EGLIBC 2.17-5) 2.17
...


Cyril.

Re: [PATCH] gnu: Add gobject-introspection.

[Ludovic Courtès]

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

Cyril Roelandt <tipecaml@gmail.com> skribis:

> On 09/12/2013 10:41 AM, Ludovic Courtès wrote:
>> No.  Could you try to grep the source to see what produces this message?
>
> Oh, I thought the message was directly produced by libtool or the
> linker, but yes, it's definitely an error message from
> gobject-introspection. I investigated this a bit. During the 'build'
> phase, the '_resolve_non_libtool' method is called from
> giscanner/shlibs.py. It tries to get the path to some libraries (here,
> gobject-2.0 and glib-2.0). In order to do this, it runs this command:
>
> $ /nix/store/2awqnfxjrcm2b8s481zwsnfdic3inkdi-bash-4.2/bin/bash \
> ./libtool --mode=execute ldd \
> /tmp/nix-build-gobject-introspection-1.37.6.drv-0/gobject-introspection-1.37.6/tmp-introspectS0TNXv/GLib-2.0
>
> (tmp-instropectS0TNXv is a random directory)
>
> On i686, this works perfectly. On x86-64, I get:
>
> 'not a dynamic executable'

Yes, we actually have a problem with ldd (I had noticed, but thought
this would change with the moon phase or something):

--8<---------------cut here---------------start------------->8---
$ sh -x ~/.guix-profile/bin/ldd $(which ls)
+ TEXTDOMAIN=libc
+ TEXTDOMAINDIR=/nix/store/53afsq4c7r10hn77h3iyyavy2bs02403-glibc-2.17/share/locale
+ RTLDLIST='/nix/store/53afsq4c7r10hn77h3iyyavy2bs02403-glibc-2.17/lib/ld-linux.so.2 /nix/store/53afsq4c7r10hn77h3iyyavy2bs02403-glibc-2.17/lib64/ld-linux-x86-64.so.2 /nix/store/53afsq4c7r10hn77h3iyyavy2bs02403-glibc-2.17/libx32/ld-linux-x32.so.2'
+ warn=
+ bind_now=
+ verbose=
+ test 1 -gt 0
+ case "$1" in
+ break
+ add_env='LD_TRACE_LOADED_OBJECTS=1 LD_WARN= LD_BIND_NOW='
+ add_env='LD_TRACE_LOADED_OBJECTS=1 LD_WARN= LD_BIND_NOW= LD_LIBRARY_VERSION=$verify_out'
+ add_env='LD_TRACE_LOADED_OBJECTS=1 LD_WARN= LD_BIND_NOW= LD_LIBRARY_VERSION=$verify_out LD_VERBOSE='
+ test '' = yes
+ set -o pipefail
+ case $# in
+ single_file=t
+ result=0
+ for file in '"$@"'
+ test t = t
+ case $file in
+ :
+ test '!' -e /home/ludo/.guix-profile/bin/ls
+ test '!' -f /home/ludo/.guix-profile/bin/ls
+ test -r /home/ludo/.guix-profile/bin/ls
+ test -x /home/ludo/.guix-profile/bin/ls
+ RTLD=
+ ret=1
+ for rtld in '${RTLDLIST}'
+ test -x /nix/store/53afsq4c7r10hn77h3iyyavy2bs02403-glibc-2.17/lib/ld-linux.so.2
+ for rtld in '${RTLDLIST}'
+ test -x /nix/store/53afsq4c7r10hn77h3iyyavy2bs02403-glibc-2.17/lib64/ld-linux-x86-64.so.2
+ for rtld in '${RTLDLIST}'
+ test -x /nix/store/53afsq4c7r10hn77h3iyyavy2bs02403-glibc-2.17/libx32/ld-linux-x32.so.2
+ case $ret in
+ nonelf /home/ludo/.guix-profile/bin/ls
+ return 1
+ echo '        not a dynamic executable'
        not a dynamic executable
+ result=1
+ exit 1
--8<---------------cut here---------------end--------------->8---

It’s looking for ld.so in the wrong place (under lib64/).

I believe this wonderful patch fixes the problem:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 560 bytes --]

--- glibc-2.17/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed~	2012-12-25 04:02:13.000000000 +0100
+++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed	2013-09-15 23:08:03.000000000 +0200
@@ -1,3 +1,3 @@
 /LD_TRACE_LOADED_OBJECTS=1/a\
 add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
-s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ 	]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_
+s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ 	]*$_\1"\2\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_


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


I’ll try it in ‘core-updates’ and report back.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add gobject-introspection.

[Ludovic Courtès]

ludo@gnu.org (Ludovic Courtès) skribis:

> I believe this wonderful patch fixes the problem:
>
> --- glibc-2.17/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed~	2012-12-25 04:02:13.000000000 +0100
> +++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed	2013-09-15 23:08:03.000000000 +0200
> @@ -1,3 +1,3 @@
>  /LD_TRACE_LOADED_OBJECTS=1/a\
>  add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
> -s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ 	]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_
> +s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ 	]*$_\1"\2\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_
>
>
> I’ll try it in ‘core-updates’ and report back.

Indeed that does the trick.

Committed in 692b934.  That means you’ll have to test
gobject-introspection on that branch, or wait for the merge.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add gobject-introspection.

[Cyril Roelandt]

On 09/15/2013 11:38 PM, Ludovic Courtès wrote:
> ludo@gnu.org (Ludovic Courtès) skribis:
>
>> I believe this wonderful patch fixes the problem:
>>
>> --- glibc-2.17/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed~	2012-12-25 04:02:13.000000000 +0100
>> +++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed	2013-09-15 23:08:03.000000000 +0200
>> @@ -1,3 +1,3 @@
>>   /LD_TRACE_LOADED_OBJECTS=1/a\
>>   add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
>> -s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ 	]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_
>> +s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ 	]*$_\1"\2\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_
>>
>>
>> I’ll try it in ‘core-updates’ and report back.
>
> Indeed that does the trick.
>
> Committed in 692b934.  That means you’ll have to test
> gobject-introspection on that branch, or wait for the merge.
>

Thanks for looking into this issue. I tested gobject-introspection on 
core-updates, and it works well. How much time will there be between the 
merge and the release of 0.4 ?


Cyril.

Re: [PATCH] gnu: Add gobject-introspection.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> On 09/15/2013 11:38 PM, Ludovic Courtès wrote:
>> ludo@gnu.org (Ludovic Courtès) skribis:
>>
>>> I believe this wonderful patch fixes the problem:
>>>
>>> --- glibc-2.17/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed~	2012-12-25 04:02:13.000000000 +0100
>>> +++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed	2013-09-15 23:08:03.000000000 +0200
>>> @@ -1,3 +1,3 @@
>>>   /LD_TRACE_LOADED_OBJECTS=1/a\
>>>   add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
>>> -s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ 	]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_
>>> +s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ 	]*$_\1"\2\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_
>>>
>>>
>>> I’ll try it in ‘core-updates’ and report back.
>>
>> Indeed that does the trick.
>>
>> Committed in 692b934.  That means you’ll have to test
>> gobject-introspection on that branch, or wait for the merge.
>>
>
> Thanks for looking into this issue. I tested gobject-introspection on
> core-updates, and it works well. How much time will there be between
> the merge and the release of 0.4 ?

A few days I’d say.

I’d like to implement the ‘patches’ thing in ‘core-updates’ too.  And
then if there are no other updates or anything, we can merge it.

Then we’re almost done with the goals listed at
<https://lists.gnu.org/archive/html/guix-devel/2013-08/msg00094.html>.
Nikita is finishing ‘--list-generations’ and ‘--delete-generations’, and
we just need to add a paragraph or two in the manual regarding font
installation (help welcome!).

Thanks,
Ludo’.

[PATCH v2] gnu: Add gobject-introspection.

[Cyril Roelandt]

* gnu/packages/glib.scm (gobject-introspection): New variable.
---
 gnu/packages/glib.scm |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 815fafc..58cd1c5 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -25,10 +25,14 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages flex)
   #:use-module ((gnu packages gettext)
                 #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module (gnu packages gtk)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -171,6 +175,49 @@ dynamic loading, and an object system.")
    (home-page "http://developer.gnome.org/glib/")
    (license license:lgpl2.0+)))                        ; some files are under lgpl2.1+
 
+(define-public gobject-introspection
+  (package
+    (name "gobject-introspection")
+    (version "1.38.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://ftp.gnome.org/pub/GNOME/sources/"
+                   "gobject-introspection/"
+                   (substring version 0 (string-rindex version #\.))
+                   "/gobject-introspection-"
+                   version ".tar.xz"))
+             (sha256
+              (base32 "0wvxyvgajmms2bb6k3pf1rdpnd79xdxamykzvxzmcyn1ag9yax9m"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("bison" ,bison)
+       ("cairo" ,cairo)
+       ("flex" ,flex)
+       ("glib" ,glib)
+       ("libffi" ,libffi)
+       ("pkg-config" ,pkg-config)
+       ("python-2" ,python-2)))
+    (arguments
+     `(#:phases
+        (alist-replace
+         'configure
+         (lambda* (#:key #:allow-other-keys #:rest args)
+          (let ((configure (assoc-ref %standard-phases 'configure)))
+           ;; giscanner/sourcescanner.py looks for 'CC', let's set it here.
+           (setenv "CC" "gcc")
+           (apply configure args)))
+         %standard-phases)))
+    (home-page "https://wiki.gnome.org/GObjectIntrospection")
+    (synopsis "Generate interface introspection data for GObject libraries")
+    (description
+     "GObject introspection is a middleware layer between C libraries (using
+GObject) and language bindings.  The C library can be scanned at compile time
+and generate a metadata file, in addition to the actual native C library.  Then
+at runtime, language bindings can read this metadata and automatically provide
+bindings to call into the C library.")
+    ; Some bits are distributed under the LGPL2+, others under the GPL2+
+    (license license:gpl2+)))
+
 (define intltool
   (package
     (name "intltool")
-- 
1.7.10.4

Re: [PATCH v2] gnu: Add gobject-introspection.

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> * gnu/packages/glib.scm (gobject-introspection): New variable.

Wo0t!

> +  #:use-module (gnu packages autotools)

Don’t think it’s needed, is it?

Other than that, please push!

Thanks,
Ludo’.

Re: [PATCH v2] gnu: Add gobject-introspection.

[Cyril Roelandt]

On Sun, Sep 29, 2013 at 10:26:36PM +0200, Ludovic Courtès wrote:
> Cyril Roelandt <tipecaml@gmail.com> skribis:
> 
> > * gnu/packages/glib.scm (gobject-introspection): New variable.
> 
> Wo0t!
> 
> > +  #:use-module (gnu packages autotools)
> 
> Don’t think it’s needed, is it?

Good catch, thanks!

Pushed as 9ceb630c587beb187b52243f751e3ebc2b437a32 .

Cyril.