[PATCH] gnu:add SLiM

[PATCH] gnu:add SLiM

[Guy Ze Grant]

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

Finally, I think I'm finished with SLiM; Thanks again Civodul and anyone
else who threw their hat in to offer advice. Attatched is the patch -- any
questions and/or critques of course are welcome. :^)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-SLiM-to-packages.patch --]
[-- Type: text/x-diff; name="0001-Add-SLiM-to-packages.patch", Size: 4272 bytes --]

From ccb1526ab9be70a3157435edc677d926b2bb024e Mon Sep 17 00:00:00 2001
From: Guy Grant <gzg@wave>
Date: Thu, 21 Nov 2013 20:36:08 -0600
Subject: [PATCH] Add SLiM to packages

---
 gnu/packages/slim.scm | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 gnu/packages/slim.scm

diff --git a/gnu/packages/slim.scm b/gnu/packages/slim.scm
new file mode 100644
index 0000000..3cd4a1f
--- /dev/null
+++ b/gnu/packages/slim.scm
@@ -0,0 +1,78 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Guy Grant <gzg@riseup.net>
+;;;
+;;; 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 slim)
+  #:use-module ((guix licenses) 
+                #:renamer (symbol-prefix-proc 'l:)) 
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix packages)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages libpng)
+  #:use-module (gnu packages libjpeg)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages linux))
+
+(define-public slim
+  (package
+    (name "slim")
+    (version "1.3.3") ;; This it the latest on the SF page, the one on the website is 1.3.6 ... but the binary isn't static.
+    (source (origin
+	     (method url-fetch)
+	     (uri (string-append "mirror://sourceforge/project/slim.berlios/slim-"
+				  version ".tar.gz"))
+	     (sha256
+	      (base32 "1fdvipj3658s8dm78djmfr8xhg6l8rr7kc4qcb34bjrnkkclhln1"))))
+    (build-system cmake-build-system)
+    (inputs `(("linux-pam" ,linux-pam)
+              ("libpng" ,libpng)
+              ("libjpeg" ,libjpeg)
+              ("freeglut" ,freeglut)
+              ("libxrandr" ,libxrandr)
+              ("libxrender" ,libxrender)
+              ("freetype" ,freetype)
+              ("fontconfig" ,fontconfig)
+              ("pkg-config" ,pkg-config)
+              ("libx11" ,libx11)
+              ("libxft" ,libxft)
+              ("libxmu" ,libxmu)
+              ("xauth" ,xauth)))
+    (arguments '(#:phases (alist-cons-before
+                           'configure 'set-etc-and-lib-location
+                           (lambda _ (substitute* "CMakeLists.txt" 
+                                        (("/etc") (string-append
+                                                   (assoc-ref %outputs "out") "/etc"))))
+                                        %standard-phases)
+                          #:configure-flags '("-DUSE_PAM=yes" "-DUSE_CONSOLEKIT=no")
+                          #:tests? #f))                                                              
+    (home-page "http://www.slim.berlios.de/")
+    (synopsis "Desktop-independent graphcal login manager for X11")
+    (description
+     "SLiM is a Desktop-independent graphical login manager for X11, derived 
+from Login.app. It aims to be light and simple, although completely configurable 
+through themes and an option file; is suitable for machines on which remote login 
+functionalities are not needed. 
+
+Features included: PNG and XFT support for alpha transparency and antialiased fonts,
+External themes support, Configurable runtime options: X server -- login / shutdown / reboot 
+commands, Single (GDM-like) or double (XDM-like) input control, Can load predefined user at 
+startup, Configurable welcome / shutdown messages, Random theme selection")
+    (license l:gpl2)))
-- 
1.8.4.2

Re: [PATCH] gnu:add SLiM

[Ludovic Courtès]

"Guy Ze Grant" <gzg@riseup.net> skribis:

> Finally, I think I'm finished with SLiM; Thanks again Civodul and anyone
> else who threw their hat in to offer advice. Attatched is the patch -- any
> questions and/or critques of course are welcome. :^)

Nice!

> From ccb1526ab9be70a3157435edc677d926b2bb024e Mon Sep 17 00:00:00 2001
> From: Guy Grant <gzg@wave>
> Date: Thu, 21 Nov 2013 20:36:08 -0600
> Subject: [PATCH] Add SLiM to packages
>
> ---
>  gnu/packages/slim.scm | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 78 insertions(+)
>  create mode 100644 gnu/packages/slim.scm

In the final version, please make sure to include a GNU ChangeLog-style
commit log.

You may want to run ‘git config --global user.email gzg@riseup.net’ also.

> diff --git a/gnu/packages/slim.scm b/gnu/packages/slim.scm
> new file mode 100644
> index 0000000..3cd4a1f
> --- /dev/null
> +++ b/gnu/packages/slim.scm
> @@ -0,0 +1,78 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright \302\251 2013 Guy Grant <gzg@riseup.net>

This doesn’t seem to be UTF-8, is it?

> +(define-public slim
> +  (package
> +    (name "slim")
> +    (version "1.3.3") ;; This it the latest on the SF page, the one on the website is 1.3.6 ... but the binary isn't static.

What does “the binary isn’t static” mean?

Also, please wrap lines at 80 chars.

> +    (arguments '(#:phases (alist-cons-before
> +                           'configure 'set-etc-and-lib-location
> +                           (lambda _ (substitute* "CMakeLists.txt" 

Skip a line after ‘_’, and...

> +                                        (("/etc") (string-append

... after ("etc").

(See the other files for example, and “Coding Style” in HACKING.)

> +                          #:configure-flags '("-DUSE_PAM=yes" "-DUSE_CONSOLEKIT=no")
> +                          #:tests? #f))                                                              

Should be aligned with #:phases.

> +    (license l:gpl2)))

Can you confirm that it’s GPLv2-only, and that all the files appear to
be under that license or a compatible one?

With those details fixed, it’s ready for inclusion.

Thanks!

Ludo’.

[PATCH] gnu:add SLiM v2

[Guy Grant]

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

Second version of the patch to add SLiM, the Desktop/Session Manager.
As always, any questions or concerns -- feel free to mention them.

- GG

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-SLiM-to-packages.patch --]
[-- Type: text/x-diff; name="0001-Add-SLiM-to-packages.patch", Size: 4094 bytes --]

From 264c0bd3633eb325e33a07511b1233b5e27b05ce Mon Sep 17 00:00:00 2001
From: gzg <gzg@riseup.net>
Date: Sat, 23 Nov 2013 10:48:47 -0600
Subject: [PATCH] Add SLiM to packages.

---
 gnu/packages/slim.scm | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 gnu/packages/slim.scm

diff --git a/gnu/packages/slim.scm b/gnu/packages/slim.scm
new file mode 100644
index 0000000..19d8deb
--- /dev/null
+++ b/gnu/packages/slim.scm
@@ -0,0 +1,81 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Guy Grant <gzg@riseup.net>
+;;;
+;;; 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 slim)
+  #:use-module ((guix licenses) 
+                #:renamer (symbol-prefix-proc 'l:)) 
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix packages)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages libpng)
+  #:use-module (gnu packages libjpeg)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages linux))
+
+(define-public slim
+  (package
+    (name "slim")
+    (version "1.3.3")
+    (source (origin
+	     (method url-fetch)
+	     (uri (string-append "mirror://sourceforge/project/slim.berlios/slim-"
+				  version ".tar.gz"))
+	     (sha256
+	      (base32 "1fdvipj3658s8dm78djmfr8xhg6l8rr7kc4qcb34bjrnkkclhln1"))))
+    (build-system cmake-build-system)
+    (inputs `(("linux-pam" ,linux-pam)
+              ("libpng" ,libpng)
+              ("libjpeg" ,libjpeg)
+              ("freeglut" ,freeglut)
+              ("libxrandr" ,libxrandr)
+              ("libxrender" ,libxrender)
+              ("freetype" ,freetype)
+              ("fontconfig" ,fontconfig)
+              ("pkg-config" ,pkg-config)
+              ("libx11" ,libx11)
+              ("libxft" ,libxft)
+              ("libxmu" ,libxmu)
+              ("xauth" ,xauth)))
+    (arguments 
+     '(#:phases (alist-cons-before
+                 'configure 'set-new-etc-location
+                 (lambda _ 
+                   (substitute* "CMakeLists.txt" 
+                     '(("/etc") 
+                      (string-append
+                       (assoc-ref %outputs "out") "/etc"))))
+                 %standard-phases)
+       #:configure-flags '("-DUSE_PAM=yes" "-DUSE_CONSOLEKIT=no")
+       #:tests? #f))                                                              
+    (home-page "http://www.slim.berlios.de/")
+    (synopsis "Desktop-independent graphcal login manager for X11")
+    (description
+     "SLiM is a Desktop-independent graphical login manager for X11, derived 
+from Login.app. It aims to be light and simple, although completely configurable 
+through themes and an option file; is suitable for machines on which remote login 
+functionalities are not needed. 
+
+Features included: PNG and XFT support for alpha transparency and antialiased fonts,
+External themes support, Configurable runtime options: X server -- login / shutdown / reboot 
+commands, Single (GDM-like) or double (XDM-like) input control, Can load predefined user at 
+startup, Configurable welcome / shutdown messages, Random theme selection")
+    (license l:gpl2)))
-- 
1.8.4.2

Re: [PATCH] gnu:add SLiM v2

[Ludovic Courtès]

"Guy Grant" <gzg@riseup.net> skribis:

> Second version of the patch to add SLiM, the Desktop/Session Manager.
> As always, any questions or concerns -- feel free to mention them.

I just pushed the patch.

However there were a few things missing: I added a ChangeLog-style
commit log (see ‘HACKING’), removed trailing spaces, went through the
source to check the license (next time please reply to my questions
in-line so we don’t forget anything), and added the file to
gnu-system.am.

Please check the commit to see how this was all done so you’re all set
for next time.  ;-)

> +                   (substitute* "CMakeLists.txt" 
> +                     '(("/etc") 

There was a typo here (there shouldn’t be a quote here.)

Thanks!

Ludo’.