Accepting request 504490 from home:susnux:branches:games

Fixed build with Tumbleweed

OBS-URL: https://build.opensuse.org/request/show/504490
OBS-URL: https://build.opensuse.org/package/show/games/ode?expand=0&rev=4

ode-iso-cpp.patch

@@ -0,0 +1,36 @@
+diff -Nur ode-0.13/ode/demo/demo_jointPR.cpp new/ode/demo/demo_jointPR.cpp
+--- ode-0.13/ode/demo/demo_jointPR.cpp	2013-08-19 19:48:05.000000000 +0200
++++ new/ode/demo/demo_jointPR.cpp	2017-06-18 18:48:14.510435890 +0200
+@@ -329,7 +329,7 @@
+             {
+                 int j = i+1;
+                 if ( j+1 > argc      ||  // Check if we have enough arguments
+-                        argv[j] == '\0' ||  // We should have a path here
++                        argv[j] == NULL ||  // We should have a path here
+                         argv[j][0] == '-' ) // We should have a path not a command line
+                     Help(argv);
+                 else
+diff -Nur ode-0.13/ode/demo/demo_jointPU.cpp new/ode/demo/demo_jointPU.cpp
+--- ode-0.13/ode/demo/demo_jointPU.cpp	2013-12-06 22:52:14.000000000 +0100
++++ new/ode/demo/demo_jointPU.cpp	2017-06-18 18:48:27.954554880 +0200
+@@ -579,7 +579,7 @@
+       if (0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) ) {
+         int j = i+1;
+         if ( j+1 > argc      ||  // Check if we have enough arguments
+-             argv[j] == '\0' ||  // We should have a path here
++             argv[j] == NULL ||  // We should have a path here
+              argv[j][0] == '-' ) // We should have a path not a command line
+           Help (argv);
+         else
+diff -Nur ode-0.13/ode/demo/demo_piston.cpp new/ode/demo/demo_piston.cpp
+--- ode-0.13/ode/demo/demo_piston.cpp	2013-08-19 19:48:05.000000000 +0200
++++ new/ode/demo/demo_piston.cpp	2017-06-18 18:42:38.681453156 +0200
+@@ -659,7 +659,7 @@
+                 {
+                     int j = i+1;
+                     if ( j+1 > argc      ||  // Check if we have enough arguments
+-                            argv[j] == '\0' ||  // We should have a path here
++                            argv[j] == NULL ||  // We should have a path here
+                             argv[j][0] == '-' ) // We should have a path not a command line
+                         Help (argv);
+                     else

ode.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jun 18 16:44:20 UTC 2017 - rpm@fthiessen.de
+
+- Added ode-iso-cpp.patch to fix build with new gcc.
+
 -------------------------------------------------------------------
 Thu May 26 10:26:03 UTC 2016 - dap.darkness@gmail.com
 

ode.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ode
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,8 +27,8 @@ Group:          Development/Libraries/C and C++
 Version:        0.13
 Release:        0
 Source0:        https://sourceforge.net/projects/opende/files/ODE/%{version}/ode-%{version}.tar.bz2
-Source9:        ode-config.1
+Source1:        ode-config.1
-
+Patch0:         ode-iso-cpp.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  freeglut-devel
 BuildRequires:  gcc-c++
@@ -73,6 +73,7 @@ authoring tools and simulation tools.
 
 %prep
 %setup -q -n ode-%{version}
+%patch0 -p1
 
 %build
 #autoreconf -fi
@@ -86,7 +87,7 @@ make V=1 %{?_smp_mflags}
 %install
 make V=1 %{?_smp_mflags} DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}%{_mandir}/man1
-gzip -c9 %{SOURCE9} | tee -a %{buildroot}%{_mandir}/man1/ode-config.1.gz
+gzip -c9 %{SOURCE1} | tee -a %{buildroot}%{_mandir}/man1/ode-config.1.gz
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %ifarch %{ix86}