[PATCH 1/3] gnu: libxfce4ui: Build with GTK+ 3 support.

[PATCH 1/3] gnu: libxfce4ui: Build with GTK+ 3 support.

[宋文武]

* gnu/packages/xfce.scm (libxfce4ui)[propagated-inputs]: Add gtk+.
---
 gnu/packages/xfce.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 2cbdeef..992ffea 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -146,8 +146,9 @@ storage system.")
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
     (propagated-inputs
-     ;; libxfce4kbd-private-2.pc refers to all these.
-     `(("gtk+" ,gtk+-2)
+     `(("gtk+-2" ,gtk+-2)  ; required by libxfce4ui-1.pc
+       ("gtk+-3" ,gtk+)    ; required by libxfce4ui-2.pc
+       ;; libxfce4kbd-private-2.pc refers to all these.
        ("libxfce4util" ,libxfce4util)
        ("xfconf" ,xfconf)))
     (inputs `(("libsm" ,libsm)
-- 
2.4.3

[PATCH 2/3] gnu: xfce4-panel: Build with GTK+ 3 support.

[宋文武]

* gnu/packages/xfce.scm (xfce4-panel)[arguments]: New field.
---
 gnu/packages/xfce.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 992ffea..bc6d47a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -268,6 +268,8 @@ management D-Bus specification.")
                 "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih"))
               (patches (list (search-patch "xfce4-panel-plugins.patch")))))
     (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags '("--enable-gtk3")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
-- 
2.4.3

Re: [PATCH 2/3] gnu: xfce4-panel: Build with GTK+ 3 support.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> * gnu/packages/xfce.scm (xfce4-panel)[arguments]: New field.

LGTM.

Ludo'.

[PATCH 3/3] gnu: Add xfce4-pulseaudio-plugin.

[宋文武]

* gnu/packages/xfce.scm (xfce4-pulseaudio-plugin): New variable.
---
 gnu/packages/xfce.scm | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index bc6d47a..bdb5235 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -38,7 +38,8 @@
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages photo)
-  #:use-module (gnu packages pcre))
+  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages pulseaudio))
 
 (define-public gtk-xfce-engine
   (package
@@ -352,6 +353,37 @@ handle text and images, and has a feature to execute actions on specific text by
 matching them against regular expressions.")
     (license (list gpl2+))))
 
+(define-public xfce4-pulseaudio-plugin
+  (package
+    (name "xfce4-pulseaudio-plugin")
+    (version "0.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  name "/" (version-major+minor version) "/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0crvb2gyxbnlf46712arg3m2vqx81dixqhqdwss0bngpijy3ca78"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("exo" ,exo)
+       ("libnotify" ,libnotify)
+       ("libxfce4ui" ,libxfce4ui)
+       ("pulseaudio" ,pulseaudio)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page "http://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/")
+    (synopsis "PulseAudio panel plugin for Xfce")
+    (description
+     "Xfce PulseAudio plugin is a plugin for the Xfce panel which provides a
+convenient way to adjust the audio volume of the PulseAudio sound system and
+to an auto mixer tool like pavucontrol.  It can optionally handle multimedia
+keys for controlling the audio volume.")
+    (license gpl2+)))
+
 (define-public xfce4-appfinder
   (package
     (name "xfce4-appfinder")
-- 
2.4.3

Re: [PATCH 3/3] gnu: Add xfce4-pulseaudio-plugin.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> * gnu/packages/xfce.scm (xfce4-pulseaudio-plugin): New variable.

LGTM, thanks!

Ludo'.

Re: [PATCH 1/3] gnu: libxfce4ui: Build with GTK+ 3 support.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> * gnu/packages/xfce.scm (libxfce4ui)[propagated-inputs]: Add gtk+.

[...]

> +     `(("gtk+-2" ,gtk+-2)  ; required by libxfce4ui-1.pc
> +       ("gtk+-3" ,gtk+)    ; required by libxfce4ui-2.pc

Should we keep just GTK+3?  What happens when both are provided, are two
variants being built?

Thanks,
Ludo’.

Re: [PATCH 1/3] gnu: libxfce4ui: Build with GTK+ 3 support.

[宋文武]

Ludovic Courtès <ludo@gnu.org> writes:

> 宋文武 <iyzsong@gmail.com> skribis:
>
>> * gnu/packages/xfce.scm (libxfce4ui)[propagated-inputs]: Add gtk+.
>
> [...]
>
>> +     `(("gtk+-2" ,gtk+-2)  ; required by libxfce4ui-1.pc
>> +       ("gtk+-3" ,gtk+)    ; required by libxfce4ui-2.pc
>
> Should we keep just GTK+3?  What happens when both are provided, are two
> variants being built?
Yes, libxfce4ui will built as 2 version (libxfce4ui-1.so and libxfce4ui-2.so).
Xfce is still targeted at GTK+ 2, with only few components support GTK+ 3.