[PATCH 0/7] Add LXDE packages.

[PATCH 0/7] Add LXDE packages.

[Mathieu Lirzin]

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


Here is a first batch of LXDE packages.  More to come soon ;)

You will see a little mess in the libfm patch which is a consequence of a
bootstrap problem between menu-cache and libfm which is describe like this in
the README file of menu-cache.
  
   Since version 0.7.0 the Libmenu-cache requires Libfm-extra for the
   menu-cache-gen menu cache generation binary. Since Libfm depends on
   Libmenu-cache, there is some hint for bootstrapers how to build those
   libraries together: you need create Libfm-extra first, you can easily
   do this by passing '--with-extra-only' option to configure script and
   installing Libfm-extra. Then you can succesfully build Libmenu-cache
   and therefore build full version of Libfm.


Mathieu Lirzin (7):
  gnu: Add libfm-extra.
  gnu: Add menu-cache.
  gnu: Add libfm.
  gnu: Add pcmanfm.
  gnu: Add lxterminal.
  gnu: Add lxtask.
  gnu: Add lxrandr.

 gnu/packages/lxde.scm | 169 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 168 insertions(+), 1 deletion(-)

-- 
2.1.4

[PATCH 1/7] gnu: Add libfm-extra.

[Mathieu Lirzin]

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


* gnu/packages/lxde.scm (libfm-extra): New variable.
---
 gnu/packages/lxde.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-libfm-extra.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-libfm-extra.patch", Size: 1721 bytes --]

diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index cf837f5..29e1f36 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -17,6 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages lxde)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages pkg-config)
@@ -25,6 +26,31 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages))
 
+(define-public libfm-extra
+  (package
+    (name "libfm-extra")
+    (version "1.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/project/pcmanfm/"
+                                  "PCManFM%20%2B%20Libfm%20%28tarball%20"
+                                  "release%29/LibFM/libfm-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1ygvw52262r3jp1f45m9cdpx5xgvd4rkyfszslfqvg2c99ig34n6"))))
+    (build-system gnu-build-system)
+    (arguments '(#:configure-flags '("--with-extra-only")))
+    (inputs `(("glib" ,glib)))
+    (native-inputs `(("intltool"   ,intltool)
+                     ("libtool"    ,libtool)
+                     ("pkg-config" ,pkg-config)))
+    (synopsis "File management support (extra library)")
+    (description "LibFM provides file management functions built on top of
+Glib/GIO giving a higher-level API.  This package contains standalone library
+which extends libfm.")
+    (home-page "http://lxde.org")
+    (license license:gpl2+)))
+
 (define-public lxappearance
   (package
     (name "lxappearance")

[PATCH 2/7] gnu: Add menu-cache.

[Mathieu Lirzin]

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


* gnu/packages/lxde.scm (menu-cache): New variable.
---
 gnu/packages/lxde.scm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-menu-cache.patch --]
[-- Type: text/x-patch; name="0002-gnu-Add-menu-cache.patch", Size: 1569 bytes --]

diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index 29e1f36..1d3a9ea 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -24,7 +24,8 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages))
+  #:use-module (guix packages)
+  #:use-module (guix utils))
 
 (define-public libfm-extra
   (package
@@ -72,4 +73,26 @@ able to change themes, icons, and fonts used by GTK+ applications.")
     (home-page "http://lxde.org")
     (license license:gpl2+)))
 
