[PATCH 4/4] gnu: evince: Add inputs.

[PATCH 4/4] gnu: evince: Add inputs.

[Federico Beffa]

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

Update evince to take advantage of dconf and theme sounds.

Given that every GTK+ application handles event sounds with the help
of libcanberra, I would like to propose to add the latter as a
propagated-input to gtk instead of adding it to every single gtk
application and, in applications, to make gtk a propagated-input.

https://developer.gnome.org/libcanberra/0.28/libcanberra-canberra-gtk.html

Regards,
Fede

[-- Attachment #2: 0004-gnu-evince-Add-inputs.patch --]
[-- Type: text/x-patch, Size: 1135 bytes --]

From 6d2a39afbefef0e689cb37dd22e54e848a7f653c Mon Sep 17 00:00:00 2001
From: Federico Beffa <beffa@fbengineering.ch>
Date: Thu, 18 Dec 2014 21:48:43 +0100
Subject: [PATCH 4/4] gnu: evince: Add inputs.

* gnu/packages/gnome.scm (evince): Add 'dconf' as an input and 'libcanberra'
  as a propagated input.
---
 gnu/packages/gnome.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a052be1..a64d21a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -250,13 +250,16 @@ and keep up to date translations of documentation.")
        ("libsm" ,libsm)
        ("libice" ,libice)
        ("shared-mime-info" ,shared-mime-info)
-
+       ("dconf" ,dconf)
+       
        ;; For tests.
        ("dogtail" ,python2-dogtail)))
     (native-inputs
      `(("intltool" ,intltool)
        ("glib" ,glib "bin")
        ("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("libcanberra" ,libcanberra))) ; to inherit default sounds
     (home-page
      "http://www.gnome.org/projects/evince/")
     (synopsis "GNOME's document viewer")
-- 
1.8.4

Re: [PATCH 4/4] gnu: evince: Add inputs.

[Ludovic Courtès]

Federico Beffa <beffa@ieee.org> skribis:

> Update evince to take advantage of dconf and theme sounds.
>
> Given that every GTK+ application handles event sounds with the help
> of libcanberra, I would like to propose to add the latter as a
> propagated-input to gtk instead of adding it to every single gtk
> application and, in applications, to make gtk a propagated-input.
>
> https://developer.gnome.org/libcanberra/0.28/libcanberra-canberra-gtk.html

OK for adding dconf.  However, I think it will be enough to add
libcanberra to ‘inputs’, not ‘propagated-inputs’, with the fix I
suggested just before to have the default sound-theme found.

Thanks,
Ludo’.

Re: [PATCH 4/4] gnu: evince: Add inputs.

[Federico Beffa]

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

On Sun, Dec 21, 2014 at 12:08 PM, Ludovic Courtès <ludo@gnu.org> wrote:
> OK for adding dconf.  However, I think it will be enough to add
> libcanberra to ‘inputs’, not ‘propagated-inputs’, with the fix I
> suggested just before to have the default sound-theme found.

Please find attached an updated patch.

Regards,
Fede

[-- Attachment #2: 0004-gnu-evince-Add-inputs.patch --]
[-- Type: text/x-patch, Size: 1985 bytes --]

From a64baf91c40e87667f31e96e3512b4b4f0d78573 Mon Sep 17 00:00:00 2001
From: Federico Beffa <beffa@fbengineering.ch>
Date: Thu, 18 Dec 2014 21:48:43 +0100
Subject: [PATCH 4/4] gnu: evince: Add inputs.

* gnu/packages/gnome.scm (evince): Add 'dconf' and 'libcanberra' inputs.
  Remove custom phase 'set-mime-search-path which is now handled by
  glib-or-gtk-build-system.
---
 gnu/packages/gnome.scm | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a052be1..85bb5f4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -219,19 +219,7 @@ and keep up to date translations of documentation.")
        ;; FIXME: Tests fail with:
        ;;   ImportError: No module named gi.repository
        ;; Where should that module come from?
-       #:tests? #f
-
-       #:phases (alist-cons-after
-                 'install 'set-mime-search-path
-                 (lambda* (#:key inputs outputs #:allow-other-keys)
-                   ;; Wrap 'evince' so that it knows where MIME info is.
-                   (let ((out  (assoc-ref outputs "out"))
-                         (mime (assoc-ref inputs "shared-mime-info")))
-                     (wrap-program (string-append out "/bin/evince")
-                                   `("XDG_DATA_DIRS" ":" prefix
-                                     ,(list (string-append mime "/share")
-                                            (string-append out "/share"))))))
-                 %standard-phases)))
+       #:tests? #f))
     (inputs
      `(("libspectre" ,libspectre)
        ;; ("djvulibre" ,djvulibre)
@@ -250,7 +238,9 @@ and keep up to date translations of documentation.")
        ("libsm" ,libsm)
        ("libice" ,libice)
        ("shared-mime-info" ,shared-mime-info)
-
+       ("dconf" ,dconf)
+       ("libcanberra" ,libcanberra)
+       
        ;; For tests.
        ("dogtail" ,python2-dogtail)))
     (native-inputs
-- 
1.8.4

Re: [PATCH 4/4] gnu: evince: Add inputs.

[Ludovic Courtès]

Federico Beffa <beffa@ieee.org> skribis:

> From a64baf91c40e87667f31e96e3512b4b4f0d78573 Mon Sep 17 00:00:00 2001
> From: Federico Beffa <beffa@fbengineering.ch>
> Date: Thu, 18 Dec 2014 21:48:43 +0100
> Subject: [PATCH 4/4] gnu: evince: Add inputs.
>
> * gnu/packages/gnome.scm (evince): Add 'dconf' and 'libcanberra' inputs.
>   Remove custom phase 'set-mime-search-path which is now handled by
>   glib-or-gtk-build-system.

OK!

Thanks,
Ludo'.