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

[Balló György]

    Date: Sunday, January 31, 2016 @ 05:40:44
  Author: bgyorgy
Revision: 159650

upgpkg: simutrans 120.1.2-1

Update to new version

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

-------------------+
 PKGBUILD          |   12 ++++++------
 no-optimise.patch |    6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-31 04:02:59 UTC (rev 159649)
+++ PKGBUILD	2016-01-31 04:40:44 UTC (rev 159650)
@@ -6,8 +6,8 @@
 # Contributor: JD Steffen <jd at steffennet dot org>
 
 pkgname=simutrans
-pkgver=120.1.1
-_pkgver=120-1-1
+pkgver=120.1.2
+_pkgver=120-1-2
 pkgrel=1
 pkgdesc="An open source transportation simulation game"
 arch=('i686' 'x86_64')
@@ -17,15 +17,15 @@
 makedepends=('imagemagick' 'dos2unix')
 optdepends=('timidity++: play MIDI music')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver.zip
-        http://downloads.sourceforge.net/$pkgname/simulinux-x86-$_pkgver.zip
+        http://downloads.sourceforge.net/$pkgname/simulinux-i86-$_pkgver.zip
         no-optimise.patch
         settings-folder.patch
         path-for-game-data.patch
         config.patch
         simutrans.desktop)
-md5sums=('56e8fe355ba7dc92e64fff935ea74d27'
-         '6e2fe703ec7411d21af93cf43e085c41'
-         'f64ec240c1582b863f748bf190b3bd1b'
+md5sums=('516c7c6fbd0882a2ef0e29589cb3b7bd'
+         '5b57cc5bf1622c64b4aeba5041c92445'
+         '4ab1d787772fc279181c1bc89dd42bf9'
          'c87d9a9910bc371df5d50f7f1ec298bb'
          'e716340d372af264ca05510facfe5d2c'
          'c2f4e494168e235380373974c91a0803'

Modified: no-optimise.patch
===================================================================
--- no-optimise.patch	2016-01-31 04:02:59 UTC (rev 159649)
+++ no-optimise.patch	2016-01-31 04:40:44 UTC (rev 159650)
@@ -1,7 +1,7 @@
 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,15 +76,6 @@
+@@ -76,17 +76,6 @@
  SDL_CONFIG     ?= sdl-config
  SDL2_CONFIG    ?= sdl2-config
  
@@ -8,7 +8,9 @@
 -ifneq ($(OPTIMISE),)
 -  CFLAGS += -O3
 -  ifeq ($(findstring $(OSTYPE), amiga),)
--    CFLAGS += -minline-all-stringops
+-	ifneq ($(findstring $(CXX), clang),)
+-		CFLAGS += -minline-all-stringops
+-	endif
 -  endif
 -else
 -  CFLAGS += -O