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

[Hugo Doria]

    Date: Sunday, July 13, 2008 @ 19:30:59
  Author: hugo
Revision: 5194

Merged revisions 3521-5193 via svnmerge from 
svn+ssh://hugo@archlinux.org/home/svn-packages/zsnes/trunk

........
  r5191 | hugo | 2008-07-13 20:14:33 -0300 (Sun, 13 Jul 2008) | 1 line
  
  zsnes.patch added
........

Added:
  zsnes/repos/extra-i686/zsnes.patch
    (from rev 5191, zsnes/trunk/zsnes.patch)
Modified:
  zsnes/repos/extra-i686/	(properties)
  zsnes/repos/extra-i686/PKGBUILD

-------------+
 PKGBUILD    |   15 ++++++++----
 zsnes.patch |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 5 deletions(-)


Property changes on: zsnes/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /zsnes/trunk:1-3520
   + /zsnes/trunk:1-5193

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-07-13 23:18:45 UTC (rev 5193)
+++ extra-i686/PKGBUILD	2008-07-13 23:30:59 UTC (rev 5194)
@@ -1,17 +1,23 @@
 # $Id$
-# Maintainer: aurelien <aurelien at archlinux.org>
+# Maintainer: Hugo Doria <hugo at archlinux.org>
 # Contributor: Aurelien Foret <orelien at chez.com>
+
 pkgname=zsnes
 pkgver=1.51
-pkgrel=2
+pkgrel=3
 pkgdesc="Super Nintendo emulator"
-arch=(i686)
+arch=('i686')
+license=('GPL')
 depends=('gcc' 'sdl' 'libpng' 'libgl' 'ncurses')
 makedepends=('nasm')
-source=(http://dl.sourceforge.net/sourceforge/zsnes/zsnes151src.tar.bz2)
+source=(http://dl.sourceforge.net/sourceforge/zsnes/zsnes151src.tar.bz2 zsnes.patch)
 url="http://www.zsnes.com/"
+md5sums=('7071186bf80632ae88a153239498d8c9' '4df831b3d87a35949bcf3fd5547decb1')
 
 build() {
+  cd ${startdir}/src/${pkgname}_1_51/
+  patch -p1 -i ../zsnes.patch
+  
   cd ${startdir}/src/${pkgname}_1_51/src
   ./autogen.sh --prefix=/usr x_libraries=/usr/lib force_arch=i686 \
                --enable-release
@@ -19,4 +25,3 @@
   make || return 1
   make DESTDIR=${startdir}/pkg install
 }
-md5sums=('328071775f88f7c3b9fdb94176e5e417')

Copied: zsnes/repos/extra-i686/zsnes.patch (from rev 5191, zsnes/trunk/zsnes.patch)
===================================================================
--- extra-i686/zsnes.patch	                        (rev 0)
+++ extra-i686/zsnes.patch	2008-07-13 23:30:59 UTC (rev 5194)
@@ -0,0 +1,67 @@
+diff -cr zsnes_1_51/src/parsegen.cpp zsnes_1_51-patched/src/parsegen.cpp
+*** zsnes_1_51/src/parsegen.cpp	2007-10-31 01:30:26.000000000 -0300
+--- zsnes_1_51-patched/src/parsegen.cpp	2008-07-13 18:28:53.000000000 -0300
+***************
+*** 19,24 ****
+--- 19,27 ----
+  Config file handler creator by Nach (C) 2005-2007
+  */
+  
++ #include <cstring>
++ #include <cstdlib>
++ 
+  #if !defined(__GNUC__) && !defined(_MSC_VER)
+  #error You are using an unsupported compiler
+  #endif
+***************
+*** 1822,1828 ****
+    }
+  }
+  
+! int main(size_t argc, const char *const *const argv)
+  {
+    const char *cheader_file = 0;
+    bool compile = false;
+--- 1825,1831 ----
+    }
+  }
+  
+! int main(int argc, const char *const *const argv)
+  {
+    const char *cheader_file = 0;
+    bool compile = false;
+diff -cr zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-patched/src/tools/depbuild.cpp
+*** zsnes_1_51/src/tools/depbuild.cpp	2006-12-27 08:04:05.000000000 -0300
+--- zsnes_1_51-patched/src/tools/depbuild.cpp	2008-07-13 18:30:46.000000000 -0300
+***************
+*** 183,189 ****
+    }
+  }
+  
+! int main(size_t argc, const char *const *const argv)
+  {
+    if (argc < 5)
+    {
+--- 183,189 ----
+    }
+  }
+  
+! int main(int argc, const char *const *const argv)
+  {
+    if (argc < 5)
+    {
+diff -cr zsnes_1_51/src/tools/strutil.h zsnes_1_51-patched/src/tools/strutil.h
+*** zsnes_1_51/src/tools/strutil.h	2006-12-27 08:04:05.000000000 -0300
+--- zsnes_1_51-patched/src/tools/strutil.h	2008-07-13 18:30:27.000000000 -0300
+***************
+*** 15,20 ****
+--- 15,23 ----
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+  
++ #include <cstring>
++ #include <cstdlib>
++ 
+  /*
+  This is part of a toolkit used to assist in ZSNES development
+  */