Accepting request 1268184 from games

OBS-URL: https://build.opensuse.org/request/show/1268184
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/simutrans?expand=0&rev=12

config.default

@@ -87,7 +87,7 @@ USE_FLUIDSYNTH_MIDI = 1
 # In order to use the flags, add a line like this: (-Dxxx)
 # FLAGS = -DUSE_C
 
-FLAGS += -DREVISION="11351"
+FLAGS += -DREVISION="11671"
 
 # Output directories:
 #

returnNull.patch

@@ -0,0 +1,14 @@
+Index: src/simutrans/tool/simtool.cc
+===================================================================
+--- old/src/simutrans/tool/simtool.cc	(revision 11680)
++++ new/src/simutrans/tool/simtool.cc	(working copy)
+@@ -2951,8 +2951,8 @@
+ 			return error;
+ 		}
+ 		bridge_builder_t::build_bridge( player, start, end, zv, bridge_height, desc, way_builder_t::weg_search(desc->get_waytype(), desc->get_topspeed(), welt->get_timeline_year_month(), type_flat));
+-		return NULL; // all checks are performed before building.
+ 	}
++	return NULL; // all checks are performed before building.
+ }
+ 
+ void tool_build_bridge_t::rdwr_custom_data(memory_rw_t *packet)

simutrans-fhs-home-directory.patch

@@ -1,12 +1,12 @@
 diff -ru old/src/simutrans/sys/simsys.cc new/src/simutrans/sys/simsys.cc
 --- old/src/simutrans/sys/simsys.cc
 +++ new/src/simutrans/sys/simsys.cc
-@@ -554,7 +554,7 @@
- 	}
- #else
+@@ -562,7 +562,7 @@
+ 	int maxlen = PATH_MAX + 22;
+ 	unsigned n;
  	if( getenv("XDG_DATA_HOME") == NULL ) {
--		sprintf(buffer, "%s/simutrans", getenv("HOME"));
-+		sprintf(buffer, "%s/.simutrans", getenv("HOME"));
- 	} else {
- 		sprintf(buffer, "%s/simutrans", getenv("XDG_DATA_HOME"));
+-		n = snprintf(buffer, maxlen, "%s/simutrans", getenv("HOME"));
++		n = snprintf(buffer, maxlen, "%s/.simutrans", getenv("HOME"));
  	}
