Full std::isnan patch -- cocos2d-x V3.10

Tests can now be compiled successfully.

4 files changed, 24 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1fefec9a5368..331f77a7d94c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Mar  8 08:49:38 UTC 2016
+# Sun Mar 20 14:05:11 UTC 2016
 pkgbase = cocos2d-x-src
 	pkgdesc = Cocos2D-X is a game engine that supports multiple platforms such as iOS, Android, WinXP/7/8, WP8, BlackBerry, MeeGo, Marmelade, WebOS, Mac OS X
 	pkgver = 3.10
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.cocos2d-x.org/filedown/
 	arch = i686
 	arch = x86_64
@@ -26,14 +26,10 @@ pkgbase = cocos2d-x-src
 	source = README
 	source = cocos2d-x.sh
 	source = cocos2d-x.csh
-	source = CCActionCamera.patch
-	source = CCControlUtils.patch
 	sha1sums = c8bb2a1d355d3c6a342fb0f95b0e47f0113eada7
 	sha1sums = 1f9b4f74223b5ac1ec235c553e9eca2a2c927eca
 	sha1sums = 353bdefe07bdb6eb7f53aff20d20e83b488c1c05
 	sha1sums = 49b7919fc38803c1dd2f5b1d47fb0c75fde1fec6
-	sha1sums = d28977c340ffa686a188246c6875c837bbc01fd6
-	sha1sums = 3bb44fe6e6a8f3278ffddc6c849ba97ada31cd30
 
 pkgname = cocos2d-x-src
 
diff --git a/CCActionCamera.patch b/CCActionCamera.patch
deleted file mode 100644
index 4ef19bfdf56e..000000000000
--- a/CCActionCamera.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./cocos/2d/CCActionCamera.cpp	2015-10-21 05:07:32.000000000 -0400
-+++ ./cocos/2d/CCActionCameraPatched.cpp	2016-03-06 16:32:51.413506737 -0400
-@@ -29,6 +29,11 @@ THE SOFTWARE.
- #include "2d/CCNode.h"
- #include "platform/CCStdC.h"
- 
-+#if ( CC_TARGET_PLATFORM == CC_PLATFORM_LINUX )
-+#include "math.h"
-+using std::isnan;
-+#endif
-+
- NS_CC_BEGIN
- //
- // CameraAction
diff --git a/CCControlUtils.patch b/CCControlUtils.patch
deleted file mode 100644
index d1c615ef3fc5..000000000000
--- a/CCControlUtils.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./extensions/GUI/CCControlExtension/CCControlUtils.cpp	2016-02-28 22:02:18.206802375 -0400
-+++ ./extensions/GUI/CCControlExtension/CCControlUtilsPatched.cpp	2016-03-06 16:33:17.555909367 -0400
-@@ -24,6 +24,11 @@ THE SOFTWARE.
- 
- #include "CCControlUtils.h"
- 
-+#if ( CC_TARGET_PLATFORM == CC_PLATFORM_LINUX )
-+#include "math.h"
-+using std::isnan;
-+#endif
-+
- NS_CC_EXT_BEGIN
- 
- Sprite* ControlUtils::addSpriteToTargetWithPosAndAnchor(const char* spriteName, Node * target, Vec2 pos, Vec2 anchor)
diff --git a/PKGBUILD b/PKGBUILD
index c1c5135299a2..1152651b70d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _appname=cocos2d-x
 pkgname=cocos2d-x-src
 pkgver=3.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Cocos2D-X is a game engine that supports multiple platforms such as iOS, Android, WinXP/7/8, WP8, BlackBerry, MeeGo, Marmelade, WebOS, Mac OS X"
 arch=('i686' 'x86_64')
 url="http://www.cocos2d-x.org/filedown/"
@@ -15,23 +15,36 @@ source=("${url}${_appname}-${pkgver}.zip"
 "README"
 "$_appname.sh"
 "$_appname.csh"
-"CCActionCamera.patch"
-"CCControlUtils.patch"
 )
 sha1sums=('c8bb2a1d355d3c6a342fb0f95b0e47f0113eada7'
 '1f9b4f74223b5ac1ec235c553e9eca2a2c927eca'
 '353bdefe07bdb6eb7f53aff20d20e83b488c1c05'
 '49b7919fc38803c1dd2f5b1d47fb0c75fde1fec6'
-'d28977c340ffa686a188246c6875c837bbc01fd6'
-'3bb44fe6e6a8f3278ffddc6c849ba97ada31cd30'
 )
 
 prepare() {
 	chmod +x "download-deps.py"
-	patch ./cocos/2d/CCActionCamera.cpp CCActionCamera.patch
-	patch ./extensions/GUI/CCControlExtension/CCControlUtils.cpp CCControlUtils.patch
-	rm CCActionCamera.patch
-	rm CCControlUtils.patch
+
+	# isnan patch
+	sed -e 's/isnan/std::isnan/g' -i  \
+		./cocos/2d/CCActionCamera.cpp \
+		./extensions/GUI/CCControlExtension/CCControlUtils.cpp \
+		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp \
+		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.cpp \
+		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp \
+		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.cpp \
+		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp \
+		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp \
+		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp \
+		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp \
+		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.cpp \
+		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.cpp \
+		./cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp \
+		./cocos/scripting/js-bindings/manual/js_manual_conversions.cpp \
+		./cocos/scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.cpp \
+		./cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.cpp \
+		./tests/js-tests/project/Classes/js_Effect3D_bindings.cpp
+
 	python2 "download-deps.py" -r yes
 }