cocos2d-x V3.13

4 files changed, 47 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a4c4650300f..58b40c478b0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Jul 17 01:28:40 UTC 2016
+# Sat Sep  3 14:42:31 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.12
+	pkgver = 3.13
 	pkgrel = 1
 	url = http://cdn.cocos2d-x.org/
 	arch = i686
@@ -22,14 +22,18 @@ pkgbase = cocos2d-x-src
 	options = !buildflags
 	options = !strip
 	options = staticlibs
-	source = http://cdn.cocos2d-x.org/cocos2d-x-3.12.zip
+	source = http://cdn.cocos2d-x.org/cocos2d-x-3.13.zip
 	source = README
 	source = cocos2d-x.sh
 	source = cocos2d-x.csh
-	sha1sums = 558f7dc86453f1f1ff6fd89ae01fd3f0ded8b327
+	source = RuntimeCCSImpl.patch
+	source = SocketIO.patch
+	sha1sums = 30ab3a821467578df4e1ee9d9b2bbb39ae0605e4
 	sha1sums = 2cff669a51b66d513824be811688aa9da553e400
 	sha1sums = 353bdefe07bdb6eb7f53aff20d20e83b488c1c05
 	sha1sums = 49b7919fc38803c1dd2f5b1d47fb0c75fde1fec6
+	sha1sums = 716869895fc2b071c66a58f727c643f48e927569
+	sha1sums = b042a9fa4c7ea6d472985b1b61d0a57ebf56708a
 
 pkgname = cocos2d-x-src
 
diff --git a/PKGBUILD b/PKGBUILD
index 6932ffa661e9..daff21216738 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _appname=cocos2d-x
 pkgname=cocos2d-x-src
-pkgver=3.12
+pkgver=3.13
 pkgrel=1
 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')
@@ -16,14 +16,19 @@ source=("${url}${_appname}-${pkgver}.zip"
 "README"
 "$_appname.sh"
 "$_appname.csh"
+"RuntimeCCSImpl.patch"
+"SocketIO.patch"
 )
 sha1sums=(
-'558f7dc86453f1f1ff6fd89ae01fd3f0ded8b327'
+'30ab3a821467578df4e1ee9d9b2bbb39ae0605e4'
 '2cff669a51b66d513824be811688aa9da553e400'
 '353bdefe07bdb6eb7f53aff20d20e83b488c1c05'
 '49b7919fc38803c1dd2f5b1d47fb0c75fde1fec6'
+'716869895fc2b071c66a58f727c643f48e927569'
+'b042a9fa4c7ea6d472985b1b61d0a57ebf56708a'
 )
 
+
 prepare() {
 	cd "$srcdir"/$_appname-$pkgver
 	chmod +x "download-deps.py"
@@ -36,8 +41,9 @@ package() {
 	install -Dm755 "$_appname.sh" "$pkgdir/etc/profile.d/$_appname.sh"
 	install -Dm755 "$_appname.csh" "$pkgdir/etc/profile.d/$_appname.csh"
 
-	# Remove unnecessary files:
-	rm "README" "$_appname.sh" "$_appname.csh" "${_appname}-${pkgver}.zip"
+	# Patch memory leaks:
+	patch "$srcdir"/$_appname-$pkgver/tools/simulator/libsimulator/lib/runtime/RuntimeCCSImpl.cpp RuntimeCCSImpl.patch
+	patch "$srcdir"/$_appname-$pkgver/cocos/network/SocketIO.cpp SocketIO.patch
 
 	# Necessary libfmod symbolic link
 	mkdir -p "$pkgdir/usr/lib"
diff --git a/RuntimeCCSImpl.patch b/RuntimeCCSImpl.patch
new file mode 100644
index 000000000000..3cc1e5f9b6f6
--- /dev/null
+++ b/RuntimeCCSImpl.patch
@@ -0,0 +1,12 @@
+@@ -86,9 +86,10 @@
+                     attribute = attribute->Next();
+                 }
+             }
+-
+         }
+ 
++        delete document;
++
+         if (Director::getInstance()->getRunningScene())
+         {
+             auto scene = Scene::create();
diff --git a/SocketIO.patch b/SocketIO.patch
new file mode 100644
index 000000000000..e36bdfc2c0ec
--- /dev/null
+++ b/SocketIO.patch
@@ -0,0 +1,17 @@
+@@ -880,7 +880,6 @@
+                 int control2 = payload.at(0) - '0';
+                 CCLOGINFO("Message code: [%i]", control2);
+ 
+-                SocketIOPacket *packetOut = SocketIOPacket::createPacketWithType("event", _version);
+                 std::string endpoint = "";
+ 
+                 std::string::size_type a = payload.find("/");
+@@ -902,8 +901,6 @@
+                 // we didn't find and endpoint and we are in the default namespace
+                 if (endpoint == "") endpoint = "/";
+ 
+-                packetOut->setEndpoint(endpoint);
+-
+                 c = getClient(endpoint);
+ 
+                 payload = payload.substr(1);