xscreenserver WIP

[Christopher Allan Webber <cwebber@dustycloud.org>]

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

Hello all,

Attached is an in-progress package for xscreensaver.  There are a few
issues:

 - It builds, but does not install.  It stops here:

     /gnu/store/34j2zmi69mqwrslpyizbi9mcxmn2hzgb-coreutils-8.24/bin/install -c xscreensaver /gnu/store/2agy7nwjl6gl4m271kx3xjkyi22zv2ps-xscreensaver-5.34/bin/xscreensaver
     /gnu/store/34j2zmi69mqwrslpyizbi9mcxmn2hzgb-coreutils-8.24/bin/install -c xscreensaver-command /gnu/store/2agy7nwjl6gl4m271kx3xjkyi22zv2ps-xscreensaver-5.34/bin/xscreensaver-command
     /gnu/store/34j2zmi69mqwrslpyizbi9mcxmn2hzgb-coreutils-8.24/bin/install -c xscreensaver-demo /gnu/store/2agy7nwjl6gl4m271kx3xjkyi22zv2ps-xscreensaver-5.34/bin/xscreensaver-demo
     /gnu/store/34j2zmi69mqwrslpyizbi9mcxmn2hzgb-coreutils-8.24/bin/install -c xscreensaver-getimage /gnu/store/2agy7nwjl6gl4m271kx3xjkyi22zv2ps-xscreensaver-5.34/bin/xscreensaver-getimage
     /gnu/store/34j2zmi69mqwrslpyizbi9mcxmn2hzgb-coreutils-8.24/bin/install: cannot create directory ‘/usr’: Permission denied
     Makefile:302: recipe for target 'install-ad' failed
     make[1]: *** [install-ad] Error 1
     make[1]: Leaving directory '/tmp/guix-build-xscreensaver-5.34.drv-0/xscreensaver-5.34/driver'
     Makefile:29: recipe for target 'install' failed
     make: *** [install] Error 5
     phase `install' failed after 0.1 seconds
     note: keeping build directory `/tmp/guix-build-xscreensaver-5.34.drv-0'

   If you look at the driver/Makefile result, this isn't surprising:

     install_prefix	=
     # ...
     install-ad: XScreenSaver.ad
     	@if [ ! -d $(install_prefix)$(AD_DIR) ]; then			      \
     	  $(INSTALL_DIRS) $(install_prefix)$(AD_DIR) ;			      \
     	 fi
        # ...

   I'm sure there's an obvious solution to this that doesn't involve a
   substitute* but I don't know what it is.

 - Does it need setuid?  We don't support that, right?  This error
   appears during install:

  ####################################################################
  Warning: xscreensaver has been compiled with support for shadow
           passwords.  If your system actually uses shadow passwords,
           then xscreensaver must be installed as a setuid root
           program in order for locking to work.  To do this, you
           must run 'make install' as 'root', not as 'nixbld'.

           For now, xscreensaver will be installed non-setuid, which
           means that locking might not work.  (Try it and see.)
  ####################################################################

 - I don't know what to fill in for the license field.
   There's no COPYING file; each individual file has its own license
   header, and most of them are the same, but not all.  Here's
   what Debian has:

     http://metadata.ftp-master.debian.org/changelogs/main/x/xscreensaver/xscreensaver_5.34-1_copyright

Help appreciated!
 - Chris
   

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-xscreensaver.patch --]
[-- Type: text/x-patch, Size: 3106 bytes --]

From eed8640c9b3feca9aea3ae406eee83f2efb62458 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 8 Apr 2016 10:36:05 -0500
Subject: [PATCH] gnu: Add xscreensaver.

* gnu/packages/xdisorg.scm (xscreensaver): New variable.
---
 gnu/packages/xdisorg.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 5a77a6c..10afcb5 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -37,6 +37,7 @@
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages asciidoc)
+  #:use-module (gnu packages algebra)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
@@ -47,6 +48,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages gl)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages gtk)
@@ -714,6 +716,7 @@ the X.Org X Server version 1.7 and later (X11R7.5 or later).")
        ("libx11" ,libx11)
        ("libxcb" ,libxcb)
        ("libxxf86vm" ,libxxf86vm)
+       ("libjpeg" ,libjpeg)
        ("glib" ,glib)))                           ;for Geoclue2 support
     (home-page "https://github.com/jonls/redshift")
     (synopsis "Adjust the color temperature of your screen")
@@ -724,3 +727,48 @@ twilight and early morning, the color temperature transitions smoothly from
 night to daytime temperature to allow your eyes to slowly adapt.  At night the
 color temperature should be set to match the lamps in your room.")
     (license license:gpl3+)))
+
+(define-public xscreensaver
+  (package
+    (name "xscreensaver")
+    (version "5.34")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://www.jwz.org/xscreensaver/xscreensaver-"
+                       version ".tar.gz"))
+       (sha256
+        (base32
+         "09sy5v8bn62hiq4ib3jyvp8lipqcvn3rdsj74q25qgklpv27xzvg"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f)) ; no check target
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxi" ,libxi)
+       ("libxt" ,libxt)
+       ("libxft" ,libxft)
+       ("libxmu" ,libxmu)
+       ("libxpm" ,libxpm)
+       ("libglade" ,libglade)
+       ("libxml2" ,libxml2)
+       ("libsm" ,libsm)
+       ("libjpeg" ,libjpeg)
+       ("pango" ,pango)
+       ("gtk+" ,gtk+)
+       ("perl" ,perl)
+       ("cairo" ,cairo)
+       ("bc" ,bc)
+       ("libxrandr" ,libxrandr)
+       ("glu" ,glu)
+       ("glib" ,glib)))
+    (home-page "https://www.jwz.org/xscreensaver/")
+    (synopsis "Classic screen saver suite supporting screen locking")
+    (description
+     "xscreensaver is a popular screen saver collection with many entertaining
+demos.  It also acts as a nice screen locker.")
+    (license #f)))
-- 
2.7.3