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

[Balló György]

    Date: Wednesday, July 4, 2018 @ 20:09:22
  Author: bgyorgy
Revision: 352148

upgpkg: simutrans 120.3-1

Update to new version

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

--------------------------+
 PKGBUILD                 |   15 +++++----------
 no-optimise.patch        |   42 ------------------------------------------
 path-for-game-data.patch |    6 +++---
 3 files changed, 8 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-04 20:08:47 UTC (rev 352147)
+++ PKGBUILD	2018-07-04 20:09:22 UTC (rev 352148)
@@ -6,8 +6,8 @@
 # Contributor: JD Steffen <jd at steffennet dot org>
 
 pkgname=simutrans
-pkgver=120.2.2
-_pkgver=120-2-2
+pkgver=120.3
+_pkgver=120-3
 pkgrel=1
 pkgdesc="An open source transportation simulation game"
 arch=('x86_64')
@@ -18,16 +18,14 @@
 optdepends=('timidity++: play MIDI music')
 source=(https://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver.zip
         https://downloads.sourceforge.net/$pkgname/simulinux-$_pkgver.zip
-        no-optimise.patch
         settings-folder.patch
         path-for-game-data.patch
         config.patch
         simutrans.desktop)
-sha256sums=('7f22c144377abf1a0ee49432f3f6f5eb9a620567960df31d2ea6399b17cf26fa'
-            '029891edb59036183a6e2757a6a01eb7eddec263043650aabaf49e948497328a'
-            '2425da5c5b211a2688fa8809caf6362b731d897254d2c5ae2293d28276aa9c58'
+sha256sums=('6f68785798688bf956b0d7f5971a8d8fa42d12199011665b07b903164cb3929f'
+            '9ed2cbadbc0b952b32498eb1ed29e3ce1b44204501084876a2153ce09c991239'
             'cbe5d7c7be96e6e7262c1e3b1c16155f5c179609f081e3ee050bbfc277845f71'
-            '59a606ecac52b338a3eea120ab8a04b95457fdd4ae6ea4e10087ef0da4724aa2'
+            '1a0fc75fe1422404e424c91f5a23301234b2997cb727b4985c98ac1af6a4582a'
             '24bf2b611706c42fd52dc00d61fa2e28f54a614f17e43bc463817406e63eba3a'
             '99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3')
 
@@ -35,9 +33,6 @@
   # Some files are distributed in DOS format
   find . -type f -exec dos2unix -q '{}' \;
 
-  # Don't overwrite default optimization flags
-  patch -Np1 -i no-optimise.patch
-
   # Adjust paths
   patch -Np0 -i settings-folder.patch
   patch -Np1 -i path-for-game-data.patch

Deleted: no-optimise.patch
===================================================================
--- no-optimise.patch	2018-07-04 20:08:47 UTC (rev 352147)
+++ no-optimise.patch	2018-07-04 20:09:22 UTC (rev 352148)
@@ -1,42 +0,0 @@
-diff -Naur simutrans.orig/Makefile simutrans/Makefile
---- simutrans.orig/Makefile	2014-11-20 17:50:34.948410000 +0100
-+++ simutrans/Makefile	2014-11-20 17:51:43.936577860 +0100
-@@ -76,17 +76,6 @@
- SDL_CONFIG     ?= sdl-config
- SDL2_CONFIG    ?= sdl2-config
- 
--ifneq ($(OPTIMISE),)
--  CFLAGS += -O3
--  ifeq ($(findstring $(OSTYPE), amiga),)
--    ifneq ($(findstring $(CXX), clang),)
--      CFLAGS += -minline-all-stringops
--    endif
--  endif
--else
--  CFLAGS += -O
--endif
--
- ifdef DEBUG
- 	ifndef MSG_LEVEL
- 		MSG_LEVEL = 3
-diff -Naur simutrans.orig/makeobj/Makefile simutrans/makeobj/Makefile
---- simutrans.orig/makeobj/Makefile	2014-11-20 17:50:34.945077000 +0100
-+++ simutrans/makeobj/Makefile	2014-11-20 17:51:42.553214510 +0100
-@@ -42,17 +42,6 @@
-   CXXFLAGS   += -DUSE_HW -DUSE_C
- endif
- 
--ifneq ($(OPTIMISE),)
--  CFLAGS   += -O3 -fno-schedule-insns
--  CXXFLAGS += -O3 -fno-schedule-insns
--  ifneq ($(OSTYPE),mac)
--    CFLAGS  += -minline-all-stringops
--  endif
--else
--  CFLAGS   += -O
--  CXXFLAGS += -O
--endif
--
- ifdef DEBUG
-   ifeq ($(shell expr $(DEBUG) \>= 1), 1)
-     CFLAGS   += -g -DDEBUG

Modified: path-for-game-data.patch
===================================================================
--- path-for-game-data.patch	2018-07-04 20:08:47 UTC (rev 352147)
+++ path-for-game-data.patch	2018-07-04 20:09:22 UTC (rev 352148)
@@ -5,13 +5,13 @@
 --- simutrans.orig/simmain.cc
 +++ simutrans/simmain.cc
 @@ -437,8 +437,9 @@
- 		strcat( env_t::program_dir, path_sep );
+ 		strcat( env_t::program_dir, PATH_SEPARATOR );
  	}
  	else {
 -		strcpy( env_t::program_dir, argv[0] );
--		*(strrchr( env_t::program_dir, path_sep[0] )+1) = 0;
+-		*(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
 +		// strcpy( env_t::program_dir, argv[0] );
-+		// *(strrchr( env_t::program_dir, path_sep[0] )+1) = 0;
++		// *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
 +		strcpy(env_t::program_dir, "/usr/share/games/simutrans/");
  
  #ifdef __APPLE__