[arch-commits] Commit in simutrans/trunk (3 files)

[Balló György]

    Date: Friday, May 9, 2014 @ 14:13:07
  Author: bgyorgy
Revision: 110904

upgpkg: simutrans 120.0-1

Update to version 120.0

Modified:
  simutrans/trunk/PKGBUILD
  simutrans/trunk/config.patch
  simutrans/trunk/path-for-game-data.patch

--------------------------+
 PKGBUILD                 |   14 +++++++-------
 config.patch             |    5 +++--
 path-for-game-data.patch |   16 ++++++++--------
 3 files changed, 18 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-09 12:12:52 UTC (rev 110903)
+++ PKGBUILD	2014-05-09 12:13:07 UTC (rev 110904)
@@ -6,8 +6,8 @@
 # Contributor: JD Steffen <jd at steffennet dot org>
 
 pkgname=simutrans
-pkgver=112.3
-_pkgver=112-3
+pkgver=120.0
+_pkgver=120-0
 pkgrel=1
 pkgdesc="An open source transportation simulation game"
 arch=('i686' 'x86_64')
@@ -22,11 +22,11 @@
         path-for-game-data.patch
         config.patch
         simutrans.desktop)
-md5sums=('4963f0ad0da5f622f67b7c1fb888a264'
-         '8e09f450173110fec097497c7198e50c'
+md5sums=('42d804e3a6ac78460584903ce9b4eeb1'
+         'fdc58aee51a79d2a67219acff0cd5b12'
          'c87d9a9910bc371df5d50f7f1ec298bb'
-         '4648680290b44775b9c47d3758d3bd6c'
-         'd11bc8ee33a34e33341f6ccd90a44dba'
+         'e716340d372af264ca05510facfe5d2c'
+         '4a2d707ad2fc0abf42e8d75c0a3dcc8b'
          'f41f7a08ad517ef2b60412859eb49963')
 
 prepare() {
@@ -52,7 +52,7 @@
 
   #data
   mkdir -p "$pkgdir/usr/share/games/$pkgname"
-  cp -r "$pkgname"/{config,font,music,script,skin,text} "$pkgdir/usr/share/games/$pkgname"
+  cp -r "$pkgname"/{config,font,music,script,text,themes} "$pkgdir/usr/share/games/$pkgname"
 
   #desktop file and icon
   install -Dm644 simutrans.png "$pkgdir/usr/share/pixmaps/simutrans.png"

Modified: config.patch
===================================================================
--- config.patch	2014-05-09 12:12:52 UTC (rev 110903)
+++ config.patch	2014-05-09 12:13:07 UTC (rev 110904)
@@ -1,9 +1,9 @@
 --- config.default.orig	2011-11-10 21:48:01.000000000 +0100
 +++ config.default	2011-11-10 21:51:58.383221979 +0100
 @@ -6,23 +6,23 @@
- #BACKEND = allegro
- #BACKEND = gdi
+ #BACKEND = opengl
  #BACKEND = sdl
+ #BACKEND = sdl2
 -#BACKEND = mixer_sdl
 +BACKEND = mixer_sdl
  #BACKEND = posix
@@ -34,6 +34,7 @@
  #PNG_CONFIG     = pkg-config libpng
 -#SDL_CONFIG     = sdl-config
 +SDL_CONFIG     = sdl-config
+ #SDL2_CONFIG    = sdl2-config
  
 -#VERBOSE = 1
 +VERBOSE = 1

Modified: path-for-game-data.patch
===================================================================
--- path-for-game-data.patch	2014-05-09 12:12:52 UTC (rev 110903)
+++ path-for-game-data.patch	2014-05-09 12:13:07 UTC (rev 110904)
@@ -5,14 +5,14 @@
 --- simutrans.orig/simmain.cc
 +++ simutrans/simmain.cc
 @@ -437,8 +437,9 @@
- 		strcat( umgebung_t::program_dir, path_sep );
+ 		strcat( env_t::program_dir, path_sep );
  	}
  	else {
--		strcpy( umgebung_t::program_dir, argv[0] );
--		*(strrchr( umgebung_t::program_dir, path_sep[0] )+1) = 0;
-+		// strcpy( umgebung_t::program_dir, argv[0] );
-+		// *(strrchr( umgebung_t::program_dir, path_sep[0] )+1) = 0;
-+		strcpy(umgebung_t::program_dir, "/usr/share/games/simutrans/");
+-		strcpy( env_t::program_dir, argv[0] );
+-		*(strrchr( env_t::program_dir, path_sep[0] )+1) = 0;
++		// strcpy( env_t::program_dir, argv[0] );
++		// *(strrchr( env_t::program_dir, path_sep[0] )+1) = 0;
++		strcpy(env_t::program_dir, "/usr/share/games/simutrans/");
  
- 		chdir( umgebung_t::program_dir );
- 	}
+ #ifdef __APPLE__
+ 		// change working directory from binary dir to bundle dir