[arch-commits] Commit in vice/repos (3 files)

[Giovanni Scafora]

    Date: Friday, January 2, 2009 @ 11:14:37
  Author: giovanni
Revision: 23091

Merged revisions 23090 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/vice/trunk

........
  r23090 | giovanni | 2009-01-02 08:13:33 -0800 (ven, 02 gen 2009) | 1 line
  
  upgpkg: vice 2.1-1
........

Modified:
  vice/repos/extra-x86_64/	(properties)
  vice/repos/extra-x86_64/PKGBUILD
Deleted:
  vice/repos/extra-x86_64/libx11-security-update.patch

------------------------------+
 PKGBUILD                     |    8 ++++----
 libx11-security-update.patch |   22 ----------------------
 2 files changed, 4 insertions(+), 26 deletions(-)


Property changes on: vice/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /vice/trunk:1-23087
   + /vice/trunk:1-23090

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-01-02 16:13:33 UTC (rev 23090)
+++ extra-x86_64/PKGBUILD	2009-01-02 16:14:37 UTC (rev 23091)
@@ -3,17 +3,17 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=vice
-pkgver=2.0
-pkgrel=3
+pkgver=2.1
+pkgrel=1
 pkgdesc="A Versatile Commodore Emulator"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.viceteam.org/"
-depends=('esd' 'gcc-libs' 'giflib' 'lame' 'libgl' 'libjpeg' 'libpng' 'libxaw' 'libxxf86vm')
+depends=('esound' 'gcc-libs' 'giflib' 'lame' 'libgl' 'libjpeg' 'libpng' 'libxaw' 'libxxf86vm')
 makedepends=('xorg-font-utils')
 options=('!makeflags')
 source=(http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/$pkgname-$pkgver.tar.gz)
-md5sums=('e4af3962469cb2279429718946528f1d')
+md5sums=('a4cca1aad12e12ac7f37d6c85310ade8')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

Deleted: extra-x86_64/libx11-security-update.patch
===================================================================
--- extra-x86_64/libx11-security-update.patch	2009-01-02 16:13:33 UTC (rev 23090)
+++ extra-x86_64/libx11-security-update.patch	2009-01-02 16:14:37 UTC (rev 23091)
@@ -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);