Fix building

3 files changed, 50 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4bcc207a4e26..dd2c3b2ba458 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Jan  9 22:24:39 UTC 2016
+# Thu Jul 20 08:40:33 UTC 2017
 pkgbase = ode-011
 	pkgdesc = An open source, high performance library for simulating rigid body dynamics
 	pkgver = 0.11.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.ode.org
 	arch = i686
 	arch = x86_64
@@ -13,7 +13,9 @@ pkgbase = ode-011
 	conflicts = ode
 	options = !libtool
 	source = http://downloads.sourceforge.net/opende/ode-0.11.1.tar.bz2
+	source = ptr_int_comparison.patch
 	md5sums = 712579afabc2a15aa56e399f76171477
+	md5sums = f25456ed963238e460fbaf2072bc179c
 
 pkgname = ode-011
 
diff --git a/PKGBUILD b/PKGBUILD
index ca940a987691..682c2d2e2139 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=ode-011
 pkgver=0.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source, high performance library for simulating rigid body dynamics"
 arch=('i686' 'x86_64')
 url="http://www.ode.org"
@@ -16,8 +16,15 @@ license=('LGPL' 'BSD')
 options=('!libtool')
 provides=('ode')
 conflicts=('ode')
-source=("http://downloads.sourceforge.net/opende/ode-$pkgver.tar.bz2")
-md5sums=('712579afabc2a15aa56e399f76171477')
+source=("http://downloads.sourceforge.net/opende/ode-$pkgver.tar.bz2"
+        "ptr_int_comparison.patch")
+md5sums=('712579afabc2a15aa56e399f76171477'
+         'f25456ed963238e460fbaf2072bc179c')
+
+prepare() {
+  cd ode-$pkgver
+  patch -Np2 -i "${srcdir}/ptr_int_comparison.patch"
+}
 
 build() {
   cd ode-$pkgver
diff --git a/ptr_int_comparison.patch b/ptr_int_comparison.patch
new file mode 100644
index 000000000000..a8f327344ea7
--- /dev/null
+++ b/ptr_int_comparison.patch
@@ -0,0 +1,36 @@
+diff -aur src/ode-0.11.1/ode/demo/demo_jointPR.cpp src.new/ode-0.11.1/ode/demo/demo_jointPR.cpp
+--- src/ode-0.11.1/ode/demo/demo_jointPR.cpp	2009-06-09 05:27:20.000000000 +0200
++++ src.new/ode-0.11.1/ode/demo/demo_jointPR.cpp	2017-07-20 10:37:04.576068855 +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] == '\0' ||  // We should have a path here

+                         argv[j][0] == '-' ) // We should have a path not a command line

+                     Help(argv);

+                 else

+diff -aur src/ode-0.11.1/ode/demo/demo_jointPU.cpp src.new/ode-0.11.1/ode/demo/demo_jointPU.cpp
+--- src/ode-0.11.1/ode/demo/demo_jointPU.cpp	2009-06-09 05:27:20.000000000 +0200
++++ src.new/ode-0.11.1/ode/demo/demo_jointPU.cpp	2017-07-20 10:26:48.911936102 +0200
+@@ -577,7 +577,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] == '\0' ||  // We should have a path here
+              argv[j][0] == '-' ) // We should have a path not a command line
+           Help (argv);
+         else
+diff -aur src/ode-0.11.1/ode/demo/demo_piston.cpp src.new/ode-0.11.1/ode/demo/demo_piston.cpp
+--- src/ode-0.11.1/ode/demo/demo_piston.cpp	2009-06-09 05:27:20.000000000 +0200
++++ src.new/ode-0.11.1/ode/demo/demo_piston.cpp	2017-07-20 10:27:14.258330130 +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] == '\0' ||  // We should have a path here
+                             argv[j][0] == '-' ) // We should have a path not a command line
+                         Help (argv);
+                     else