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

[Eric Bélanger]

    Date: Monday, July 30, 2012 @ 17:28:19
  Author: eric
Revision: 164331

upgpkg: xscreensaver 5.19-1

Upstream update, Clean up depends, Remove old patch

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-30 15:42:06 UTC (rev 164330)
+++ PKGBUILD	2012-07-30 21:28:19 UTC (rev 164331)
@@ -2,30 +2,27 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=xscreensaver
-pkgver=5.18
+pkgver=5.19
 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-appres' 'libxmu' \
+depends=('libxxf86vm' 'libglade' 'mesa' 'xorg-appres' 'libxmu' \
          'perl-libwww' 'perl-http-message')
 makedepends=('bc' 'libxpm' 'gdm')
 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
-        xscreensaver-5.18-sonar-compile.patch)
-sha1sums=('a9f66d3f5094d2c1ef46c1209730e7cb653f33a7'
+        add-electricsheep.diff xscreensaver.pam LICENSE)
+sha1sums=('16437d45f568ded8721a917e082f9b4d948954ec'
           '677496218b81a42d90bee400026e94dd87fb8ffb'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          '4209ea586b204fd1d81c382a0522c654f9fd9134'
-          '95e1d74e0e5ff1a6600c8a9cd0a12d392b24a7b1')
+          '4209ea586b204fd1d81c382a0522c654f9fd9134')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   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 --with-login-manager --with-gtk --with-gl \

Deleted: xscreensaver-5.18-sonar-compile.patch
===================================================================
--- xscreensaver-5.18-sonar-compile.patch	2012-07-30 15:42:06 UTC (rev 164330)
+++ xscreensaver-5.18-sonar-compile.patch	2012-07-30 21:28:19 UTC (rev 164331)
@@ -1,12 +0,0 @@
---- 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;