[PATCH 01/15] gnu: Add gtk-xfce-engine.

[PATCH 01/15] gnu: Add gtk-xfce-engine.

[宋文武]

* gnu/packages/xfce.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am         |  1 +
 gnu/packages/xfce.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 gnu/packages/xfce.scm

diff --git a/gnu-system.am b/gnu-system.am
index e923340..2854fb5 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -279,6 +279,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/xnee.scm				\
   gnu/packages/xdisorg.scm			\
   gnu/packages/xorg.scm				\
+  gnu/packages/xfce.scm				\
   gnu/packages/yasm.scm				\
   gnu/packages/yubico.scm			\
   gnu/packages/zile.scm				\
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
new file mode 100644
index 0000000..696fffe
--- /dev/null
+++ b/gnu/packages/xfce.scm
@@ -0,0 +1,48 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Sou Bunnbu <iyzsong@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 xfce)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gtk))
+
+(define-public gtk-xfce-engine
+  (package
+    (name "gtk-xfce-engine")
+    (version "3.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "13c3ajfqkdr6jlqjyhcp4nls0ddanypr83q9qib2ciffik78zq4h"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs `(("gtk+" ,gtk+-2)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "GTK+ theme engine for Xfce")
+    (description
+     "Default GTK+ engine and themes for Xfce Desktop Environment.")
+    (license gpl2+)))
-- 
2.1.2

[PATCH 02/15] gnu: Add libxfce4util.

[宋文武]

* gnu/packages/xfce.scm (libxfce4util): New variable.
---
 gnu/packages/xfce.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 696fffe..b08984c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -46,3 +46,26 @@
     (description
      "Default GTK+ engine and themes for Xfce Desktop Environment.")
     (license gpl2+)))
+
+(define-public libxfce4util
+  (package
+    (name "libxfce4util")
+    (version "4.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (propagated-inputs `(("glib" ,glib)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "Basic utility library for Xfce")
+    (description
+     "A general-purpose utility library with core application support for the
+Xfce Desktop Environment.")
+    (license lgpl2.0+)))
-- 
2.1.2

Re: [PATCH 02/15] gnu: Add libxfce4util.

[Ludovic Courtès]

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

> * gnu/packages/xfce.scm (libxfce4util): New variable.

OK

[PATCH 03/15] gnu: Add xfconf.

[宋文武]

* gnu/packages/xfce.scm (xfconf): New variable.
---
 gnu/packages/xfce.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index b08984c..3c60b5c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -69,3 +69,31 @@
      "A general-purpose utility library with core application support for the
 Xfce Desktop Environment.")
     (license lgpl2.0+)))
+
+(define-public xfconf
+  (package
+    (name "xfconf")
+    (version "4.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("dbus" ,dbus)
+       ("dbus-glib" ,dbus-glib)))
+    (inputs
+     `(("libxfce4util" ,libxfce4util)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "Configuration storage and query system for Xfce")
+    (description
+     "Settings daemon for Xfce, implemented as a D-Bus-based configuration
+storage system.")
+    (license lgpl2.0+)))
-- 
2.1.2

Re: [PATCH 03/15] gnu: Add xfconf.

[Ludovic Courtès]

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

> * gnu/packages/xfce.scm (xfconf): New variable.

[...]

> +    (propagated-inputs
> +     `(("glib" ,glib)
> +       ("dbus" ,dbus)
> +       ("dbus-glib" ,dbus-glib)))

Please add a comment stating why it’s propagated.

OK with this change.

Ludo’.

Re: [PATCH 03/15] gnu: Add xfconf.

[Mark H Weaver]

宋文武 <iyzsong@gmail.com> writes:
> * gnu/packages/xfce.scm (xfconf): New variable.

This failed to build on i686-linux.  For details and build log, see:

  http://hydra.gnu.org/build/173095

Could you look into it?

     Mark

Re: [PATCH 03/15] gnu: Add xfconf.

[宋文武]

Mark H Weaver <mhw@netris.org> writes:

> 宋文武 <iyzsong@gmail.com> writes:
>> * gnu/packages/xfce.scm (xfconf): New variable.
>
> This failed to build on i686-linux.  For details and build log, see:
>
>   http://hydra.gnu.org/build/173095
>
> Could you look into it?
Disable parallel tests does the trick for me, pushed, thanks for notifying.
>
>      Mark

[PATCH 04/15] gnu: Add libxfce4ui.

[宋文武]

* gnu/packages/xfce.scm (libxfce4ui): New variable.
---
 gnu/packages/xfce.scm | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 3c60b5c..554548c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -23,7 +23,9 @@
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages glib)
-  #:use-module (gnu packages gtk))
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xdisorg))
 
 (define-public gtk-xfce-engine
   (package
@@ -97,3 +99,32 @@ Xfce Desktop Environment.")
      "Settings daemon for Xfce, implemented as a D-Bus-based configuration
 storage system.")
     (license lgpl2.0+)))
