Hello community, here is the log from the commit of package openttd for openSUSE:Factory checked in at 2015-06-23 11:58:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openttd (Old) and /work/SRC/openSUSE:Factory/.openttd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openttd" Changes: -------- --- /work/SRC/openSUSE:Factory/openttd/openttd.changes 2015-06-08 08:30:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openttd.new/openttd.changes 2015-06-23 11:58:20.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 19 12:33:54 UTC 2015 - [email protected] + +- Add openttd-gcc5.patch: Fix build with gcc 5. + +------------------------------------------------------------------- New: ---- openttd-gcc5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openttd.spec ++++++ --- /var/tmp/diff_new_pack.78ppGs/_old 2015-06-23 11:58:20.000000000 +0200 +++ /var/tmp/diff_new_pack.78ppGs/_new 2015-06-23 11:58:20.000000000 +0200 @@ -25,6 +25,7 @@ Group: Amusements/Games/Strategy/Other Url: http://www.openttd.org Source: http://binaries.openttd.org/releases/%{version}/%{name}-%{version}-source.tar.xz +Patch0: openttd-gcc5.patch BuildRequires: SDL-devel BuildRequires: fontconfig-devel BuildRequires: gcc-c++ @@ -100,6 +101,7 @@ %prep %setup -qn %{name}-%{version} +%patch0 -p1 # Remove build time references so build-compare can do its work sed -i "s/__DATE__/\"openSUSE\"/" src/rev.cpp.in ++++++ openttd-gcc5.patch ++++++ Index: openttd-1.5.1/config.lib =================================================================== --- openttd-1.5.1.orig/config.lib +++ openttd-1.5.1/config.lib @@ -1317,7 +1317,11 @@ make_compiler_cflags() { ldflags="$ldflags -rdynamic" else # Enable some things only for certain GCC versions - cc_version=`$1 -dumpversion | cut -c 1,3` + cc_version=`$1 -dumpversion | cut -c 1,3` + if [ $cc_version -eq 5 ]; then + # Special case: GCC 5.0 reports only '5' + cc_version=50 + fi if [ $cc_version -lt 33 ]; then log 1 "configure: error: gcc older than 3.3 can't compile OpenTTD because of its poor template support"