+(define-public menu-cache
+  (package
+    (name "menu-cache")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/project/lxde/" name "/"
+                                  (version-major+minor version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1bws84fiwk3anp30hcr0lw1xw5cgp44x5ik2yv2ijcgxpcvz8zgz"))))
+    (build-system gnu-build-system)
+    (inputs `(("glib"  ,glib)
+              ("libfm" ,libfm-extra)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (synopsis "LXDE implementation of the freedesktop menu's cache")
+    (description "Menu-cache is a library creating and utilizing caches to
+speed up the access to freedesktop.org defined application menus.")
+    (home-page "http://lxde.org")
+    (license license:lgpl2.1+)))
+
 ;;; lxde.scm ends here

[PATCH 3/7] gnu: Add libfm.

[Mathieu Lirzin]

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


* gnu/packages/lxde.scm (libfm): New variable.
  (libfm-extra): Inherit from it.
---
 gnu/packages/lxde.scm | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-gnu-Add-libfm.patch --]
[-- Type: text/x-patch; name="0003-gnu-Add-libfm.patch", Size: 2716 bytes --]

diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index 1d3a9ea..bd078ff 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -19,6 +19,7 @@
 (define-module (gnu packages lxde)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages pkg-config)
   #:use-module (guix build-system gnu)
@@ -27,30 +28,44 @@
   #:use-module (guix packages)
   #:use-module (guix utils))
 
-(define-public libfm-extra
+(define-public libfm
   (package
-    (name "libfm-extra")
+    (name "libfm")
     (version "1.2.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/project/pcmanfm/"
-                                  "PCManFM%20%2B%20Libfm%20%28tarball%20"
-                                  "release%29/LibFM/libfm-" version ".tar.xz"))
+                                  "PCManFM%20%2B%20Libfm%20%28tarball%20release"
+                                  "%29/LibFM/" name "-" version ".tar.xz"))
               (sha256
                (base32
                 "1ygvw52262r3jp1f45m9cdpx5xgvd4rkyfszslfqvg2c99ig34n6"))))
     (build-system gnu-build-system)
+    (inputs `(("glib" ,glib)
+              ("gtk+" ,gtk+-2)))
+    (native-inputs `(("intltool"   ,intltool)
+                     ("glib"       ,glib "bin") ; for gtester
+                     ("libtool"    ,libtool)
+                     ("menu-cache" ,menu-cache)
+                     ("pkg-config" ,pkg-config)
+                     ("vala"       ,vala)))
+    (synopsis "File management support (core library)")
+    (description "LibFM provides file management functions built on top of
+Glib/GIO giving a higher-level API.")
+    (home-page "http://lxde.org")
+    (license license:gpl2+)))
+
+(define-public libfm-extra
+  (package (inherit libfm)
+    (name "libfm-extra")
     (arguments '(#:configure-flags '("--with-extra-only")))
     (inputs `(("glib" ,glib)))
     (native-inputs `(("intltool"   ,intltool)
                      ("libtool"    ,libtool)
                      ("pkg-config" ,pkg-config)))
     (synopsis "File management support (extra library)")
-    (description "LibFM provides file management functions built on top of
-Glib/GIO giving a higher-level API.  This package contains standalone library
-which extends libfm.")
-    (home-page "http://lxde.org")
-    (license license:gpl2+)))
+    (description (string-append (package-description libfm) "  This package
+contains standalone library which extends libfm."))))
 
 (define-public lxappearance
   (package

[PATCH 4/7] gnu: Add pcmanfm.

[Mathieu Lirzin]

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


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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0004-gnu-Add-pcmanfm.patch --]
[-- Type: text/x-patch; name="0004-gnu-Add-pcmanfm.patch", Size: 1776 bytes --]

diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index bd078ff..47d6627 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -22,6 +22,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xorg)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
@@ -110,4 +111,31 @@ speed up the access to freedesktop.org defined application menus.")
     (home-page "http://lxde.org")
     (license license:lgpl2.1+)))
 
+(define-public pcmanfm
+  (package
+    (name "pcmanfm")
+    (version "1.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/project/" name "/"
+                                  "PCManFM%20%2B%20Libfm%20%28tarball%20release"
+                                  "%29/PCManFM/" name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1033rw5jd7nlzbcdpx3bik7347kyh1sg1gkla424gq9vqqpxia6g"))))
+    (build-system gnu-build-system)
+    ;; (#:configure-flags '("--sysconfdir=/etc")) suggested in README.
+    (inputs `(("gtk+"   ,gtk+-2)
+              ;; TODO: add ("gvfs" ,gvfs).
+              ("libfm"  ,libfm)
+              ("libx11" ,libx11)))
+    (native-inputs `(("intltool"   ,intltool)
+                     ("libtool"    ,libtool)
+                     ("pkg-config" ,pkg-config)))
+    (synopsis "LXDE file manager")
+    (description "PCMan is a lightweight GTK+ based file manager, compliant
+with freedesktop.org standard.")
+    (home-page "http://lxde.org")
+    (license license:gpl2+)))
+
 ;;; lxde.scm ends here

[PATCH 5/7] gnu: Add lxterminal.

[Mathieu Lirzin]

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


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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0005-gnu-Add-lxterminal.patch --]
[-- Type: text/x-patch; name="0005-gnu-Add-lxterminal.patch", Size: 1514 bytes --]

diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index 47d6627..a8fb10a 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -89,6 +89,31 @@ able to change themes, icons, and fonts used by GTK+ applications.")
     (home-page "http://lxde.org")
     (license license:gpl2+)))
 
+(define-public lxterminal
+  (package
+    (name "lxterminal")
+    (version "0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/project/lxde/LXTerminal"
+                                  "%20%28terminal%20emulator%29/LXTerminal%20"
+                                  version "/" name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1brb506vmnncih8nyvlrckrrn6msbsvz2vwbm7bsqwigcnchwjqp"))))
+    (build-system gnu-build-system)
+    (inputs `(("gtk+" ,gtk+-2)
+              ("vte"  ,vte/gtk+-2)))
+    (native-inputs `(("intltool"   ,intltool)
+                     ("pkg-config" ,pkg-config)))
+    (synopsis "LXDE terminal emulator")
+    (description "LXTerminal is a VTE-based terminal emulator.  It supports
+multiple tabs and has only minimal dependencies thus being completely
+desktop-independent.  In order to reduce memory usage and increase the
+performance, all instances of the terminal are sharing a single process.")
+    (home-page "http://lxde.org")
+    (license license:gpl2+)))
+
 (define-public menu-cache
   (package
     (name "menu-cache")

[PATCH 6/7] gnu: Add lxtask.

[Mathieu Lirzin]

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


* gnu/packages/lxde.scm (lxtask): New variable.
---
 gnu/packages/lxde.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0006-gnu-Add-lxtask.patch --]
[-- Type: text/x-patch; name="0006-gnu-Add-lxtask.patch", Size: 1438 bytes --]

diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index a8fb10a..a28eb3f 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -89,6 +89,30 @@ able to change themes, icons, and fonts used by GTK+ applications.")
     (home-page "http://lxde.org")
     (license license:gpl2+)))
 
+(define-public lxtask
+  (package
+    (name "lxtask")
+    (version "0.1.6")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/project/lxde/LXTask"
+                                  "%20%28task%20manager%29/LXTask%20"
+                                  (version-major+minor version) ".x/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0ia3i430lpwgl2kch6sl1za8qf96wc4fkcv91yhdzgnzafcnm3gp"))))
+    (build-system gnu-build-system)
+    (inputs `(("gtk+" ,gtk+-2)))
+    (native-inputs `(("intltool"   ,intltool)
+                     ("pkg-config" ,pkg-config)))
+    (synopsis "LXDE task manager")
+    (description "LXTask is a lightweight task manager derived from Xfce task
+manager with all dependencies on Xfce removed.  LXTask is based on GTK+
+toolkit.  It allows monitoring and controlling of running processes.")
+    (home-page "http://lxde.org")
+    (license license:gpl2+)))
+
 (define-public lxterminal
   (package
     (name "lxterminal")

[PATCH 7/7] gnu: Add lxrandr.

[Mathieu Lirzin]

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


* gnu/packages/lxde.scm (lxrandr): New variable.
---
 gnu/packages/lxde.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0007-gnu-Add-lxrandr.patch --]
[-- Type: text/x-patch; name="0007-gnu-Add-lxrandr.patch", Size: 1554 bytes --]

diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index a28eb3f..ef2d60c 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -89,6 +89,32 @@ able to change themes, icons, and fonts used by GTK+ applications.")
     (home-page "http://lxde.org")
     (license license:gpl2+)))
 
+(define-public lxrandr
+  (package
+    (name "lxrandr")
+    (version "0.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/project/lxde/LXRandR"
+                                  "%20%28monitor%20config%20tool%29/LXRandR%20"
+                                  (version-major+minor version) ".x/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0xkbqv66hisbxkvnf7y5kwqbhrq26f49wd7w6ylhnjlccpnylg8q"))))
+    (build-system gnu-build-system)
+    (inputs `(("gtk+" ,gtk+-2)))
+    (native-inputs `(("intltool"   ,intltool)
+                     ("pkg-config" ,pkg-config)))
+    (synopsis "LXDE monitor configuration tool")
+    (description "LXRandR is a very basic monitor configuration tool. It
+utilises the X extension called RandR but doesn't aim to be a full frontend of
+it.  LXRandR only gives you some easy and quick options which are intuitive.
+It's suitable for laptop users who frequently uses projectors or external
+monitor.")
+    (home-page "http://lxde.org")
+    (license license:gpl2+)))
+
 (define-public lxtask
   (package
     (name "lxtask")

Re: [PATCH 1/7] gnu: Add libfm-extra.

[Ludovic Courtès]

Mathieu Lirzin <mthl@openmailbox.org> skribis:

> * gnu/packages/lxde.scm (libfm-extra): New variable.

LGTM, thanks!

Ludo’.

Re: [PATCH 3/7] gnu: Add libfm.

[Ludovic Courtès]

Mathieu Lirzin <mthl@openmailbox.org> skribis:

> * gnu/packages/lxde.scm (libfm): New variable.
>   (libfm-extra): Inherit from it.

[...]

> +    (description (string-append (package-description libfm) "  This package
> +contains standalone library which extends libfm."))))

Please use a literal string to allow xgettext to pick up the
translation.  The sentence here may be enough, perhaps replacing “libfm”
with “the libFM file management library”.

OK with this change.

Thanks,
Ludo’.

Re: [PATCH 4/7] gnu: Add pcmanfm.

[Ludovic Courtès]

Mathieu Lirzin <mthl@openmailbox.org> skribis:

> * gnu/packages/lxde.scm (pcmanfm): New variable.

OK!

Re: [PATCH 5/7] gnu: Add lxterminal.

[Ludovic Courtès]

Mathieu Lirzin <mthl@openmailbox.org> skribis:

> * gnu/packages/lxde.scm (lxterminal): New variable.

OK.

Re: [PATCH 6/7] gnu: Add lxtask.

[Ludovic Courtès]

Mathieu Lirzin <mthl@openmailbox.org> skribis:

> * gnu/packages/lxde.scm (lxtask): New variable.

[...]

> +    (description "LXTask is a lightweight task manager derived from Xfce task
                                                                     ^^

... from the Xfce task manager

> +manager with all dependencies on Xfce removed.  LXTask is based on GTK+
                                                                     ^^
> +toolkit.  It allows monitoring and controlling of running processes.")

... on the GTK+ toolkit.
It allows users to monitor and control running processes.

OK with these changes!

Ludo’.

Re: [PATCH 7/7] gnu: Add lxrandr.

[Ludovic Courtès]

Mathieu Lirzin <mthl@openmailbox.org> skribis:

> * gnu/packages/lxde.scm (lxrandr): New variable.

[...]

> +    (description "LXRandR is a very basic monitor configuration tool. It
                                                                       ^^
Missing space.

> +utilises the X extension called RandR but doesn't aim to be a full frontend of

Rather: “It relies on the X11 resize-and-rotate (RandR) extension”...

OK with these changes, thanks!

Ludo’.