[arch-commits] Commit in xscreensaver/trunk (2 files)

[Eric Bélanger]

    Date: Sunday, July 15, 2012 @ 21:29:06
  Author: eric
Revision: 163562

upgpkg: xscreensaver 5.18-1

Upstream update, Add build patch

Added:
  xscreensaver/trunk/xscreensaver-5.18-sonar-compile.patch
Modified:
  xscreensaver/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |   14 ++++++++------
 xscreensaver-5.18-sonar-compile.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-15 23:10:42 UTC (rev 163561)
+++ PKGBUILD	2012-07-16 01:29:06 UTC (rev 163562)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=xscreensaver
-pkgver=5.17
-pkgrel=2
+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/"
@@ -14,16 +14,18 @@
 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)
-sha1sums=('8cbe8d03642a7c3216030d01286b95568319d54c'
+        add-electricsheep.diff xscreensaver.pam LICENSE
+        xscreensaver-5.18-sonar-compile.patch)
+sha1sums=('a9f66d3f5094d2c1ef46c1209730e7cb653f33a7'
           '677496218b81a42d90bee400026e94dd87fb8ffb'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          '4209ea586b204fd1d81c382a0522c654f9fd9134')
+          '4209ea586b204fd1d81c382a0522c654f9fd9134'
+          '95e1d74e0e5ff1a6600c8a9cd0a12d392b24a7b1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p0 -i "${srcdir}/add-electricsheep.diff"
-  sed -i 's/lament.xpm/lament512.xpm/' hacks/glx/Makefile.in
+  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 --with-login-manager --with-gtk --with-gl \

Added: xscreensaver-5.18-sonar-compile.patch
===================================================================
--- xscreensaver-5.18-sonar-compile.patch	                        (rev 0)
+++ xscreensaver-5.18-sonar-compile.patch	2012-07-16 01:29:06 UTC (rev 163562)
@@ -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;