[arch-commits] CVS update of extra/emulators/vice (2 files)

[Kevin Piche]

    Date: Friday, August 24, 2007 @ 21:49:48
  Author: kevin
    Path: /home/cvs-extra/extra/emulators/vice

Modified: PKGBUILD (1.26 -> 1.27)
 Removed: libx11-security-update.patch (1.1)

upgpkg: vice 1.22-1


------------------------------+
 PKGBUILD                     |   13 ++++++-------
 libx11-security-update.patch |   22 ----------------------
 2 files changed, 6 insertions(+), 29 deletions(-)


Index: extra/emulators/vice/PKGBUILD
diff -u extra/emulators/vice/PKGBUILD:1.26 extra/emulators/vice/PKGBUILD:1.27
--- extra/emulators/vice/PKGBUILD:1.26	Fri Jul 20 21:45:52 2007
+++ extra/emulators/vice/PKGBUILD	Fri Aug 24 21:49:48 2007
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD,v 1.26 2007/07/21 01:45:52 eric Exp $
+# $Id: PKGBUILD,v 1.27 2007/08/25 01:49:48 kevin Exp $
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 # Maintainer: Kevin Piche <kevin at archlinux.org>
 
 pkgname=vice
-pkgver=1.21
-pkgrel=2
-pkgdesc="VICE is a Versatile Commodore Emulator"
+pkgver=1.22
+pkgrel=1
+pkgdesc="A Versatile Commodore Emulator"
 arch=(i686 x86_64)
 license=('GPL')
-source=(ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/$pkgname-$pkgver.tar.gz libx11-security-update.patch)
-md5sums=('913bdee9d59d154ed33ef4e037d8a12c' '769dc65a4bf8ba68ead1bf7ccdca1feb')
 url="http://www.viceteam.org/"
+source=(ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/$pkgname-$pkgver.tar.gz)
 depends=('esd' 'gcc' 'libjpeg' 'libpng' 'libungif' 'libxaw' 'libxv'
     'libxxf86dga' 'libxxf86vm' 'readline')
+md5sums=('33204acbb74bafb12594d39b55888626')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ../libx11-security-update.patch
   ./configure --prefix=/usr --enable-fullscreen
   make || return 1
   make DESTDIR=$startdir/pkg install
Index: extra/emulators/vice/libx11-security-update.patch
diff -u extra/emulators/vice/libx11-security-update.patch:1.1 extra/emulators/vice/libx11-security-update.patch:removed
--- extra/emulators/vice/libx11-security-update.patch:1.1	Fri Jul 20 21:45:52 2007
+++ extra/emulators/vice/libx11-security-update.patch	Fri Aug 24 21:49:48 2007
@@ -1,22 +0,0 @@
---- vice-1.20/src/arch/unix/x11/xaw/uicolor.c  2003-06-24 15:17:32.000000000 +0200
-+++ vice-1.20.pigi4/src/arch/unix/x11/xaw/uicolor.c       2007-04-08 22:58:25.000000000 +0200
-@@ -121,7 +121,7 @@
-     /* This is a kludge to map pixels to zimage values. Is there a better
-        way to do this? //tvr */
-     im = XCreateImage(display, visual, x11ui_get_display_depth(),
--                      ZPixmap, 0, (char *)data, 1, 1, 8, 1);
-+                      ZPixmap, 0, (char *)data, 1, 1, 8, 0);
-     if (!im) {
-         log_error(LOG_DEFAULT, _("XCreateImage failed."));
-         free(data);
---- vice-1.20/src/arch/unix/x11/gnome/uicolor.c        2006-07-22 18:28:40.000000000 +0200
-+++ vice-1.20.pigi4/src/arch/unix/x11/gnome/uicolor.c     2007-04-08 22:58:26.000000000 +0200
-@@ -167,7 +167,7 @@
-        way to do this? //tvr */
-     im = XCreateImage(display, GDK_VISUAL_XVISUAL(visual),
-                       x11ui_get_display_depth(),
--                      ZPixmap, 0, (char *)data, 1, 1, 8, 1);
-+                      ZPixmap, 0, (char *)data, 1, 1, 8, 0);
-     if (!im) {
-         log_error(LOG_DEFAULT, _("XCreateImage failed."));
-         free(data);