+
+(define-public libxfce4ui
+  (package
+    (name "libxfce4ui")
+    (version "4.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (propagated-inputs
+     `(("gtk+" ,gtk+-2)
+       ("libxfce4util" ,libxfce4util)
+       ("xfconf" ,xfconf)))
+    (inputs `(("libsm" ,libsm)
+              ("libice" ,libice)
+              ("startup-notification" ,startup-notification)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "Widgets library for Xfce")
+    (description
+     "Libxfce4ui is the replacement of the old libxfcegui4 library.  It is used
+to share commonly used Xfce widgets amoung the Xfce applications.")
+    (license lgpl2.0+)))
-- 
2.1.2

Re: [PATCH 04/15] gnu: Add libxfce4ui.

[Ludovic Courtès]

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

> * gnu/packages/xfce.scm (libxfce4ui): New variable.

[...]

> +    (propagated-inputs
> +     `(("gtk+" ,gtk+-2)
> +       ("libxfce4util" ,libxfce4util)
> +       ("xfconf" ,xfconf)))

Comment as well.

Otherwise OK.

Ludo’.

[PATCH 05/15] gnu: Add exo.

[宋文武]

* gnu/packages/xfce.scm (exo): New variable.
---
 gnu/packages/xfce.scm | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 554548c..3954d1d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -25,7 +25,8 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages xdisorg))
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages web))
 
 (define-public gtk-xfce-engine
   (package
@@ -128,3 +129,33 @@ storage system.")
      "Libxfce4ui is the replacement of the old libxfcegui4 library.  It is used
 to share commonly used Xfce widgets amoung the Xfce applications.")
     (license lgpl2.0+)))
+
+(define-public exo
+  (package
+    (name "exo")
+    (version "0.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1c05pbagw14djv5zmqg34qfj40jav8sd10w2zi2wpzrad4qal8bf"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (propagated-inputs
+     `(("gtk+" ,gtk+-2)
+       ("libxfce4util" ,libxfce4util)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("perl-uri" ,perl-uri)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "Extension library for Xfce")
+    (description
+     "An extension library to Xfce, developed by os-cillation.  While Xfce comes
+with quite a few libraries that are targeted at desktop development, libexo is
+targeted at application development.")
+    ;; Libraries are under LGPLv2+, and programs under GPLv2+.
+    (license (list gpl2+ lgpl2.1+))))
-- 
2.1.2

Re: [PATCH 05/15] gnu: Add exo.

[Ludovic Courtès]

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

> * gnu/packages/xfce.scm (exo): New variable.

[...]

> +    (propagated-inputs
> +     `(("gtk+" ,gtk+-2)
> +       ("libxfce4util" ,libxfce4util)))

Ditto.

> +    (description
> +     "An extension library to Xfce, developed by os-cillation.  While Xfce comes

What’s “os-cillation”?  Better to leave it out maybe?

Otherwise OK.

Ludo’.

[PATCH 06/15] gnu: Add garcon.

[宋文武]

* gnu/packages/xfce.scm (garcon): New variable.
---
 gnu/packages/xfce.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 3954d1d..01e86aa 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -159,3 +159,30 @@ with quite a few libraries that are targeted at desktop development, libexo is
 targeted at application development.")
     ;; Libraries are under LGPLv2+, and programs under GPLv2+.
     (license (list gpl2+ lgpl2.1+))))
+
+(define-public garcon
+  (package
+    (name "garcon")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0v7pkvxcayi86z4f173z5l7w270f3g369sa88z59w0y0p7ns7ph2"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)
+       ("glib:bin" ,glib "bin")))
+    (propagated-inputs `(("glib" ,glib)))
+    (inputs `(("libxfce4util" ,libxfce4util)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "Implementation of the freedesktop.org menu specification")
+    (description
+     "Garcon is a freedesktop.org compliant menu implementation based on
+GLib and GIO.  It was started as a complete rewrite of the former Xfce menu
+library called libxfce4menu, which, in contrast to garcon, was lacking menu
+merging features essential for loading menus modified with menu editors.")
+    (license lgpl2.0+)))
-- 
2.1.2

[PATCH 07/15] gnu: Add tumbler.

[宋文武]

* gnu/packages/xfce.scm (tumbler): New variable.
---
 gnu/packages/xfce.scm | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 01e86aa..3200993 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -26,7 +26,11 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages web))
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages pdf)
+  #:use-module (gnu packages gstreamer))
 
 (define-public gtk-xfce-engine
   (package
@@ -186,3 +190,38 @@ GLib and GIO.  It was started as a complete rewrite of the former Xfce menu
 library called libxfce4menu, which, in contrast to garcon, was lacking menu
 merging features essential for loading menus modified with menu editors.")
     (license lgpl2.0+)))
+
+(define-public tumbler
+  (package
+    (name "tumbler")
+    (version "0.1.25")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0ijm04vm75gmhyyzrlqdr6vzchr01hlajcm84lm6j64cim8dxm82"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)
+       ("glib:bin" ,glib "bin") ; need glib-genmarshal
+       ("dbus-glib" ,dbus-glib))) ; need dbus-binding-tool
+    (propagated-inputs
+     `(("glib" ,glib)))
+    (inputs
+     `(("dbus" ,dbus)
+       ("gdk-pixbuf" ,gdk-pixbuf)
+       ("freetype" ,freetype)
+       ("libjpeg" ,libjpeg)
+       ("libgsf" ,libgsf)
+       ("poppler" ,poppler)
+       ("gstreamer" ,gstreamer-0.10)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "D-Bus service for applications to request thumbnails")
+    (description
+     "Tumbler is a D-Bus service for applications to request thumbnails for
+various URI schemes and MIME types.  It is an implementation of the thumbnail
+management D-Bus specification.")
+    (license gpl2+)))
-- 
2.1.2

Re: [PATCH 07/15] gnu: Add tumbler.

[Ludovic Courtès]

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

> * gnu/packages/xfce.scm (tumbler): New variable.

[...]

> +    (propagated-inputs
> +     `(("glib" ,glib)))

Ditto.

Otherwise OK.

Ludo’.

[PATCH 08/15] gnu: Add xfce4-panel.

[宋文武]

* gnu/packages/xfce.scm (xfce4-panel): New variable.
---
 gnu/packages/xfce.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 3200993..2f63562 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -225,3 +225,33 @@ merging features essential for loading menus modified with menu editors.")
 various URI schemes and MIME types.  It is an implementation of the thumbnail
 management D-Bus specification.")
     (license gpl2+)))