+ 	else {
+ 		n = snprintf(buffer, maxlen, "%s/simutrans", getenv("XDG_DATA_HOME"));

simutrans-makefile.patch

@@ -1,7 +1,7 @@
 diff -ru old/Makefile new/Makefile
 --- old/Makefile
 +++ new/Makefile
-@@ -272,7 +272,7 @@
+@@ -274,7 +274,7 @@
    DUMMY := $(shell rm -f src/simutrans/revision.h)
  else
    ifeq ("$(wildcard src/simutrans/revision.h)","")

simutrans-src-124-1.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0fc4e071a8b7fe1931b30fc0293aa68967f943c6fa6d89c6df119eb3d84d5437
-size 5965405

simutrans-src-124-2-1.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5de58f340ffa7f06f83a358a92925c6869ac517344c70e7ae49590860faf520
-size 5422371

simutrans-src-124-3-1.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9c9afc7a3ed5250a59fb2ff7650967f566c06b011ed62985c201adb70475602
+size 6251853

simutrans.changes

@@ -1,3 +1,61 @@
+-------------------------------------------------------------------
+Sun Apr  6 10:03:06 UTC 2025 - Michiel van der Wulp <michiel.vanderwulp@gmail.com> - 124.3.1
+
+- Update to new version 124.3.1
+- In the words of prissi: This is mostly a bugfixing release, improving bridge building 
+(which now requires dragging or two clicks) and multitile city buildings. 
+You can change the currency symbol and a bad memory consumption bug was removed. 
+Cost and maintenance can be now much higher, so a new makeobj is needed too 
+if one wants to go that way.
+- This release is built from svn revision number 11671.
+- Added a patch "returnNull.patch" to solve a build error "this statement may fall through".
+
+-------------------------------------------------------------------
+Mon Feb  3 18:56:01 UTC 2025 - Michiel van der Wulp <michiel.vanderwulp@gmail.com> - 124.3
+
+- Remove deprecated %suse_update_desktop_file - no need any more thanks to 
+https://forum.simutrans.com/index.php/topic,23253.msg208733.html#msg208733
+- See lots of explanation at https://en.opensuse.org/openSUSE:Update-desktop-files_deprecation
+
+-------------------------------------------------------------------
+Mon Jan 27 15:18:56 UTC 2025 - Michiel van der Wulp <michiel.vanderwulp@gmail.com> - 124.3
+
+- simutrans failed with: "FATAL ERROR: gui_theme_t::init_gui_themes - Wrong theme loaded". 
+This is caused by the lacking theme pak files in the simutrans src file (as supplied upstream).
+All atempts to build the themes with the supplied build_themes.sh script failed.
+Hence, the needed files were retrieved from the Subversion source.
+- patched the build_themes.sh, reported upstream as: https://forum.simutrans.com/index.php/topic,23401.0.html
+
+-------------------------------------------------------------------
+Mon Jan 13 13:38:13 UTC 2025 - Michiel van der Wulp <michiel.vanderwulp@gmail.com> - 124.3
+
+- update to version 124.3 (r11590 on 10-Jan-2025)
+- see for more information about this release:
+https://forum.simutrans.com/index.php/topic,23369.0.html
+- in the words of prissi: "This release saw lots of bugfixing. 
+It features also two new tools, a pipette tool that lets you build whatever 
+you have clicked on (if allowed) and a marco editor, where you can copy 
+your favorite airport (or whatever layout) and build it again 
+by a single mouse click. Finally, the tutorial saw major rework 
+and is much more stable."
+- Complete history can be found at (unofficial): 
+https://github.com/simutrans/simutrans/blob/master/simutrans/history.txt
+- Some explanation about the new tools is given at 
+https://blog.simutrans.com/?p=2532
+
+-------------------------------------------------------------------
+Wed Dec 11 06:35:24 UTC 2024 - Michiel van der Wulp <michiel.vanderwulp@gmail.com> - 124-2-2
+
+- update to version 124.2.2 (r11400 on 31-August-2024)
+- See for more information about the 124.2.2 release:
+https://forum.simutrans.com/index.php/topic,23193.0.html
+- In the words of prissi: "... There were even some ancient bugs unearthed with crossings 
+and tiles with ways in cities and more. On Intel/AMD cpu's the memory footprint 
+became 10% smaller with some faster sync_step."
+- Complete history can be found at (unofficial): 
+https://github.com/simutrans/simutrans/blob/master/simutrans/history.txt
+
+
 -------------------------------------------------------------------
 Wed Jul 31 08:13:14 UTC 2024 - Michiel van der Wulp <michiel.vanderwulp@gmail.com> - 124-2-1
 

simutrans.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package simutrans
 #
-# Copyright (c) 2020-2024 SUSE LLC
+# Copyright (c) 2020-2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,31 +16,32 @@
 #
 
 
-%define pkgver 124-2-1
+%define pkgver 124-3-1
 Name:           simutrans
-Version:        124.2.1
+Version:        124.3.1
 Release:        0
 Summary:        Transport and Economic Simulation Game
 License:        Artistic-1.0
 Group:          Amusements/Games/Strategy/Real Time
 URL:            http://sourceforge.net/projects/simutrans/
-Source0:        http://downloads.sourceforge.net/simutrans/simutrans-src-%{pkgver}.zip
+Source0:        simutrans-src-124-3-1.zip
 Source1:        config.default
 Source2:        http://www.simutrans.com/images/resources/simutrans-square.svg
 # PATCH-FIX-UPSTREAM http://forum.simutrans.com/index.php?topic=11173.0
 Patch0:         simutrans-fhs-home-directory.patch
 Patch1:         simutrans-makefile.patch
+# PATCH-FIX-UPSTREAM https://forum.simutrans.com/index.php/topic,23464.0.html
+Patch2:         returnNull.patch
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  unzip
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(sdl2)
+BuildRequires:  pkgconfig(sdl2) 
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  freetype2-devel
 %if 0%{?suse_version}
 BuildRequires:  fdupes
-BuildRequires:  update-desktop-files
 %endif
 BuildRequires:  dos2unix
 BuildRequires:  hicolor-icon-theme
@@ -48,9 +49,9 @@ BuildRequires:  hicolor-icon-theme
 BuildRequires:  fluidsynth-devel >= 2.1.0
 Requires:       fluid-soundfont-gm
 BuildRequires:  libzstd-devel
-Recommends:     %{name}-pak128 >= 2.9.1
+Recommends:     %{name}-pak128 >= 2.10.0
 Suggests:       %{name}-pak128-german >= 2.2
-Suggests:       %{name}-pak64 >= 124.2
+Suggests:       %{name}-pak64 >= 124.3
 Suggests:       %{name}-makeobj
 
 %description
@@ -72,7 +73,8 @@ Makeobj is a easy to use software used to compile .dat files and .png pictures
 to simutrans .pak files.
 
 %prep
-%autosetup -p1 -c -n simutrans
+# In the next line, remove the -v for verbose if you want to be more quiet:
+%autosetup -v -p1 -c -n simutrans
 
 cp %{SOURCE1} .
 # files with the wrong line-endings, which give a rpmlint warning:
@@ -82,10 +84,11 @@ cp %{SOURCE1} .
 export CFLAGS="%{optflags}"
 export CCFLAGS="$CFLAGS"
 %make_build all makeobj
-# The next 3 lines did not function correctly; so now we use the available theme pak files:
-# cd themes.src
-# sed -i 's|../makeobj|../../build/default/makeobj/makeobj|g' build_themes.sh
-# ./build_themes.sh
+# The build_themes.sh script used to be broken, see upstream report:
+# https://forum.simutrans.com/index.php/topic,23401.0.html
+cd themes.src
+sed -i 's|../../src/makeobj/makeobj|../../build/default/makeobj/makeobj|g' build_themes.sh
+./build_themes.sh
 
 %install
 # Create starter-wrapper script (not a source so we can use directory macros):
@@ -112,7 +115,7 @@ mv -v %{buildroot}%{_datadir}/%{name}/*.txt %{buildroot}%{_docdir}/%{name}
 # Install icon and .desktop file
 install -vDm644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %if 0%{?suse_version}
-%suse_update_desktop_file -c simutrans "Simutrans" "Transportation Simulation Game" "simutrans" simutrans Game StrategyGame
+install -D -m 0644 src/linux/simutrans.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
 %fdupes %{buildroot}%{_datadir}/%{name}
 %endif