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

[Antonio Rojas]

    Date: Sunday, January 23, 2022 @ 14:41:01
  Author: arojas
Revision: 1113599

Update to 123

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

--------------------------+
 PKGBUILD                 |   13 +++++--------
 config.patch             |   29 -----------------------------
 path-for-game-data.patch |   12 +++++-------
 3 files changed, 10 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-23 14:20:08 UTC (rev 1113598)
+++ PKGBUILD	2022-01-23 14:41:01 UTC (rev 1113599)
@@ -5,13 +5,13 @@
 # Contributor: JD Steffen <jd at steffennet dot org>
 
 pkgname=simutrans
-pkgver=122.0
+pkgver=123.0
 pkgrel=1
 pkgdesc="Transportation simulation game"
 arch=('x86_64')
 url="https://www.simutrans.com/"
 license=('custom:Artistic')
-depends=('gcc-libs' 'zlib' 'sdl2_mixer' 'bzip2' 'simutrans-pak64' 'hicolor-icon-theme')
+depends=('gcc-libs' 'zlib' 'sdl2' 'libpng' 'bzip2' 'simutrans-pak64' 'hicolor-icon-theme')
 makedepends=('dos2unix')
 optdepends=('timidity++: play MIDI music')
 source=(https://downloads.sourceforge.net/$pkgname/$pkgname-src-${pkgver/./-}.zip
@@ -18,14 +18,12 @@
         https://raw.githubusercontent.com/aburch/simutrans/8593f5b1248d03f907a149f7abc41ae6512009e1/simutrans.svg
         settings-folder.patch
         path-for-game-data.patch
-        config.patch
         simutrans.desktop
         simutrans.appdata.xml)
-sha256sums=('d3b729afc22abe5a3104868f2462305258045082993069a2230b508c02899f03'
+sha256sums=('02e20fe41216dce13cd02908b647f5e48ec737d67e869b5e4f1ef9235a402080'
             'c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81'
             '5f009471489583fd48bcce5d4869048d1164423771cfd955840ae995cd6a70ca'
-            '1a0fc75fe1422404e424c91f5a23301234b2997cb727b4985c98ac1af6a4582a'
-            'b80452cf985bde7d86e8e5fca95fb5921bac96a245ff9a2a331e8910b73a3747'
+            '895405df0904e6c245ab5b6e1824a59e0af7a0a0ef5ccb6f69f20b6ab8223092'
             '99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3'
             'f3d2416de0f725d15b18482c20231228791e65ceeeb7305115a8ea6a2e591dd6')
 
@@ -39,11 +37,10 @@
 
   # Configure the build process
   cp config.template config.default
-  patch -Np0 -i config.patch
 }
 
 build() {
-  make
+  make VERBOSE=1 BACKEND=sdl2 OSTYPE=linux
 }
 
 package() {

Deleted: config.patch
===================================================================
--- config.patch	2022-01-23 14:20:08 UTC (rev 1113598)
+++ config.patch	2022-01-23 14:41:01 UTC (rev 1113599)
@@ -1,29 +0,0 @@
---- config.default.orig	2011-11-10 21:48:01.000000000 +0100
-+++ config.default	2011-11-10 21:51:58.383221979 +0100
-@@ -6,15 +6,15 @@
- #BACKEND = sdl
- #BACKEND = sdl2
- #BACKEND = mixer_sdl
--#BACKEND = mixer_sdl2
-+BACKEND = mixer_sdl2
- #BACKEND = posix
- 
- #OSTYPE = amiga
- #OSTYPE = beos
- #OSTYPE = cygwin
- #OSTYPE = freebsd
- #OSTYPE = haiku
--#OSTYPE = linux
-+OSTYPE = linux
- #OSTYPE = mingw
- #OSTYPE = mac
- 
-@@ -37,6 +37,6 @@
- #SDL2_CONFIG    = sdl2-config
- #FREETYPE_CONFIG    = freetype-config
- 
--#VERBOSE = 1
-+VERBOSE = 1
- 
- # Use static libraries instead
- # STATIC = 1

Modified: path-for-game-data.patch
===================================================================
--- path-for-game-data.patch	2022-01-23 14:20:08 UTC (rev 1113598)
+++ path-for-game-data.patch	2022-01-23 14:41:01 UTC (rev 1113599)
@@ -4,15 +4,13 @@
 
 --- simutrans.orig/simmain.cc
 +++ simutrans/simmain.cc
-@@ -437,8 +437,9 @@
- 		strcat( env_t::program_dir, PATH_SEPARATOR );
+@@ -437,8 +437,7 @@
+ 		strcat( env_t::data_dir, PATH_SEPARATOR );
  	}
  	else {
--		strcpy( env_t::program_dir, argv[0] );
--		*(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
-+		// strcpy( env_t::program_dir, argv[0] );
-+		// *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
-+		strcpy(env_t::program_dir, "/usr/share/games/simutrans/");
+-		strcpy( env_t::data_dir, argv[0] );
+-		*(strrchr( env_t::data_dir, PATH_SEPARATOR[0] )+1) = 0;
++		strcpy(env_t::data_dir, "/usr/share/games/simutrans/");
  
  #ifdef __APPLE__
  		// change working directory from binary dir to bundle dir