From 69965fe0d06351ab663189eeed77eaf60e76050c Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 15 Aug 2012 10:50:42 -0500
Subject: xscreensaver  5.18

---
 abs/extra/xscreensaver/PKGBUILD                    | 31 +++++++++++++---------
 abs/extra/xscreensaver/add-electricsheep.diff      | 10 +++----
 .../xscreensaver-5.18-sonar-compile.patch          | 12 +++++++++
 abs/extra/xscreensaver/xscreensavers               |  3 +++
 4 files changed, 38 insertions(+), 18 deletions(-)
 create mode 100644 abs/extra/xscreensaver/xscreensaver-5.18-sonar-compile.patch

diff --git a/abs/extra/xscreensaver/PKGBUILD b/abs/extra/xscreensaver/PKGBUILD
index d36806d..2330f23 100644
--- a/abs/extra/xscreensaver/PKGBUILD
+++ b/abs/extra/xscreensaver/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 91276 2010-09-26 05:59:32Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 163563 2012-07-16 01:29:27Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xscreensaver
-pkgver=5.12
+pkgver=5.18
 pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System"
 arch=('i686' 'x86_64')
 url="http://www.jwz.org/xscreensaver/"
 license=('BSD')
-depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-res-utils')
-makedepends=('bc')
+depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \
+         'perl-libwww' 'perl-http-message')
+makedepends=('bc' 'libxpm' )
+optdepends=('gdm: for login manager support')
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
-        add-electricsheep.diff xscreensaver.pam LICENSE)
-md5sums=('0345c1acb9280729de05c5ca44b401e3' 'f82524626ed8a6832cd279e0548a9b46'\
-         '367a3538f54db71f108b34cfa31088ac' '5e7f3f2a63d20a484742f5b4cb5d572c')
-sha1sums=('7252540b1b1853459a56453714c0974de26fa4c5' '65c2933380267475f2c4560bc22f4350393b00ce'\
-         '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' '4209ea586b204fd1d81c382a0522c654f9fd9134')
+        add-electricsheep.diff xscreensaver.pam LICENSE
+        xscreensaver-5.18-sonar-compile.patch)
+sha1sums=('a9f66d3f5094d2c1ef46c1209730e7cb653f33a7'
+          '677496218b81a42d90bee400026e94dd87fb8ffb'
+          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+          '4209ea586b204fd1d81c382a0522c654f9fd9134'
+          '95e1d74e0e5ff1a6600c8a9cd0a12d392b24a7b1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/add-electricsheep.diff"
+  patch -p0 -i "${srcdir}/add-electricsheep.diff"
+  patch -p1 -i "${srcdir}/xscreensaver-5.18-sonar-compile.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
-    --with-pam --without-motif --with-gtk --with-gl \
-    --without-gle --with-xpm --with-pixbuf --with-jpeg
+    --with-pam --with-login-manager --with-gtk --with-gl \
+    --without-gle --with-pixbuf --with-jpeg
   make
 }
 
diff --git a/abs/extra/xscreensaver/add-electricsheep.diff b/abs/extra/xscreensaver/add-electricsheep.diff
index 964de64..18b4dea 100644
--- a/abs/extra/xscreensaver/add-electricsheep.diff
+++ b/abs/extra/xscreensaver/add-electricsheep.diff
@@ -1,11 +1,11 @@
 --- driver/XScreenSaver.ad.in-orig	2009-10-17 02:19:06.000000000 -0400
 +++ driver/XScreenSaver.ad.in	2009-10-17 02:21:16.000000000 -0400
 @@ -347,7 +347,8 @@
- -				lcdscrub -root				    \n\
- @GL_KLUDGE@ GL: 				photopile -root				    \n\
- @GL_KLUDGE@ GL: 				skytentacles -root			    \n\
--@GL_KLUDGE@ GL: 				rubikblocks -root			    \n
-+@GL_KLUDGE@ GL: 				rubikblocks -root			    \n\
+ @GL_KLUDGE@ GL: 				rubikblocks -root			    \n\
+ @GL_KLUDGE@ GL: 				companioncube -root			    \n\
+ @GL_KLUDGE@ GL: 				hilbert -root				    \n\
+-@GL_KLUDGE@ GL: 				tronbit -root				    \n
++@GL_KLUDGE@ GL: 				tronbit -root				    \n\
 +				electricsheep --root 1				    \n
  
  
diff --git a/abs/extra/xscreensaver/xscreensaver-5.18-sonar-compile.patch b/abs/extra/xscreensaver/xscreensaver-5.18-sonar-compile.patch
new file mode 100644
index 0000000..e0adde0
--- /dev/null
+++ b/abs/extra/xscreensaver/xscreensaver-5.18-sonar-compile.patch
@@ -0,0 +1,12 @@
+--- xscreensaver-5.18/hacks/glx/sonar-icmp.c.compile	2012-07-03 04:18:53.000000000 +0900
++++ xscreensaver-5.18/hacks/glx/sonar-icmp.c	2012-07-04 09:17:12.580996448 +0900
+@@ -591,7 +591,9 @@
+                 fprintf (stderr, "%s:     if: %4s: %s\n", progname,
+                          ifa->ifa_name,
+                          (ifa->ifa_addr->sa_family == AF_UNIX  ? "local" :
++#ifdef AF_LINK
+                           ifa->ifa_addr->sa_family == AF_LINK  ? "link"  :
++#endif
+                           ifa->ifa_addr->sa_family == AF_INET6 ? "ipv6"  :
+                           "other"));
+               continue;
diff --git a/abs/extra/xscreensaver/xscreensavers b/abs/extra/xscreensaver/xscreensavers
index af7a6ea..b3d17e0 100644
--- a/abs/extra/xscreensaver/xscreensavers
+++ b/abs/extra/xscreensaver/xscreensavers
@@ -29,6 +29,7 @@ ccurve
 celtic
 circuit
 cloudlife
+companioncube
 compass
 coral
 crackberg
@@ -85,6 +86,7 @@ greynetic
 halftone
 halo
 helix
+hilbert
 hopalong
 hypertorus
 hypnowheel
@@ -177,6 +179,7 @@ thornbird
 timetunnel
 topblock
 triangle
+tronbit
 truchet
 twang
 vermiculate
-- 
cgit v0.12