[PATCH] gnu: libcanberra: Add input gtk+-2.

[PATCH] gnu: libcanberra: Add input gtk+-2.

[Fabian Harfert]

* gnu/packages/libcanberra.scm (libcanberra): Add input gtk+-2.
---
 gnu/packages/libcanberra.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm
index 3769e3f..4110e88 100644
--- a/gnu/packages/libcanberra.scm
+++ b/gnu/packages/libcanberra.scm
@@ -67,6 +67,7 @@
     (inputs
      `(("alsa-lib" ,alsa-lib)
        ("gstreamer" ,gstreamer)
+       ("gtk+" ,gtk+-2)
        ("gtk+" ,gtk+)
        ("libltdl" ,libltdl)
        ("libvorbis" ,libvorbis)
-- 
2.7.0

Re: [PATCH] gnu: libcanberra: Add input gtk+-2.

[Fabian Harfert]

On Thu,  4 Feb 2016 17:04:42 +0100
Fabian Harfert <fhmgufs@web.de> wrote:

> * gnu/packages/libcanberra.scm (libcanberra): Add input gtk+-2.
> ---
>  gnu/packages/libcanberra.scm | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/gnu/packages/libcanberra.scm
> b/gnu/packages/libcanberra.scm index 3769e3f..4110e88 100644
> --- a/gnu/packages/libcanberra.scm
> +++ b/gnu/packages/libcanberra.scm
> @@ -67,6 +67,7 @@
>      (inputs
>       `(("alsa-lib" ,alsa-lib)
>         ("gstreamer" ,gstreamer)
> +       ("gtk+" ,gtk+-2)
>         ("gtk+" ,gtk+)
>         ("libltdl" ,libltdl)
>         ("libvorbis" ,libvorbis)

This is because some packages I'm working on need libcanberra with
gtk+-2.0 support.

Re: [PATCH] gnu: libcanberra: Add input gtk+-2.

[宋文武]

Fabian Harfert <fhmgufs@web.de> writes:

> On Thu,  4 Feb 2016 17:04:42 +0100
> Fabian Harfert <fhmgufs@web.de> wrote:
>
>> * gnu/packages/libcanberra.scm (libcanberra): Add input gtk+-2.
>> ---
>>  gnu/packages/libcanberra.scm | 1 +
>>  1 file changed, 1 insertion(+)
>> 
>> diff --git a/gnu/packages/libcanberra.scm
>> b/gnu/packages/libcanberra.scm index 3769e3f..4110e88 100644
>> --- a/gnu/packages/libcanberra.scm
>> +++ b/gnu/packages/libcanberra.scm
>> @@ -67,6 +67,7 @@
>>      (inputs
>>       `(("alsa-lib" ,alsa-lib)
>>         ("gstreamer" ,gstreamer)
>> +       ("gtk+" ,gtk+-2)
>>         ("gtk+" ,gtk+)
>>         ("libltdl" ,libltdl)
>>         ("libvorbis" ,libvorbis)
This will add gtk+-2 to the closure of every gtk+-3 application,
How about add a new libcanberra/gtk+-2 package?

[PATCH] gnu: Add libcanberra-gtk2.

[Fabian Harfert]

* gnu/packages/libcanberra.scm (libcanberra/gtk+-2): New variable.
---
 gnu/packages/libcanberra.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm
index 3769e3f..2cd75ce 100644
--- a/gnu/packages/libcanberra.scm
+++ b/gnu/packages/libcanberra.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -96,6 +97,19 @@ GNOME.  It comes with several backends (ALSA, PulseAudio, OSS, GStreamer,
 null) and is designed to be portable.")
     (license lgpl2.1+)))
 
+(define-public libcanberra/gtk+-2
+  (package (inherit libcanberra)
+    (name "libcanberra-gtk2")
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("gstreamer" ,gstreamer)
+       ("gtk+" ,gtk+-2)
+       ("libltdl" ,libltdl)
+       ("libvorbis" ,libvorbis)
+       ("pulseaudio" ,pulseaudio)
+       ("udev" ,eudev)
+       ("sound-theme-freedesktop" ,sound-theme-freedesktop)))))
+
 (define-public sound-theme-freedesktop
   (package
     (name "sound-theme-freedesktop")
-- 
2.7.0

Re: [PATCH] gnu: Add libcanberra-gtk2.

[Efraim Flashner]

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

On Sat,  6 Feb 2016 19:48:44 +0100
Fabian Harfert <fhmgufs@web.de> wrote:

> * gnu/packages/libcanberra.scm (libcanberra/gtk+-2): New variable.
> ---
>  gnu/packages/libcanberra.scm | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm
> index 3769e3f..2cd75ce 100644
> --- a/gnu/packages/libcanberra.scm
> +++ b/gnu/packages/libcanberra.scm
> @@ -1,6 +1,7 @@
>  ;;; GNU Guix --- Functional package management for GNU
>  ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
>  ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
> +;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -96,6 +97,19 @@ GNOME.  It comes with several backends (ALSA, PulseAudio, OSS, GStreamer,
>  null) and is designed to be portable.")
>      (license lgpl2.1+)))
>  
> +(define-public libcanberra/gtk+-2
> +  (package (inherit libcanberra)
> +    (name "libcanberra-gtk2")
> +    (inputs
> +     `(("alsa-lib" ,alsa-lib)
> +       ("gstreamer" ,gstreamer)
> +       ("gtk+" ,gtk+-2)
> +       ("libltdl" ,libltdl)
> +       ("libvorbis" ,libvorbis)
> +       ("pulseaudio" ,pulseaudio)
> +       ("udev" ,eudev)
> +       ("sound-theme-freedesktop" ,sound-theme-freedesktop)))))
> +
>  (define-public sound-theme-freedesktop
>    (package
>      (name "sound-theme-freedesktop")

gtk is the only different input between the two variants, how about just
removing gtk from the list of inherited inputs and adding in gtk+-2? grepping
for "package-inputs" should have some examples.

-- 
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: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] gnu: Add libcanberra-gtk2.

[Andreas Enge]

On Sat, Feb 06, 2016 at 09:56:57PM +0200, Efraim Flashner wrote:
> gtk is the only different input between the two variants, how about just
> removing gtk from the list of inherited inputs and adding in gtk+-2? grepping
> for "package-inputs" should have some examples.

For instance qt:
   (inputs `(,@(alist-delete "harfbuzz"
                              (alist-delete "libjpeg" (package-inputs qt)))
              ("libjepg" ,libjpeg-8)
              ("libsm" ,libsm)))

Andreas

[PATCH] gnu: Add libcanberra-gtk2.

[Fabian Harfert]

* gnu/packages/libcanberra.scm (libcanberra/gtk+-2): New variable.
---
 gnu/packages/libcanberra.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm
index 3769e3f..50c0f80 100644
--- a/gnu/packages/libcanberra.scm
+++ b/gnu/packages/libcanberra.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build utils)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
@@ -96,6 +98,12 @@ GNOME.  It comes with several backends (ALSA, PulseAudio, OSS, GStreamer,
 null) and is designed to be portable.")
     (license lgpl2.1+)))
 
+(define-public libcanberra/gtk+-2
+  (package (inherit libcanberra)
+    (name "libcanberra-gtk2")
+    (inputs `(,@(alist-delete "gtk+" (package-inputs libcanberra))
+              ("gtk+" ,gtk+-2)))))
+
 (define-public sound-theme-freedesktop
   (package
     (name "sound-theme-freedesktop")
-- 
2.7.0

Re: [PATCH] gnu: Add libcanberra-gtk2.

[Andreas Enge]

Hello,

this looks good to me. However, the package now cannot be installed together
with the "normal" libcanberra package, as both contain
lib/libcanberra.so.0.2.5. I suppose that is okay?

Would you mind sending a patch formatted with "git format-patch", after
committing to a local branch with the usual commit message? Then your
authorship will be preserved to posterity; otherwise I would look like
the author when I push.

And I suppose there will be more patches from you, so it is probably
worth the effort to get used to this workflow!

Thanks,

Andreas

Re: [PATCH] gnu: Add libcanberra-gtk2.

[Efraim Flashner]

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

On Sun, 7 Feb 2016 15:03:39 +0100
Andreas Enge <andreas@enge.fr> wrote:

> Hello,
> 
> this looks good to me. However, the package now cannot be installed together
> with the "normal" libcanberra package, as both contain
> lib/libcanberra.so.0.2.5. I suppose that is okay?

I assume this package wouldn't normally actually be installed in a user's
profile, but I haven't worked much with gtk.

> Would you mind sending a patch formatted with "git format-patch", after
> committing to a local branch with the usual commit message? Then your
> authorship will be preserved to posterity; otherwise I would look like
> the author when I push.

If you go to save the entire email it can be applied as a patch, otherwise it
fails, like I learned last week. 

> And I suppose there will be more patches from you, so it is probably
> worth the effort to get used to this workflow!
> 
> Thanks,
> 
> Andreas
> 

-Efraim

-- 
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: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] gnu: Add libcanberra-gtk2.

[Andreas Enge]

On Sun, Feb 07, 2016 at 04:25:49PM +0200, Efraim Flashner wrote:
> If you go to save the entire email it can be applied as a patch, otherwise it
> fails, like I learned last week. 

Oh I see, I did this and pushed. The e-mail content itself can be applied
with "patch -p1", but for "git am", one indeed needs the full mail.

Thanks!

Andreas

Re: [PATCH] gnu: Add libcanberra-gtk2.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> On Sat,  6 Feb 2016 19:48:44 +0100
> Fabian Harfert <fhmgufs@web.de> wrote:
>
>> * gnu/packages/libcanberra.scm (libcanberra/gtk+-2): New variable.

[...]

>> +(define-public libcanberra/gtk+-2
>> +  (package (inherit libcanberra)
>> +    (name "libcanberra-gtk2")
>> +    (inputs
>> +     `(("alsa-lib" ,alsa-lib)
>> +       ("gstreamer" ,gstreamer)
>> +       ("gtk+" ,gtk+-2)
>> +       ("libltdl" ,libltdl)
>> +       ("libvorbis" ,libvorbis)
>> +       ("pulseaudio" ,pulseaudio)
>> +       ("udev" ,eudev)
>> +       ("sound-theme-freedesktop" ,sound-theme-freedesktop)))))
>> +
>>  (define-public sound-theme-freedesktop
>>    (package
>>      (name "sound-theme-freedesktop")
>
> gtk is the only different input between the two variants, how about just
> removing gtk from the list of inherited inputs and adding in gtk+-2?

Agreed.  Fabian: could you send an updated patch?  If you prefer one of
us could adjust your patch to do that.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add libcanberra-gtk2.

[Andreas Enge]

On Sun, Feb 07, 2016 at 09:15:10PM +0100, Ludovic Courtès wrote:
> Agreed.  Fabian: could you send an updated patch?  If you prefer one of
> us could adjust your patch to do that.

Already done, received, and I pushed it. So many messages recently!

Andreas