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

[Balló György]

    Date: Thursday, March 30, 2017 @ 09:29:23
  Author: bgyorgy
Revision: 220072

upgpkg: simutrans 120.2.1-1

Update to new version

Modified:
  simutrans/trunk/PKGBUILD
  simutrans/trunk/config.patch
  simutrans/trunk/no-optimise.patch

-------------------+
 PKGBUILD          |   21 ++++++++++-----------
 config.patch      |    2 +-
 no-optimise.patch |   10 +++++-----
 3 files changed, 16 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-30 09:13:25 UTC (rev 220071)
+++ PKGBUILD	2017-03-30 09:29:23 UTC (rev 220072)
@@ -6,9 +6,8 @@
 # Contributor: JD Steffen <jd at steffennet dot org>
 
 pkgname=simutrans
-pkgver=120.2
-_pkgver=120-2
-_pkgver2=120-2-r8077
+pkgver=120.2.1
+_pkgver=120-2-1
 pkgrel=1
 pkgdesc="An open source transportation simulation game"
 arch=('i686' 'x86_64')
@@ -17,7 +16,7 @@
 depends=('gcc-libs' 'zlib' 'sdl_mixer' 'bzip2' 'simutrans-pak64')
 makedepends=('imagemagick' 'dos2unix')
 optdepends=('timidity++: play MIDI music')
-source=(https://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver2.zip
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver.zip
         https://downloads.sourceforge.net/$pkgname/simulinux-$_pkgver.zip
         no-optimise.patch
         settings-folder.patch
@@ -24,13 +23,13 @@
         path-for-game-data.patch
         config.patch
         simutrans.desktop)
-md5sums=('ff437c0e6698f3719534d78d4d47f74b'
-         '4e1dbf836a4b4194a357978869134f0a'
-         '4ab1d787772fc279181c1bc89dd42bf9'
-         'c87d9a9910bc371df5d50f7f1ec298bb'
-         'e716340d372af264ca05510facfe5d2c'
-         '9b43ba428a9f6a41233dcc90c8a0a3a7'
-         'f41f7a08ad517ef2b60412859eb49963')
+sha256sums=('7dfbd1c44f47ddd8caedb3da77dac8262652f96e1c9ffd890b67757e08ddc942'
+            'c0f94631252916b50ef4d3668060bbae047423d40164cc9c8fad7d4d7ad3aace'
+            '2425da5c5b211a2688fa8809caf6362b731d897254d2c5ae2293d28276aa9c58'
+            'cbe5d7c7be96e6e7262c1e3b1c16155f5c179609f081e3ee050bbfc277845f71'
+            '59a606ecac52b338a3eea120ab8a04b95457fdd4ae6ea4e10087ef0da4724aa2'
+            '24bf2b611706c42fd52dc00d61fa2e28f54a614f17e43bc463817406e63eba3a'
+            '99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3')
 
 prepare() {
   cd "$srcdir"

Modified: config.patch
===================================================================
--- config.patch	2017-03-30 09:13:25 UTC (rev 220071)
+++ config.patch	2017-03-30 09:29:23 UTC (rev 220072)
@@ -19,7 +19,7 @@
  #OSTYPE = haiku
 -#OSTYPE = linux
 +OSTYPE = linux
- #OSTYPE = mingw64
+ #OSTYPE = mingw
  #OSTYPE = mac
  
 @@ -37,6 +37,6 @@

Modified: no-optimise.patch
===================================================================
--- no-optimise.patch	2017-03-30 09:13:25 UTC (rev 220071)
+++ no-optimise.patch	2017-03-30 09:29:23 UTC (rev 220072)
@@ -8,9 +8,9 @@
 -ifneq ($(OPTIMISE),)
 -  CFLAGS += -O3
 -  ifeq ($(findstring $(OSTYPE), amiga),)
--	ifneq ($(findstring $(CXX), clang),)
--		CFLAGS += -minline-all-stringops
--	endif
+-    ifneq ($(findstring $(CXX), clang),)
+-      CFLAGS += -minline-all-stringops
+-    endif
 -  endif
 -else
 -  CFLAGS += -O
@@ -17,8 +17,8 @@
 -endif
 -
  ifdef DEBUG
-   ifeq ($(shell expr $(DEBUG) \>= 1), 1)
-     CFLAGS += -g -DDEBUG
+ 	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