summaryrefslogtreecommitdiff
path: root/dev-util/codeblocks/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/codeblocks/files')
-rw-r--r--dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch20
-rw-r--r--dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch12
-rw-r--r--dev-util/codeblocks/files/codeblocks-9999-nodebug.diff (renamed from dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff)4
3 files changed, 2 insertions, 34 deletions
diff --git a/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
deleted file mode 100644
index 9918c58d8e88..000000000000
--- a/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Fix crashing on paste of copied text from other applications
-# https://sourceforge.net/p/codeblocks/tickets/629/
-diff -Nuar a/main.cpp b/main.cpp
---- a/src/src/main.cpp 2017-11-01 02:32:38.000000000 +0300
-+++ b/src/src/main.cpp 2020-03-13 21:59:25.000000000 +0300
-@@ -4321,7 +4321,13 @@
- }
-
- if (Manager::Get()->GetEditorManager() && event.GetEditor() == Manager::Get()->GetEditorManager()->GetActiveEditor())
-- DoUpdateStatusBar();
-+ {
-+ #if wxCHECK_VERSION(3, 0, 0)
-+ CallAfter(&MainFrame::DoUpdateStatusBar);
-+ #else
-+ DoUpdateStatusBar();
-+ #endif // wxCHECK_VERSION(3, 0, 0)
-+ }
-
- event.Skip();
- }
diff --git a/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch b/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch
deleted file mode 100644
index 46c8643e9c94..000000000000
--- a/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/plugins/openfileslist/openfileslistplugin.h b/src/plugins/openfileslist/openfileslistplugin.h
---- a/src/plugins/openfileslist/openfileslistplugin.h 2020-10-13 20:35:57.000000000 +0300
-+++ b/src/plugins/openfileslist/openfileslistplugin.h 2020-10-13 20:37:37.000000000 +0300
-@@ -23,7 +23,7 @@
- // 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/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff b/dev-util/codeblocks/files/codeblocks-9999-nodebug.diff
index 7cbb678dda6a..1187f53539fc 100644
--- a/dev-util/codeblocks/files/codeblocks-17.12-nodebug.diff
+++ b/dev-util/codeblocks/files/codeblocks-9999-nodebug.diff
@@ -1,7 +1,7 @@
# Remove adding of "-g" to CFLAGS and CXXFLAGS if "./configure --enable-debug"
diff -Naur old/m4/acinclude.m4 new/m4/acinclude.m4
---- old/m4/acinclude.m4 2017-11-01 02:32:37.000000000 +0300
-+++ new/m4/acinclude.m4 2018-05-04 11:08:33.000000000 +0300
+--- old/m4/acinclude.m4
++++ new/m4/acinclude.m4
@@ -91,8 +91,6 @@
AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (default is OFF)])],,
enable_debug=$debug_default)