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-env.patch29
2 files changed, 49 insertions, 0 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
new file mode 100644
index 000000000000..9918c58d8e88
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
@@ -0,0 +1,20 @@
+# 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-env.patch b/dev-util/codeblocks/files/codeblocks-20.03-env.patch
new file mode 100644
index 000000000000..2a973abe2b7b
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-20.03-env.patch
@@ -0,0 +1,29 @@
+diff -Nuar a_init/Makefile.am b_env/Makefile.am
+--- a_init/Makefile.am 2020-03-28 15:36:06.000000000 +0300
++++ b_env/Makefile.am 2020-03-30 18:14:12.000000000 +0300
+@@ -46,5 +46,5 @@
+ clean-local:
+ rm -f $(top_srcdir)/debian/codeblocks-headers.install
+
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ dist_appdata_DATA = $(top_srcdir)/codeblocks.appdata.xml
+diff -Nuar a_init/m4/acinclude.m4 b_env/m4/acinclude.m4
+--- a_init/m4/acinclude.m4 2020-03-28 15:36:06.000000000 +0300
++++ b_env/m4/acinclude.m4 2020-03-30 18:08:13.000000000 +0300
+@@ -91,8 +91,6 @@
+ AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (default is OFF)])],,
+ enable_debug=$debug_default)
+ if test "x$enable_debug" = "xyes"; then
+- CFLAGS="-g $CFLAGS"
+- CXXFLAGS="-g $CXXFLAGS"
+ CPPFLAGS="-DDEBUG -DcbDEBUG $CPPFLAGS"
+ AC_MSG_RESULT(yes)
+ else
+diff -Nuar a_init/src/plugins/contrib/appdata/Makefile.am b_env/src/plugins/contrib/appdata/Makefile.am
+--- a_init/src/plugins/contrib/appdata/Makefile.am 2020-03-28 15:35:54.000000000 +0300
++++ b_env/src/plugins/contrib/appdata/Makefile.am 2020-03-30 18:14:22.000000000 +0300
+@@ -1,2 +1,2 @@
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ dist_appdata_DATA = $(top_srcdir)/codeblocks-contrib.metainfo.xml