[arch-commits] Commit in simutrans/trunk (PKGBUILD config.patch settings-folder.patch)

[Balló György]

    Date: Saturday, October 24, 2020 @ 20:06:57
  Author: bgyorgy
Revision: 731632

upgpkg: simutrans 122.0-1: Update to new version

Modified:
  simutrans/trunk/PKGBUILD
  simutrans/trunk/config.patch
  simutrans/trunk/settings-folder.patch

-----------------------+
 PKGBUILD              |   13 ++++++-------
 config.patch          |   18 +++++++-----------
 settings-folder.patch |    4 ++--
 3 files changed, 15 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-24 20:06:54 UTC (rev 731631)
+++ PKGBUILD	2020-10-24 20:06:57 UTC (rev 731632)
@@ -5,17 +5,16 @@
 # Contributor: JD Steffen <jd at steffennet dot org>
 
 pkgname=simutrans
-pkgver=121.0
-_pkgver=121-0
+pkgver=122.0
 pkgrel=1
 pkgdesc="Transportation simulation game"
 arch=('x86_64')
 url="https://www.simutrans.com/"
 license=('custom:Artistic')
-depends=('gcc-libs' 'zlib' 'sdl_mixer' 'bzip2' 'simutrans-pak64' 'hicolor-icon-theme')
+depends=('gcc-libs' 'zlib' 'sdl2_mixer' 'bzip2' 'simutrans-pak64' 'hicolor-icon-theme')
 makedepends=('dos2unix')
 optdepends=('timidity++: play MIDI music')
-source=(https://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver.zip
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-src-${pkgver/./-}.zip
         https://raw.githubusercontent.com/aburch/simutrans/8593f5b1248d03f907a149f7abc41ae6512009e1/simutrans.svg
         settings-folder.patch
         path-for-game-data.patch
@@ -22,11 +21,11 @@
         config.patch
         simutrans.desktop
         simutrans.appdata.xml)
-sha256sums=('69fd95989761a013729106b48135f772f59126398cd93ada072f963c4d1e86b8'
+sha256sums=('d3b729afc22abe5a3104868f2462305258045082993069a2230b508c02899f03'
             'c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81'
-            'cbe5d7c7be96e6e7262c1e3b1c16155f5c179609f081e3ee050bbfc277845f71'
+            '5f009471489583fd48bcce5d4869048d1164423771cfd955840ae995cd6a70ca'
             '1a0fc75fe1422404e424c91f5a23301234b2997cb727b4985c98ac1af6a4582a'
-            '24bf2b611706c42fd52dc00d61fa2e28f54a614f17e43bc463817406e63eba3a'
+            'b80452cf985bde7d86e8e5fca95fb5921bac96a245ff9a2a331e8910b73a3747'
             '99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3'
             'f3d2416de0f725d15b18482c20231228791e65ceeeb7305115a8ea6a2e591dd6')
 

Modified: config.patch
===================================================================
--- config.patch	2020-10-24 20:06:54 UTC (rev 731631)
+++ config.patch	2020-10-24 20:06:57 UTC (rev 731632)
@@ -1,17 +1,13 @@
 --- config.default.orig	2011-11-10 21:48:01.000000000 +0100
 +++ config.default	2011-11-10 21:51:58.383221979 +0100
-@@ -6,18 +6,18 @@
- #BACKEND = opengl
+@@ -6,15 +6,15 @@
  #BACKEND = sdl
  #BACKEND = sdl2
--#BACKEND = mixer_sdl
-+BACKEND = mixer_sdl
+ #BACKEND = mixer_sdl
+-#BACKEND = mixer_sdl2
++BACKEND = mixer_sdl2
  #BACKEND = posix
  
- #COLOUR_DEPTH = 0
--#COLOUR_DEPTH = 16
-+COLOUR_DEPTH = 16
- 
  #OSTYPE = amiga
  #OSTYPE = beos
  #OSTYPE = cygwin
@@ -23,11 +19,11 @@
  #OSTYPE = mac
  
 @@ -37,6 +37,6 @@
- #SDL_CONFIG     = sdl-config
  #SDL2_CONFIG    = sdl2-config
+ #FREETYPE_CONFIG    = freetype-config
  
 -#VERBOSE = 1
 +VERBOSE = 1
  
- # The following useful conditional compilation flags exist
- #
+ # Use static libraries instead
+ # STATIC = 1

Modified: settings-folder.patch
===================================================================
--- settings-folder.patch	2020-10-24 20:06:54 UTC (rev 731631)
+++ settings-folder.patch	2020-10-24 20:06:57 UTC (rev 731632)
@@ -1,5 +1,5 @@
---- simsys.cc.orig	2011-10-28 20:32:25.000000000 +0200
-+++ simsys.cc	2011-11-10 23:09:10.380031846 +0100
+--- sys/simsys.cc.orig	2011-10-28 20:32:25.000000000 +0200
++++ sys/simsys.cc	2011-11-10 23:09:10.380031846 +0100
 @@ -47,7 +47,7 @@
  #elif defined __APPLE__
  	sprintf(buffer, "%s/Library/Simutrans", getenv("HOME"));