From aafef4ae76dc578b3657ae9f1bd384bc84c7bc0f Mon Sep 17 00:00:00 2001
From: Jens Lody <fedora@jenslody.de>
Date: Apr 24 2017 06:30:49 +0000
Subject: Rebuild for astyle 2.06

Backport crashfix (wxSmith-plugin)

---

diff --git a/codeblocks-16.01-wxsmith.patch b/codeblocks-16.01-wxsmith.patch
new file mode 100644
index 0000000..8c9f35d
--- /dev/null
+++ b/codeblocks-16.01-wxsmith.patch
@@ -0,0 +1,26 @@
+From 28fcf8f1edce15f624780c5bf7ae6f39dd936678 Mon Sep 17 00:00:00 2001
+From: jenslody <jenslody@2a5c6006-c6dd-42ca-98ab-0921f2732cef>
+Date: Sat, 22 Apr 2017 14:25:27 +0000
+Subject: * wxSmith-plugin: fix crash, when closing wxs-file and a sub-property
+ is selected; see: http://forums.codeblocks.org/index.php/topic,21893.0.html
+
+git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@11053 2a5c6006-c6dd-42ca-98ab-0921f2732cef
+
+Version-number in wxCHECK_VERSION modified to make patch work
+jenslody Mon Apr 24 2017
+
+diff --git a/src/plugins/contrib/wxSmith/properties/wxspropertygridmanager.cpp b/src/plugins/contrib/wxSmith/properties/wxspropertygridmanager.cpp
+index 87d055d..f37d9d6 100644
+--- a/src/plugins/contrib/wxSmith/properties/wxspropertygridmanager.cpp
++++ b/src/plugins/contrib/wxSmith/properties/wxspropertygridmanager.cpp
+@@ -171,6 +171,10 @@ void wxsPropertyGridManager::UnbindPropertyContainer(wxsPropertyContainer* PC, b
+     {
+         if ( PGContainers[i] == PC )
+         {
++            // before deleting the property, make sure all children are hidden or we can get a crash
++            // we do this by recursively hiding the property and it's children
++            // should fix http://forums.codeblocks.org/index.php/topic,21893.0.html
++            PGIDs[i]->Hide(true);
+             #if wxCHECK_VERSION(2, 9, 0) || wxCHECK_PROPGRID_VERSION(1, 4, 0)
+             DeleteProperty(PGIDs[i]);
+             #else
diff --git a/codeblocks.spec b/codeblocks.spec
index 7853a88..c0e1e2e 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -7,7 +7,7 @@
 
 Name:		codeblocks
 Version:	16.01
-Release:	7%{?svnrelease}%{?dist}
+Release:	8%{?svnrelease}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 License:	GPLv3+
 URL:		http://www.codeblocks.org/
@@ -38,6 +38,8 @@ Patch5:		codeblocks-16.01-spellchecker-settings.patch
 Patch6:		codeblocks-16.01-gcc7.patch
 # backport changes for astyle 2.06
 Patch7:		codeblocks-16.01-astyle2.06-backport.patch
+# backport patch for crash in wxSmith
+Patch8:		codeblocks-16.01-wxsmith.patch
 
 BuildRequires:	libtool
 BuildRequires:	wxGTK-devel
@@ -137,6 +139,7 @@ cp %{SOURCE4} src/plugins/contrib/source_exporter/wxPdfDocument/samples/minimal/
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 %endif
 
 
@@ -407,6 +410,10 @@ fi
 
 
 %changelog
+* Mon Apr 24 2017 Jens Lody <fedora@jenslody.de> - 16.01-8
+- Rebuild for astyle 2.06
+- Backport crashfix (wxSmith-plugin)
+
 * Tue Feb 14 2017 Jens Lody <fedora@jenslody.de> - 16.01-7
 - Build fix, removed diff that slipped in