diff --git a/community/simutrans/PKGBUILD b/community/simutrans/PKGBUILD index eb70db30a..c7c3d3ad6 100644 --- a/community/simutrans/PKGBUILD +++ b/community/simutrans/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91302 2013-05-20 23:13:17Z bgyorgy $ +# $Id$ # Maintainer: Balló György # Contributor: Anton Bazhenov # Contributor: Jaroslav Lichtblau @@ -9,8 +9,8 @@ # - get rid of a bad gcc flag in Makefile 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') @@ -25,23 +25,27 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver.zip path-for-game-data.patch config.patch simutrans.desktop) -md5sums=('4963f0ad0da5f622f67b7c1fb888a264' - '8e09f450173110fec097497c7198e50c' +md5sums=('42d804e3a6ac78460584903ce9b4eeb1' + 'fdc58aee51a79d2a67219acff0cd5b12' 'c87d9a9910bc371df5d50f7f1ec298bb' - '4648680290b44775b9c47d3758d3bd6c' - 'd11bc8ee33a34e33341f6ccd90a44dba' + 'e716340d372af264ca05510facfe5d2c' + '4a2d707ad2fc0abf42e8d75c0a3dcc8b' 'f41f7a08ad517ef2b60412859eb49963') -build() { +prepare() { cd "$srcdir" cp config.template config.default patch -Np0 -i "$srcdir/settings-folder.patch" patch -Np1 -i "$srcdir/path-for-game-data.patch" patch -Np0 -i "$srcdir/config.patch" - convert simutrans.ico -alpha on simutrans.png - sed -i 's/-minline-all-stringops/-O3/' Makefile + sed -i 's/-minline-all-stringops/-O3/' Makefile +} + +build() { + cd "$srcdir" + convert simutrans.ico -alpha on simutrans.png make } @@ -53,7 +57,7 @@ package() { #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" diff --git a/community/simutrans/config.patch b/community/simutrans/config.patch index ea4657a7a..8da3cd9be 100644 --- a/community/simutrans/config.patch +++ b/community/simutrans/config.patch @@ -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 diff --git a/community/simutrans/path-for-game-data.patch b/community/simutrans/path-for-game-data.patch index ac2b41407..06c8427a4 100644 --- a/community/simutrans/path-for-game-data.patch +++ b/community/simutrans/path-for-game-data.patch @@ -5,14 +5,14 @@ look in /usr/share/games/simutrans for game data --- 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