diff --git a/testing/codeblocks/0003-fix-missing-sentinel.patch b/testing/codeblocks/0003-fix-missing-sentinel.patch
deleted file mode 100644
index 1b80e10033a..00000000000
--- a/testing/codeblocks/0003-fix-missing-sentinel.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/sdk/configmanager.cpp
-+++ b/src/sdk/configmanager.cpp
-@@ -612,7 +612,7 @@
-         return wxStandardPathsBase::Get().GetUserDataDir();
- #else
- #ifdef __linux__
--    return wxString::FromUTF8(g_build_filename (g_get_user_config_dir(), "codeblocks", NULL));
-+    return wxString::FromUTF8(g_build_filename (g_get_user_config_dir(), "codeblocks", (void *)NULL));
- #else
-     return wxStandardPathsBase::Get().GetUserDataDir();
- #endif // __linux__
-@@ -1586,7 +1586,7 @@
-     wxString dataPathUser = ConfigManager::config_folder + wxFILE_SEP_PATH + _T("share");
- #ifdef __linux__
-     if (!has_alternate_user_data_path)
--      dataPathUser = wxString::FromUTF8(g_build_filename (g_get_user_data_dir(), NULL));
-+      dataPathUser = wxString::FromUTF8(g_build_filename (g_get_user_data_dir(), (void *)NULL));
- #endif // __linux__
- 
-     ConfigManager::data_path_user = dataPathUser + wxFILE_SEP_PATH + _T("codeblocks");
-@@ -1612,14 +1612,14 @@
- 
-     // ConfigManager::config_folder might be the portable-path but we want to migrate the standard-conform folder,
-     // but only if it not already exists
--    wxString newConfigFolder = wxString::FromUTF8(g_build_filename (g_get_user_config_dir(), "codeblocks", NULL));
-+    wxString newConfigFolder = wxString::FromUTF8(g_build_filename (g_get_user_config_dir(), "codeblocks", (void *)NULL));
-     // if the new config folder already exist, we step out immediately
-     if (wxDirExists(newConfigFolder))
-         return;
- 
-     wxString oldConfigFolder = wxStandardPaths::Get().GetUserDataDir();
-     wxString oldDataFolder = oldConfigFolder + wxFILE_SEP_PATH + _T("share") + wxFILE_SEP_PATH + _T("codeblocks");
--    wxString newDataFolder = wxString::FromUTF8(g_build_filename (g_get_user_data_dir(), NULL)) + wxFILE_SEP_PATH + _T("codeblocks");
-+    wxString newDataFolder = wxString::FromUTF8(g_build_filename (g_get_user_data_dir(), (void *)NULL)) + wxFILE_SEP_PATH + _T("codeblocks");
-     wxString msg;
-     msg = F(_("The places where the configuration files and user-data files are stored\n"
-               "have been changed to be more standard-conform.\n"
diff --git a/testing/codeblocks/0004-delete-wxpropgrid.patch b/testing/codeblocks/0004-delete-wxpropgrid.patch
deleted file mode 100644
index 76f414b28b8..00000000000
--- a/testing/codeblocks/0004-delete-wxpropgrid.patch
+++ /dev/null
@@ -1,188 +0,0 @@
---- a/src/CodeBlocks-unix.cbp
-+++ b/src/CodeBlocks-unix.cbp
-@@ -97,20 +97,6 @@
- 					<Add directory="sdk/wxscintilla/include" />
- 				</ResourceCompiler>
- 			</Target>
--			<Target title="wxpropgrid">
--				<Option output="devel/libwxpropgrid" prefix_auto="0" extension_auto="1" />
--				<Option working_dir="devel" />
--				<Option type="3" />
--				<Option compiler="gcc" />
--				<Option createStaticLib="1" />
--				<Compiler>
--					<Add option="-fvisibility=hidden" />
--					<Add option="-DEXPORT_LIB" />
--					<Add option="-DwxPG_SUPPORT_TOOLTIPS" />
--					<Add directory="sdk/wxpropgrid/include" />
--					<Add directory="include" />
--				</Compiler>
--			</Target>
- 			<Target title="sdk">
- 				<Option output="devel/libcodeblocks" prefix_auto="0" extension_auto="1" />
- 				<Option working_dir="devel" />
-@@ -135,7 +121,6 @@
- 					<Add directory="include/mozilla_chardet/xpcom" />
- 					<Add directory="include/mozilla_chardet/xpcom/base" />
- 					<Add directory="include/mozilla_chardet/xpcom/glue" />
--					<Add directory="sdk/wxpropgrid/include" />
- 				</Compiler>
- 				<Linker>
- 					<Add option="-lwxscintilla_cb" />
-@@ -174,7 +159,6 @@
- 				<Linker>
- 					<Add option="`pkg-config gtk+-2.0 --libs`" />
- 					<Add library="codeblocks" />
--					<Add library="wxpropgrid" />
- 				</Linker>
- 			</Target>
- 			<Target title="Abbreviations">
-@@ -266,7 +250,6 @@
- 					<Add option="-Wl,--no-undefined" />
- 					<Add library="codeblocks" />
- 					<Add library="depslib" />
--					<Add library="wxpropgrid" />
- 				</Linker>
- 			</Target>
- 			<Target title="Debugger">
-@@ -462,9 +445,9 @@
- 			</Environment>
- 		</Build>
- 		<VirtualTargets>
--			<Add alias="All" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;wxpropgrid;sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
-+			<Add alias="All" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
- 			<Add alias="Core app &amp; plugins" targets="sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
--			<Add alias="Third-party libs" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;wxpropgrid;Compiler depslib;" />
-+			<Add alias="Third-party libs" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;Compiler depslib;" />
- 		</VirtualTargets>
- 		<Compiler>
- 			<Add option="-Wall" />
-@@ -479,7 +462,6 @@
- 			<Add option="-DcbDEBUG" />
- 			<Add option="-DCB_PRECOMP" />
- 			<Add directory="sdk/wxscintilla/include" />
--			<Add directory="sdk/wxpropgrid/include" />
- 			<Add directory="include/tinyxml" />
- 		</Compiler>
- 		<Linker>
-@@ -3125,57 +3107,6 @@
- 		</Unit>
- 		<Unit filename="sdk/workspaceloader.cpp">
- 			<Option target="sdk" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/include/wx/propgrid/advprops.h">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/include/wx/propgrid/editors.h">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/include/wx/propgrid/extras.h">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/include/wx/propgrid/manager.h">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/include/wx/propgrid/odcombo.h">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/include/wx/propgrid/propdev.h">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/include/wx/propgrid/propgrid.h">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/include/wx/propgrid/props.h">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/include/wx/propgrid/xh_propgrid.h">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/src/advprops.cpp">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/src/editors.cpp">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/src/extras.cpp">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/src/manager.cpp">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/src/odcombo.cpp">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/src/propgrid.cpp">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/src/props.cpp">
--			<Option target="wxpropgrid" />
--		</Unit>
--		<Unit filename="sdk/wxpropgrid/src/xh_propgrid.cpp">
--			<Option target="wxpropgrid" />
- 		</Unit>
- 		<Unit filename="sdk/wxscintilla/include/wx/wxscintilla.h">
- 			<Option target="scintilla" />
---- a/configure.ac
-+++ b/configure.ac
-@@ -318,16 +318,10 @@
-     AC_MSG_RESULT(yes (version $WX_VERSION))
-     AC_MSG_NOTICE([(Re)setting libs for wxWidgets $WX_VERSION])
-     WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs std,aui,propgrid,richtext`
--    WXPROPGRID_DIR=
--    WXPROPGRID_LIB=
--    WXPROPGRID_INCLUDE=
-     SCINTILLA_GTK_CFLAGS="$WX_GDK_CFLAGS"
-     SCINTILLA_GTK_LIBS="$WX_GDK_LIBS"
- else
-     AC_MSG_RESULT(no)
--    WXPROPGRID_DIR=wxpropgrid
--    WXPROPGRID_LIB=wxpropgrid/libwxpropgrid.la
--    WXPROPGRID_INCLUDE=-I\$\(top_srcdir\)/src/sdk/wxpropgrid/include
- 
-     if test "x$HAVE_GCC48_TRUE" = "x" ; then
- 	gcc48_flags="-Wno-unused-local-typedefs"
-@@ -372,10 +366,6 @@
- AC_SUBST(CB_FONTCONFIG_LIBS)
- AC_SUBST(WX_X11_CFLAGS)
- AC_SUBST(WX_X11_LIBS)
--AC_SUBST(WXPROPGRID_DIR)
--AC_SUBST(WXPROPGRID_LIB)
--AC_SUBST(WXPROPGRID_INCLUDE)
--AC_SUBST(WXPROPGRID_HEADERS)
- 
- AC_SUBST(POSTLINK_COMMAND)
- AC_SUBST(MACSETFILE)
-@@ -434,7 +424,6 @@
- 	src/include/scripting/squirrel/Makefile
- 	src/include/tinyxml/Makefile
- 	src/sdk/Makefile
--	src/sdk/wxpropgrid/Makefile
- 	src/sdk/scripting/Makefile
- 	src/sdk/scripting/bindings/Makefile
- 	src/sdk/scripting/squirrel/Makefile
---- a/src/sdk/Makefile.am
-+++ b/src/sdk/Makefile.am
-@@ -1,12 +1,11 @@
--SUBDIRS = scripting wxscintilla $(WXPROPGRID_DIR) resources
--DIST_SUBDIRS = scripting wxscintilla  wxpropgrid resources
-+SUBDIRS = scripting wxscintilla resources
-+DIST_SUBDIRS = scripting wxscintilla resources
- 
- AM_CPPFLAGS = $(WX_CXXFLAGS) \
- 			$(CB_GLIB2_CFLAGS) \
- 			$(CB_SQUIRREL_CFLAGS) \
- 			-I$(top_srcdir)/src/include \
- 			-I$(top_srcdir)/src/sdk/wxscintilla/include \
--			 $(WXPROPGRID_INCLUDE) \
- 			-I$(top_srcdir)/src/include/scripting/bindings \
-  			-I$(top_srcdir)/src/include/scripting/sqplus \
-  			-I$(top_srcdir)/src/include/mozilla_chardet \
-@@ -26,7 +25,6 @@
- 			$(WX_LIBS) \
- 			$(SCINTILLA_GTK_LIBS) \
- 			$(CB_GLIB2_LIBS) \
--			$(WXPROPGRID_LIB) \
- 			$(CB_TINYXML_LIBS) \
- 			$(CB_SQUIRREL_LIBS)
- 
diff --git a/testing/codeblocks/0005-fix-pkgconfig-codeblocks-version.patch b/testing/codeblocks/0005-fix-pkgconfig-codeblocks-version.patch
deleted file mode 100644
index 3f237591e9e..00000000000
--- a/testing/codeblocks/0005-fix-pkgconfig-codeblocks-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/codeblocks.pc.in
-+++ b/codeblocks.pc.in
-@@ -8,7 +8,7 @@
- 
- Name: codeblocks
- Description: Code::Blocks IDE
--Version: @VERSION@
-+Version: 20.03
- Libs: -L${libdir} -lcodeblocks
- Cflags: -I${includedir}/@PACKAGE@ \
- 			-I${includedir}/@PACKAGE@/tinyxml \
diff --git a/testing/codeblocks/0006-fix-openfileslistplugin-gcc11.patch b/testing/codeblocks/0006-fix-openfileslistplugin-gcc11.patch
deleted file mode 100644
index 23dc1a8e18b..00000000000
--- a/testing/codeblocks/0006-fix-openfileslistplugin-gcc11.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/plugins/openfileslist/openfileslistplugin.h
-+++ b/src/plugins/openfileslist/openfileslistplugin.h
-@@ -10,6 +10,7 @@
- #include <projectfile.h>
- 
- #include <wx/dynarray.h>
-+#include <functional>
- 
- class wxTreeCtrl;
- class wxTreeEvent;
-@@ -20,12 +21,8 @@
- struct TargetFilesData
- {
-     TargetFilesData() : activeFile(nullptr) {} // ctor
--    // Functor for the std::set predicate to sort the opened editor files according to their tab order
--    struct compareLess
--    {
--        bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) { return lhs->editorTabPos < rhs->editorTabPos; }
--    };
--    typedef std::set<ProjectFile*, compareLess> OpenFilesSet;
-+
-+    typedef std::set<ProjectFile*, std::less<ProjectFile*>> OpenFilesSet;
-     ProjectFile* activeFile;
-     OpenFilesSet openFiles;
- };
diff --git a/testing/codeblocks/APKBUILD b/testing/codeblocks/APKBUILD
index d20460c3699..b04adaa732a 100644
--- a/testing/codeblocks/APKBUILD
+++ b/testing/codeblocks/APKBUILD
@@ -1,59 +1,76 @@
 # Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=codeblocks
 pkgver=20.03
-pkgrel=3
+pkgrel=4
 pkgdesc="Cross-platform C/C++ and Fortran IDE"
 url="https://codeblocks.org"
 # riscv64: ftbfs
 arch="all !riscv64"
 license="GPL-3.0-or-later"
-# coreutils is needed because ./bootstrap calls a rm parameter that is not supported in BusyBox
 makedepends="
-	libtool automake autoconf coreutils imagemagick zip
-	boost-dev hunspell-dev wxgtk3-dev tinyxml-dev
+	autoconf
+	automake
+	boost-dev
+	hunspell-dev
+	imagemagick
+	libtool
+	tinyxml-dev
+	wxwidgets-dev
+	zip
 	"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-contrib"
 source="https://sourceforge.net/projects/codeblocks/files/Sources/$pkgver/codeblocks-$pkgver.tar.xz
 	0001-v20.03-r12008.patch
 	0002-v20.03-r12012.patch
-	0003-fix-missing-sentinel.patch
-	0004-delete-wxpropgrid.patch
-	0005-fix-pkgconfig-codeblocks-version.patch
-	0006-fix-openfileslistplugin-gcc11.patch
+	busybox-rm.patch
+	gcc11.patch
+	wxwidgets-3.2.patch
+	$pkgname-wxwidgets-3.2-01.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/2345b020b862ec855038dd32a51ebb072647f28d.patch
+	$pkgname-wxwidgets-3.2-02.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/40eb88e3f2b933f19f9933e06c8d0899c54f5e25.patch
+	$pkgname-wxwidgets-3.2-03.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/56ac0396fad7a5b4bbb40bb8c4b5fe1755078aef.patch
+	$pkgname-wxwidgets-3.2-04.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/a4aacc92640b587ad049cd6aa68c637e536e9ab5.patch
+	$pkgname-wxwidgets-3.2-05.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/f2f127cf5cd97c7da6a957a3f7764cb25cc9017e.patch
+	$pkgname-wxwidgets-3.2-06.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/dbdf5c5ea9e3161233f0588a7616b7e4fedc7870.patch
+	$pkgname-wxwidgets-3.2-07.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/04b7c50fb8c6a29b2d84579ee448d2498414d855.patch
+	$pkgname-wxwidgets-3.2-08.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/8035dfdff321754819f79e3165401aa59bd8c7f7.patch
+	$pkgname-wxwidgets-3.2-09.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/9a9c6a9d5e3e0f6eff5594ecd61a2222f073be9c.patch
+	$pkgname-wxwidgets-3.2-10.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/c28746f4887f10e6f9f10eeafae0fb22ecdbf9c7.patch
+	$pkgname-wxwidgets-3.2-11.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/b2e4f1279804e1d11b71bc75eeb37072c3589296.patch
+	$pkgname-wxwidgets-3.2-12.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/29315df024251850832583f73e67e515dae10830.patch
+	$pkgname-wxwidgets-3.2-13.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/46720043319758cb0e798eb23520063583c40eaa.patch
 	"
 options="!check" # No test suite
+patch_args="-p1 -F3"
 
 prepare() {
 	default_prepare
 
-	# wxpropgrid fails building. Remove the directory and patch files
-	# Upstream has deleted it due to unmanteinance
-	rm -vr src/sdk/wxpropgrid
-	convert src/mime/codeblocks.png +set date:create +set date:modify -background none -extent 64x64 src/mime/codeblocks.png
-	sed -i 's|$(datadir)/pixmaps|$(datadir)/icons/hicolor/64x64/apps|' src/mime/Makefile.am
-	sed -i 's|$(datarootdir)/appdata|$(datarootdir)/metainfo|' Makefile.am src/plugins/contrib/appdata/Makefile.am
-	./bootstrap
+	convert src/mime/codeblocks.png +set date:create \
+		+set date:modify -background none -extent 64x64 src/mime/codeblocks.png
 
-	# Patch auto_revision's Makefile.am to use the host compiler and flags
-	cd src/build_tools/autorevision
-	sed -i Makefile.am \
-		-e "/noinst_PROGRAMS = auto_revision/a CC       = gcc" \
-		-e "/noinst_PROGRAMS = auto_revision/a CXX      = g++" \
-		-e "/noinst_PROGRAMS = auto_revision/a LD       = g++" \
-		-e "/noinst_PROGRAMS = auto_revision/a CFLAGS   = -O2 -pipe" \
-		-e "/noinst_PROGRAMS = auto_revision/a CXXFLAGS = -O2 -pipe" \
-		-e "/noinst_PROGRAMS = auto_revision/a LDFLAGS  = -s"
+	sed -i 's|$(datadir)/pixmaps|$(datadir)/icons/hicolor/64x64/apps|' \
+		src/mime/Makefile.am
+
+	sed -i 's|$(datarootdir)/appdata|$(datarootdir)/metainfo|' \
+		Makefile.am src/plugins/contrib/appdata/Makefile.am
+
+	sed -i "s|@VERSION@|$pkgver|" codeblocks.pc.in
+
+	./bootstrap
 }
 
 build() {
+	export CFLAGS="$CFLAGS -O2 -flto=auto"
+	export CXXFLAGS="$CXXFLAGS -O2 -flto=auto"
+
 	# Deactivate wxsmith-related plugins because they depend on wxpropgrid
 	./configure \
+		--prefix=/usr \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--with-boost-libdir=/usr/lib \
-		--with-contrib-plugins=all,-FileManager,-wxsmith,-wxsmithcontrib,-wxsmithaui \
-		--with-wx-config=/usr/bin/wx-config-gtk3 \
-		--prefix=/usr
+		--with-contrib-plugins=all,-FileManager
+
 	sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 	make
 }
@@ -72,163 +89,83 @@ dev() {
 
 contrib() {
 	pkgdesc="$pkgdesc (contrib plugins)"
-	mkdir -p "$subpkgdir"/usr/share/metainfo
-	mkdir -p "$subpkgdir"/usr/share/codeblocks/images
 
 	# Move plugins and wxContribItems to this subpackage
 	amove usr/lib/codeblocks
 
 	# Move contrib metainfo file
-	# While at it, also place it in the correct directory
-	mv -v "$pkgdir"/usr/share/metainfo/codeblocks-contrib.metainfo.xml \
-	"$subpkgdir"/usr/share/metainfo/codeblocks-contrib.metainfo.xml
+	amove usr/share/metainfo/codeblocks-contrib.metainfo.xml
 
 	# Move optional plugins to this subcategory
-	mv -v "$pkgdir"/usr/share/codeblocks/AutoVersioning.zip \
-	"$subpkgdir"/usr/share/codeblocks/AutoVersioning.zip
+	amove \
+		usr/share/codeblocks/AutoVersioning.zip \
+		usr/share/codeblocks/BrowseTracker.zip \
+		usr/share/codeblocks/Cccc.zip \
+		usr/share/codeblocks/CppCheck.zip \
+		usr/share/codeblocks/Cscope.zip \
+		usr/share/codeblocks/DoxyBlocks.zip \
+		usr/share/codeblocks/EditorConfig.zip \
+		usr/share/codeblocks/EditorTweaks.zip \
+		usr/share/codeblocks/HexEditor.zip \
+		usr/share/codeblocks/IncrementalSearch.zip \
+		usr/share/codeblocks/MouseSap.zip \
+		usr/share/codeblocks/NassiShneiderman.zip \
+		usr/share/codeblocks/Profiler.zip \
+		usr/share/codeblocks/ProjectOptionsManipulator.zip \
+		usr/share/codeblocks/RegExTestbed.zip \
+		usr/share/codeblocks/ReopenEditor.zip \
+		usr/share/codeblocks/SmartIndentCpp.zip \
+		usr/share/codeblocks/SmartIndentFortran.zip \
+		usr/share/codeblocks/SmartIndentHDL.zip \
+		usr/share/codeblocks/SmartIndentLua.zip \
+		usr/share/codeblocks/SmartIndentPascal.zip \
+		usr/share/codeblocks/SmartIndentPython.zip \
+		usr/share/codeblocks/SmartIndentXML.zip \
+		usr/share/codeblocks/SpellChecker \
+		usr/share/codeblocks/SpellChecker.zip \
+		usr/share/codeblocks/SymTab.zip \
+		usr/share/codeblocks/ThreadSearch.zip \
+		usr/share/codeblocks/ToolsPlus.zip \
+		usr/share/codeblocks/Valgrind.zip \
+		usr/share/codeblocks/abbreviations.zip \
+		usr/share/codeblocks/byogames.zip \
+		usr/share/codeblocks/cb_koders.zip \
+		usr/share/codeblocks/codesnippets.zip \
+		usr/share/codeblocks/codestat.zip \
+		usr/share/codeblocks/copystrings.zip \
+		usr/share/codeblocks/dragscroll.zip \
+		usr/share/codeblocks/envvars.zip \
+		usr/share/codeblocks/exporter.zip \
+		usr/share/codeblocks/headerfixup.zip \
+		usr/share/codeblocks/help_plugin.zip \
+		usr/share/codeblocks/images/codesnippets \
+		usr/share/codeblocks/keybinder.zip \
+		usr/share/codeblocks/lib_finder \
+		usr/share/codeblocks/lib_finder.zip \
+		usr/share/codeblocks/occurrenceshighlighting.zip \
+		usr/share/codeblocks/rndgen.zip
 
-	mv -v "$pkgdir"/usr/share/codeblocks/BrowseTracker.zip \
-	"$subpkgdir"/usr/share/codeblocks/BrowseTracker.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/Cccc.zip \
-	"$subpkgdir"/usr/share/codeblocks/Cccc.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/CppCheck.zip \
-	"$subpkgdir"/usr/share/codeblocks/CppCheck.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/Cscope.zip \
-	"$subpkgdir"/usr/share/codeblocks/Cscope.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/DoxyBlocks.zip \
-	"$subpkgdir"/usr/share/codeblocks/DoxyBlocks.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/EditorConfig.zip \
-	"$subpkgdir"/usr/share/codeblocks/EditorConfig.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/EditorTweaks.zip \
-	"$subpkgdir"/usr/share/codeblocks/EditorTweaks.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/HexEditor.zip \
-	"$subpkgdir"/usr/share/codeblocks/HexEditor.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/IncrementalSearch.zip \
-	"$subpkgdir"/usr/share/codeblocks/IncrementalSearch.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/MouseSap.zip \
-	"$subpkgdir"/usr/share/codeblocks/MouseSap.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/NassiShneiderman.zip \
-	"$subpkgdir"/usr/share/codeblocks/NassiShneiderman.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/Profiler.zip \
-	"$subpkgdir"/usr/share/codeblocks/Profiler.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/ProjectOptionsManipulator.zip \
-	"$subpkgdir"/usr/share/codeblocks/ProjectOptionsManipulator.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/RegExTestbed.zip \
-	"$subpkgdir"/usr/share/codeblocks/RegExTestbed.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/ReopenEditor.zip \
-	"$subpkgdir"/usr/share/codeblocks/ReopenEditor.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/SmartIndentCpp.zip \
-	"$subpkgdir"/usr/share/codeblocks/SmartIndentCpp.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/SmartIndentFortran.zip \
-	"$subpkgdir"/usr/share/codeblocks/SmartIndentFortran.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/SmartIndentHDL.zip \
-	"$subpkgdir"/usr/share/codeblocks/SmartIndentHDL.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/SmartIndentLua.zip \
-	"$subpkgdir"/usr/share/codeblocks/SmartIndentLua.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/SmartIndentPascal.zip \
-	"$subpkgdir"/usr/share/codeblocks/SmartIndentPascal.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/SmartIndentPython.zip \
-	"$subpkgdir"/usr/share/codeblocks/SmartIndentPython.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/SmartIndentXML.zip \
-	"$subpkgdir"/usr/share/codeblocks/SmartIndentXML.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/SpellChecker \
-	"$subpkgdir"/usr/share/codeblocks/SpellChecker
-
-	mv -v "$pkgdir"/usr/share/codeblocks/SpellChecker.zip \
-	"$subpkgdir"/usr/share/codeblocks/SpellChecker.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/SymTab.zip \
-	"$subpkgdir"/usr/share/codeblocks/SymTab.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/ThreadSearch.zip \
-	"$subpkgdir"/usr/share/codeblocks/ThreadSearch.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/ToolsPlus.zip \
-	"$subpkgdir"/usr/share/codeblocks/ToolsPlus.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/Valgrind.zip \
-	"$subpkgdir"/usr/share/codeblocks/Valgrind.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/abbreviations.zip \
-	"$subpkgdir"/usr/share/codeblocks/abbreviations.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/byogames.zip \
-	"$subpkgdir"/usr/share/codeblocks/byogames.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/cb_koders.zip \
-	"$subpkgdir"/usr/share/codeblocks/cb_koders.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/codesnippets.zip \
-	"$subpkgdir"/usr/share/codeblocks/codesnippets.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/codestat.zip \
-	"$subpkgdir"/usr/share/codeblocks/codestat.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/copystrings.zip \
-	"$subpkgdir"/usr/share/codeblocks/copystrings.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/dragscroll.zip \
-	"$subpkgdir"/usr/share/codeblocks/dragscroll.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/envvars.zip \
-	"$subpkgdir"/usr/share/codeblocks/envvars.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/exporter.zip \
-	"$subpkgdir"/usr/share/codeblocks/exporter.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/headerfixup.zip \
-	"$subpkgdir"/usr/share/codeblocks/headerfixup.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/help_plugin.zip \
-	"$subpkgdir"/usr/share/codeblocks/help_plugin.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/images/codesnippets \
-	"$subpkgdir"/usr/share/codeblocks/images/codesnippets
-
-	mv -v "$pkgdir"/usr/share/codeblocks/keybinder.zip \
-	"$subpkgdir"/usr/share/codeblocks/keybinder.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/lib_finder \
-	"$subpkgdir"/usr/share/codeblocks/lib_finder
-
-	mv -v "$pkgdir"/usr/share/codeblocks/lib_finder.zip \
-	"$subpkgdir"/usr/share/codeblocks/lib_finder.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/occurrenceshighlighting.zip \
-	"$subpkgdir"/usr/share/codeblocks/occurrenceshighlighting.zip
-
-	mv -v "$pkgdir"/usr/share/codeblocks/rndgen.zip \
-	"$subpkgdir"/usr/share/codeblocks/rndgen.zip
+	mkdir -p "$subpkgdir"/usr/share/codeblocks/images
 }
 
 sha512sums="
 f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097  codeblocks-20.03.tar.xz
 98584a93790974481a669cb86a01efe42690fe4a4e0a6c04abc15e3ea0c037be0b0cdc63164907e0c9f51414bb32b2879f6a06117d1374a4288a0a03bec4080f  0001-v20.03-r12008.patch
 1580f63e559470f58990831c49c8885ba980416326bc66a5564a47681d9f33124809824d7e6caab2ebfbde8bf57def4e9e06a41d30379bb7aa5a2deaee3803c1  0002-v20.03-r12012.patch
-d8ef0d5fd0605b00d72833591df78b6160bd4d3ae02523b0eba796bc6e375384b241bb24c3a44b45df7a47bf47bf58f1f94eb8459d177ab516383617955e0dd0  0003-fix-missing-sentinel.patch
-1b642ad9e4c479fb81674c4fa412e3c6d169bad9cad4b6748433004e5e0c31f1d1aba9a81eb02eb6ffd8927ae96d56a8fd90f009b7aa0925ae2e397794fedbac  0004-delete-wxpropgrid.patch
-792fcb9b570e5ee0fbadc2ab68b17f3f76c667b6b0822b6e4a89ce5e40c2afcd8744bbaa65fb3252fc36d9343d7c439df3f759c4fbc9980fcf851f5cad6be178  0005-fix-pkgconfig-codeblocks-version.patch
-56e649ae3cde529fdc9e6b11eac652c692b381bdb803cc476f536b28904f724cb0446974a3bed2d95740dff7ad9d026d1987800aef1f462a02ee1d81c6bd0318  0006-fix-openfileslistplugin-gcc11.patch
+bc78d166c14ef093eed600b14a5861cdb9f566151129e85f8bbf89a9e018823458628bb2152eef0f90f1543cdcc9f22718428c3abac8e44a88f4d797de34715c  busybox-rm.patch
+af99cd88ae857abc29a7d487d5b2b298550f825787b3d883d49e083ddc5c3747e179bb882322162355c82b3b2e34c138531eb62b5647814ce8ad0a59ce524931  gcc11.patch
+1515434b817ce6b222b6204a9f10a0569eca588d87db9b93427241b946991bfb40fb9855e431c2e15b5f0f19f04f07be85f96b40b498195293a25093d980e55d  wxwidgets-3.2.patch
+585ceadc30287dd08a367f735258a11af6f7a87934a5016b037af174ed44bd8df5890ca9126d77c2f9ffe854d4e9fd683c69a28cbc47b420aed79bbdb7ec4a27  codeblocks-wxwidgets-3.2-01.patch
+21b61bf46177897d76155a5eaafc4e1ba466e39d66162b367c8ce8467e0b36c1ab5c6fe099635867dc2b2b908f5c008c5d56463e9563d71403639ed2cb74e237  codeblocks-wxwidgets-3.2-02.patch
+b5764e948b84fd66492253034446cb385c9816551a776ca3946ac7e772dd2f404b1c7a490af88c2863b206aecbb1452f9b42a42792ceb30538efbc7dc6fc1e08  codeblocks-wxwidgets-3.2-03.patch
+777eb06741187ec02adf03763b90e58486cbcf4d13dd11faaf35339aa776242c62813bcfbab0db63218744218afe3386489a769380706decf4cea41b6980823f  codeblocks-wxwidgets-3.2-04.patch
+b78f59ff0a4bf0cbd7c5efda8c53d6c40f8d703ab6e18e263b4f0dbfd694fd5a179589c716db366675031602cf3ca9232f3aabe0297c16d0e4cb1dd4a619c95b  codeblocks-wxwidgets-3.2-05.patch
+dbc0938fff3aea9507864d031456549fa10197e165a971184b9df1662e00952b745c49caf0848d43ea3f4c406ee4427ed5e30859bce084f17b95114381c46227  codeblocks-wxwidgets-3.2-06.patch
+49ee5c43b07a7763bbe828609e1227ce03b6f2f516d741fbe4fb6c10a9632984b5b4074af85fff354a86193aaf2ff6279e6fea628f3720f2a0e1139cee5568ae  codeblocks-wxwidgets-3.2-07.patch
+6d1ee2df97ec49d6bb18e5153f14ea7fe39e4c37bb38f1f61688f6c138bbb5b1c1d2b2cc76cca9d32a031231bb67545ec4840b3d08049662e7dd0fc2c093148a  codeblocks-wxwidgets-3.2-08.patch
+a0260f6a39215a436fe70b979a820450bd116f74823e4f53b4b48596a73b3e61aa597115c8cca3fbd203836e22a2457df5a157e28c90beae7cb415114d129f85  codeblocks-wxwidgets-3.2-09.patch
+59c22b090392c22655e396c574641352b513a871c5cca75c9dbddbab9abfb23786b51146ee1e6a77bd149494b19230ce6ce25566df4f95afc01bc8ed16a6f089  codeblocks-wxwidgets-3.2-10.patch
+f195403d52ba53de3e55bdfb54461414bdb40c62ea9079446600377ec0cf7e739b74c9aadba23fd3a68f0e1270277a138901531b59630063c76a1fe608f1e278  codeblocks-wxwidgets-3.2-11.patch
+6943970fc405bfbe1c656f117ae22fced8f80eb149befe2a1b8c3a9e906f6d1dbae1d89a80c5f2823ba60ab3c97b71a9f2d5a275e9070ddef2672ff6ed7cd821  codeblocks-wxwidgets-3.2-12.patch
+32f955811960c217686ec924220b425d84eac9837fbd0930dbd0f7e966571ce34966bc4f57e8989390a2e7b0f0ac42c63a32ceada4ef48aa92aba611859ba1bc  codeblocks-wxwidgets-3.2-13.patch
 "
diff --git a/testing/codeblocks/busybox-rm.patch b/testing/codeblocks/busybox-rm.patch
new file mode 100644
index 00000000000..592f03136f9
--- /dev/null
+++ b/testing/codeblocks/busybox-rm.patch
@@ -0,0 +1,13 @@
+diff --git a/bootstrap b/bootstrap
+index 63d6425..81a4695 100755
+--- a/bootstrap
++++ b/bootstrap
+@@ -64,7 +64,7 @@ rm -rf autom4te.cache
+ 
+ # Make the build more robust if a Makefile.am is removed from the file system, but it is not removed
+ # from the configure.ac file.
+-find . | grep -v wxSmithSTC/stc| grep Makefile.in$ | xargs rm -v
++find . | grep -v wxSmithSTC/stc| grep Makefile.in$ | xargs rm
+ 
+ # Fire up autotools
+ $LIBTOOLIZE --force --copy && \
diff --git a/testing/codeblocks/gcc11.patch b/testing/codeblocks/gcc11.patch
new file mode 100644
index 00000000000..760a8e1ec3a
--- /dev/null
+++ b/testing/codeblocks/gcc11.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plugins/openfileslist/openfileslistplugin.h b/src/plugins/openfileslist/openfileslistplugin.h
+index 7fd7a95..87b08ee 100644
+--- a/src/plugins/openfileslist/openfileslistplugin.h
++++ b/src/plugins/openfileslist/openfileslistplugin.h
+@@ -23,7 +23,7 @@ struct TargetFilesData
+     // Functor for the std::set predicate to sort the opened editor files according to their tab order
+     struct compareLess
+     {
+-        bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) { return lhs->editorTabPos < rhs->editorTabPos; }
++        bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) const { return lhs->editorTabPos < rhs->editorTabPos; }
+     };
+     typedef std::set<ProjectFile*, compareLess> OpenFilesSet;
+     ProjectFile* activeFile;
diff --git a/testing/codeblocks/wxwidgets-3.2.patch b/testing/codeblocks/wxwidgets-3.2.patch
new file mode 100644
index 00000000000..7954aedab86
--- /dev/null
+++ b/testing/codeblocks/wxwidgets-3.2.patch
@@ -0,0 +1,12 @@
+diff --git a/src/sdk/scripting/bindings/sc_wxtypes.cpp b/src/sdk/scripting/bindings/sc_wxtypes.cpp
+index 6f1d039..a9a66c1 100644
+--- a/src/sdk/scripting/bindings/sc_wxtypes.cpp
++++ b/src/sdk/scripting/bindings/sc_wxtypes.cpp
+@@ -354,7 +354,6 @@ namespace ScriptBindings
+                 func(&wxFileName::IsDir, "IsDir").
+                 func(&wxFileName::MakeAbsolute, "MakeAbsolute").
+                 func(&wxFileName::MakeRelativeTo, "MakeRelativeTo").
+-                func(&wxFileName::Normalize, "Normalize").
+                 func(&wxFileName::PrependDir, "PrependDir").
+                 func(&wxFileName::RemoveDir, "RemoveDir").
+                 func(&wxFileName::RemoveLastDir, "RemoveLastDir").