+
+(define-public xfce4-panel
+  (package
+    (name "xfce4-panel")
+    (version "4.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1f8903nx6ivzircl8d8s9zna4vjgfy0qhjk5d2x19g9bmycgj89k"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (propagated-inputs
+     `(("libxfce4util" ,libxfce4util)))
+    (inputs
+     `(("exo" ,exo)
+       ("garcon", garcon)
+       ("libwnck" ,libwnck-1)
+       ("libxfce4ui" ,libxfce4ui)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "XFCE Desktop Panel")
+    (description
+     "Desktop panel for Xfce, which contains program launchers, window buttons,
+applications menu, workspace switcher and more.")
+    ;; Libraries are under LGPLv2.1+, and programs under GPLv2+.
+    (license (list gpl2+ lgpl2.1+))))
-- 
2.1.2

Re: [PATCH 08/15] gnu: Add xfce4-panel.

[Ludovic Courtès]

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

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

[...]

> +    (propagated-inputs
> +     `(("libxfce4util" ,libxfce4util)))

Same.

Ludo’.

[PATCH 09/15] gnu: Add xfce4-appfinder.

[宋文武]

* gnu/packages/xfce.scm (xfce4-appfinder): New variable.
---
 gnu/packages/xfce.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 2f63562..f5f3fc9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -255,3 +255,28 @@ management D-Bus specification.")
 applications menu, workspace switcher and more.")
     ;; Libraries are under LGPLv2.1+, and programs under GPLv2+.
     (license (list gpl2+ lgpl2.1+))))
+
+(define-public xfce4-appfinder
+  (package
+    (name "xfce4-appfinder")
+    (version "4.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0falckrziw8m1a72nxd7fqq84r3xfbrb6lv35flsca346rzawah4"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("garcon" ,garcon)
+       ("libxfce4ui" ,libxfce4ui)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "XFCE Application Finder")
+    (description
+     "Application finder for Xfce, it will shows the applications installed on
+your system in categories, so you can quickly find and launch them.")
+    (license gpl2+)))
-- 
2.1.2

Re: [PATCH 09/15] gnu: Add xfce4-appfinder.

[Ludovic Courtès]

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

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

[...]

> +    (description
> +     "Application finder for Xfce, it will shows the applications installed on

Typo: “it will show”.

Otherwise OK.

Ludo’.

[PATCH 10/15] gnu: Add xfce4-session.

[宋文武]

* gnu/packages/xfce.scm (xfce4-session): New variable.
---
 gnu/packages/xfce.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index f5f3fc9..5f15594 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -280,3 +280,33 @@ applications menu, workspace switcher and more.")
      "Application finder for Xfce, it will shows the applications installed on
 your system in categories, so you can quickly find and launch them.")
     (license gpl2+)))
+
+(define-public xfce4-session
+  (package
+    (name "xfce4-session")
+    (version "4.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1kj65jkjhd0ysf0yxsf88wzpyv6n8i8qgd3gb502hf1x9jksk2mv"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags
+       (list (string-append "--with-xsession-prefix=" %output))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("iceauth" ,iceauth)
+       ("libsm" ,libsm)
+       ("libwnck" ,libwnck-1)
+       ("libxfce4ui" ,libxfce4ui)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "XFCE Session Manager")
+    (description
+     "Session manager for Xfce, it will restores your session on startup and
+allows you to shutdown the computer from Xfce.")
+    (license gpl2+)))
-- 
2.1.2

Re: [PATCH 10/15] gnu: Add xfce4-session.

[Ludovic Courtès]

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

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

[...]

> +    (description
> +     "Session manager for Xfce, it will restores your session on startup and

Typo: “it will restore”.

Otherwise OK.

[PATCH 11/15] gnu: Add xfce4-settings.

[宋文武]

* gnu/packages/xfce.scm (xfce4-settings): New variable.
---
 gnu/packages/xfce.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5f15594..c601852 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -310,3 +310,33 @@ your system in categories, so you can quickly find and launch them.")
      "Session manager for Xfce, it will restores your session on startup and
 allows you to shutdown the computer from Xfce.")
     (license gpl2+)))
+
+(define-public xfce4-sesttings
+  (package
+    (name "xfce4-settings")
+    (version "4.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0zppq747z9lrxyv5zrrvpalq7hb3gfhy9p7qbldisgv7m6dz0hq8"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("exo" ,exo)
+       ("garcon" ,garcon)
+       ("libnotify" ,libnotify)
+       ("libxcursor", libxcursor)
+       ("libxi" ,libxi)
+       ("libxrandr" ,libxrandr)
+       ("libxfce4ui" ,libxfce4ui)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "XFCE Settings Manager")
+    (description
+     "Settings manager for Xfce, it can control various aspects of the desktop
+like appearance, display, keyboard and mouse settings.")
+    (license gpl2+)))
-- 
2.1.2

Re: [PATCH 11/15] gnu: Add xfce4-settings.

[Ludovic Courtès]

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

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

OK

Re: [PATCH 11/15] gnu: Add xfce4-settings.

[Mark H Weaver]

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

> * gnu/packages/xfce.scm (xfce4-settings): New variable.
> ---
>  gnu/packages/xfce.scm | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index 5f15594..c601852 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -310,3 +310,33 @@ your system in categories, so you can quickly find and launch them.")
>       "Session manager for Xfce, it will restores your session on startup and
>  allows you to shutdown the computer from Xfce.")
>      (license gpl2+)))
> +
> +(define-public xfce4-sesttings

The variable name above has a typo:
  'xfce4-sesttings' ->
  'xfce4-settings'.

> +  (package
> +    (name "xfce4-settings")
> +    (version "4.10.0")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
> +                                  name "-" version ".tar.bz2"))

Instead of putting "4.10" directly in the string above, how about this:

    (uri (string-append "http://archive.xfce.org/xfce/"
                        (version-major+minor version)
                        "/src/" name "-" version ".tar.bz2"))

This way, when the package is updated to a new version, there will be
one less thing to change.  The same change could be made to many of your
other xfce packages.

'version-major+minor' is in the (guix utils) module, so you'll need to
add that to the import list.

Thanks for working on this!

      Mark

Re: [PATCH 11/15] gnu: Add xfce4-settings.

[宋文武]

Mark H Weaver <mhw@netris.org> writes:

> 宋文武 <iyzsong@gmail.com> writes:
>
>> * gnu/packages/xfce.scm (xfce4-settings): New variable.
>> ---
>>  gnu/packages/xfce.scm | 30 ++++++++++++++++++++++++++++++
>>  1 file changed, 30 insertions(+)
>>
>> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
>> index 5f15594..c601852 100644
>> --- a/gnu/packages/xfce.scm
>> +++ b/gnu/packages/xfce.scm
>> @@ -310,3 +310,33 @@ your system in categories, so you can quickly find and launch them.")
>>       "Session manager for Xfce, it will restores your session on startup and
>>  allows you to shutdown the computer from Xfce.")
>>      (license gpl2+)))
>> +
>> +(define-public xfce4-sesttings
>
> The variable name above has a typo:
>   'xfce4-sesttings' ->
>   'xfce4-settings'.
Oh
>
>> +  (package
>> +    (name "xfce4-settings")
>> +    (version "4.10.0")
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
>> +                                  name "-" version ".tar.bz2"))
>
> Instead of putting "4.10" directly in the string above, how about this:
>
>     (uri (string-append "http://archive.xfce.org/xfce/"
>                         (version-major+minor version)
>                         "/src/" name "-" version ".tar.bz2"))
>
> This way, when the package is updated to a new version, there will be
> one less thing to change.  The same change could be made to many of your
> other xfce packages.
>
> 'version-major+minor' is in the (guix utils) module, so you'll need to
> add that to the import list.
Adjusted, thanks for review!
>
> Thanks for working on this!
>
>       Mark

[PATCH 12/15] gnu: Add thunar.

[宋文武]

* gnu/packages/xfce.scm (thunar): New variable.
---
 gnu/packages/xfce.scm | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index c601852..8955c0f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -30,7 +30,10 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages pdf)
-  #:use-module (gnu packages gstreamer))
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages photo)
+  #:use-module (gnu packages pcre))
 
 (define-public gtk-xfce-engine
   (package
@@ -340,3 +343,34 @@ allows you to shutdown the computer from Xfce.")
      "Settings manager for Xfce, it can control various aspects of the desktop
 like appearance, display, keyboard and mouse settings.")
     (license gpl2+)))
+
+(define-public thunar
+  (package
+    (name "thunar")
+    (version "1.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  "Thunar-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1fn8wjzkfvnx2giv3rrg2cyrr2c96f9mskgvcji0ixyfcjga249c"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("exo" ,exo)
+       ("gudev", eudev)
+       ("libexif" ,libexif)
+       ("libnotify" ,libnotify)
+       ("libxfce4ui" ,libxfce4ui)
+       ("pcre" ,pcre)
+       ("xfce4-panel" ,xfce4-panel)
+       ("startup-notification" ,startup-notification)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "XFCE File Manager")
+    (description
+     "A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use
+and fast.")
+    (license gpl2+)))
-- 
2.1.2

Re: [PATCH 12/15] gnu: Add thunar.

[Ludovic Courtès]

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

> * gnu/packages/xfce.scm (thunar): New variable.

[...]

> +    (synopsis "XFCE File Manager")

Spell as “Xfce” for consistency.

> +    (description
> +     "A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use

Rather: “for graphical desktop environments”.

Otherwise OK.

Ludo’.

[PATCH 13/15] gnu: Add thunar-volman.

[宋文武]

* gnu/packages/xfce.scm (thunar-volman): New variable.
---
 gnu/packages/xfce.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 8955c0f..f32c250 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -374,3 +374,33 @@ like appearance, display, keyboard and mouse settings.")
      "A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use
 and fast.")
     (license gpl2+)))
+
+(define-public thunar-volman
+  (package
+    (name "thunar-volman")
+    (version "0.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("exo" ,exo)
+       ("gudev" ,eudev)
+       ("libnotify" ,libnotify)
+       ("libxfce4ui" ,libxfce4ui)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "Removeable media manager for Thunar")
+    (description
+     "Thunar-volman is an extension for the Thunar File Manager, which enables
+automatic management of removable drives and media.  For example, if
+thunar-volman is installed and configured properly, and you plug in your
+digitcal camera, it will automatically spawn your preferred photo application
+and import the new pictures from your camera.")
+    (license gpl2+)))
-- 
2.1.2

Re: [PATCH 13/15] gnu: Add thunar-volman.

[Ludovic Courtès]

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

> * gnu/packages/xfce.scm (thunar-volman): New variable.

[...]

> +    (synopsis "Removeable media manager for Thunar")

“Removable”

Otherwise OK.

Ludo’.

[PATCH 14/15] gnu: Add xfwm4.

[宋文武]

* gnu/packages/xfce.scm (xfwm4): New variable.
---
 gnu/packages/xfce.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index f32c250..5f2d581 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -404,3 +404,30 @@ thunar-volman is installed and configured properly, and you plug in your
 digitcal camera, it will automatically spawn your preferred photo application
 and import the new pictures from your camera.")
     (license gpl2+)))
+
+(define-public xfwm4
+  (package
+    (name "xfwm4")
+    (version "4.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "170zzs7adj47srsi2cl723w9pl8k8awd7w1bpzxby7hj92zmf8s9"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("libwnck", libwnck-1)
+       ("libxfce4ui" ,libxfce4ui)
+       ("libxrandr" ,libxrandr)
+       ("libxcomposite" ,libxcomposite)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "XFCE Window Manager")
+    (description
+     "Window manager for Xfce, it handles the placement of windows
+on the screen.")
+    (license gpl2+)))
-- 
2.1.2

Re: [PATCH 14/15] gnu: Add xfwm4.

[Ludovic Courtès]

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

> * gnu/packages/xfce.scm (xfwm4): New variable.

[...]

> +    (synopsis "XFCE Window Manager")

“Xfce window manager”.

Otherwise OK.

Ludo’.

[PATCH 15/15] gnu: Add xfdesktop.

[宋文武]

* gnu/packages/xfce.scm (xfdesktop): New variable.
---
 gnu/packages/xfce.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5f2d581..d53c5cf 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -431,3 +431,33 @@ and import the new pictures from your camera.")
      "Window manager for Xfce, it handles the placement of windows
 on the screen.")
     (license gpl2+)))
+
+(define-public xfdesktop
+  (package
+    (name "xfdesktop")
+    (version "4.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/xfce/4.10/src/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0yrddj1lgk3xn4w340y89z7x2isks72ia36pka08kk2x8gpfcyl9"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("exo" ,exo)
+       ("garcon" ,garcon)
+       ("libnotify" ,libnotify)
+       ("libwnck" ,libwnck-1)
+       ("libxfce4ui" ,libxfce4ui)
+       ("thunar" ,thunar)))
+    (home-page "http://www.xfce.org/")
+    (synopsis "XFCE Desktop Manager")
+    (description
+     "Desktop manager for Xfce, it sets the background color or image with
+optional application menu or icons for minimized applications or launchers,
+devices and folders.")
+    (license gpl2+)))
-- 
2.1.2

Re: [PATCH 15/15] gnu: Add xfdesktop.

[Ludovic Courtès]

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

> * gnu/packages/xfce.scm (xfdesktop): New variable.

[...]

> +    (synopsis "XFCE Desktop Manager")

“Xfce desktop manager”, otherwise OK.

Thanks a lot for working on it!  It will be useful to many, I guess.

Ludo’.

Re: [PATCH 15/15] gnu: Add xfdesktop.

[宋文武]

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

> 宋文武 <iyzsong@gmail.com> skribis:
>
>> * gnu/packages/xfce.scm (xfdesktop): New variable.
>
> [...]
>
>> +    (synopsis "XFCE Desktop Manager")
>
> “Xfce desktop manager”, otherwise OK.
>
> Thanks a lot for working on it!  It will be useful to many, I guess.
Pushed, thanks for review!
>
> Ludo’.

Re: [PATCH 01/15] gnu: Add gtk-xfce-engine.

[Ludovic Courtès]

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

> * gnu/packages/xfce.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.

OK.

Ludo’.