Patched CCFastTMXLayer.cpp and SkeletonRenderer.cpp

4 files changed, 33 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8525f101bded..72258b0c2302 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Sep 17 17:48:51 UTC 2016
+# Mon Sep 19 20:56:17 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.13.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://cdn.cocos2d-x.org/
 	arch = i686
 	arch = x86_64
@@ -29,6 +29,8 @@ pkgbase = cocos2d-x-src
 	source = RuntimeCCSImpl.patch
 	source = SocketIO.patch
 	source = CCTMXLayer.patch
+	source = SkeletonRenderer.patch
+	source = CCFastTMXLayer.patch
 	sha1sums = 1138d61fbbebf3a2edd12d81f0d9834c5ead6df3
 	sha1sums = 2cff669a51b66d513824be811688aa9da553e400
 	sha1sums = 353bdefe07bdb6eb7f53aff20d20e83b488c1c05
@@ -36,6 +38,8 @@ pkgbase = cocos2d-x-src
 	sha1sums = 716869895fc2b071c66a58f727c643f48e927569
 	sha1sums = b042a9fa4c7ea6d472985b1b61d0a57ebf56708a
 	sha1sums = c6cf99ba9fcd7fa4f80c1f3014c6c0b5fd34120a
+	sha1sums = 14a210d050111990b2e8fad6bd56eb513f415057
+	sha1sums = c9f498fe41fb397e710ea05ccd89b7f808ae4d48
 
 pkgname = cocos2d-x-src
 
diff --git a/CCFastTMXLayer.patch b/CCFastTMXLayer.patch
new file mode 100644
index 000000000000..5a37a64317c2
--- /dev/null
+++ b/CCFastTMXLayer.patch
@@ -0,0 +1,9 @@
+@@ -130,7 +130,7 @@ TMXLayer::~TMXLayer()
+ {
+     CC_SAFE_RELEASE(_tileSet);
+     CC_SAFE_RELEASE(_texture);
+-    CC_SAFE_DELETE_ARRAY(_tiles);
++    CC_SAFE_FREE(_tiles);
+     CC_SAFE_RELEASE(_vData);
+     CC_SAFE_RELEASE(_vertexBuffer);
+     CC_SAFE_RELEASE(_indexBuffer);
diff --git a/PKGBUILD b/PKGBUILD
index 830ecef567d2..3dd9d32881b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _appname=cocos2d-x
 pkgname=cocos2d-x-src
 pkgver=3.13.1
-pkgrel=1
+pkgrel=2
 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://cdn.cocos2d-x.org/"
@@ -20,6 +20,8 @@ source=(
 "RuntimeCCSImpl.patch"
 "SocketIO.patch"
 "CCTMXLayer.patch"
+"SkeletonRenderer.patch"
+"CCFastTMXLayer.patch"
 )
 sha1sums=(
 '1138d61fbbebf3a2edd12d81f0d9834c5ead6df3'
@@ -29,6 +31,8 @@ sha1sums=(
 '716869895fc2b071c66a58f727c643f48e927569'
 'b042a9fa4c7ea6d472985b1b61d0a57ebf56708a'
 'c6cf99ba9fcd7fa4f80c1f3014c6c0b5fd34120a'
+'14a210d050111990b2e8fad6bd56eb513f415057'
+'c9f498fe41fb397e710ea05ccd89b7f808ae4d48'
 )
 
 
@@ -44,10 +48,12 @@ package() {
 	install -Dm755 "$_appname.sh" "$pkgdir/etc/profile.d/$_appname.sh"
 	install -Dm755 "$_appname.csh" "$pkgdir/etc/profile.d/$_appname.csh"
 
-	# Patch memory leaks:
+	# Patch found issues:
 	patch "$srcdir"/$_appname-$pkgver/tools/simulator/libsimulator/lib/runtime/RuntimeCCSImpl.cpp RuntimeCCSImpl.patch
 	patch "$srcdir"/$_appname-$pkgver/cocos/network/SocketIO.cpp SocketIO.patch
 	patch "$srcdir"/$_appname-$pkgver/cocos/2d/CCTMXLayer.cpp CCTMXLayer.patch
+	patch "$srcdir"/$_appname-$pkgver/cocos/editor-support/spine/SkeletonRenderer.cpp SkeletonRenderer.patch
+	patch "$srcdir"/$_appname-$pkgver/cocos/2d/CCFastTMXLayer.cpp CCFastTMXLayer.patch
 
 	# Necessary libfmod symbolic link
 	mkdir -p "$pkgdir/usr/lib"
@@ -67,5 +73,5 @@ package() {
 	chmod 755 "$srcdir"/$_appname-$pkgver/tools/cocos2d-console/plugins/plugin_package/sdkbox
 
 	# Package source
-	mv "$srcdir"/$_appname-$pkgver/* "$pkgdir/opt/$_appname" 	
+	mv "$srcdir"/$_appname-$pkgver/* "$pkgdir/opt/$_appname"
 }
diff --git a/SkeletonRenderer.patch b/SkeletonRenderer.patch
new file mode 100644
index 000000000000..556b929d4fb8
--- /dev/null
+++ b/SkeletonRenderer.patch
@@ -0,0 +1,9 @@
+@@ -98,7 +98,7 @@ SkeletonRenderer::~SkeletonRenderer () {
+ 	spSkeleton_dispose(_skeleton);
+ 	if (_atlas) spAtlas_dispose(_atlas);
+ 	if (_attachmentLoader) spAttachmentLoader_dispose(_attachmentLoader);
+-	delete _worldVertices;
++	delete [] _worldVertices;
+ }
+ 
+ void SkeletonRenderer::initWithData (spSkeletonData* skeletonData, bool ownsSkeletonData) {