diff options
Diffstat (limited to 'dev-util/codeblocks/files')
3 files changed, 0 insertions, 114 deletions
diff --git a/dev-util/codeblocks/files/codeblocks-20.03-env.patch b/dev-util/codeblocks/files/codeblocks-20.03-env.patch deleted file mode 100644 index 2a973abe2b7b..000000000000 --- a/dev-util/codeblocks/files/codeblocks-20.03-env.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 diff --git a/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch b/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch deleted file mode 100644 index 7ef01faf9cd2..000000000000 --- a/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream patch: https://sourceforge.net/u/vic5/scintilla/ci/6d0ce3c92a1371372bd601cd572a078d5e4041a4/ -Upstream issue: https://sourceforge.net/p/scintilla/bugs/2019/ -Codeblocks forum discussion: https://forums.codeblocks.org/index.php?topic=24505.0 - -lexers/LexMMIXAL.cxxDiffSwitch to side-by-side view ---- a/src/sdk/wxscintilla/src/scintilla/lexers/LexMMIXAL.cxx -+++ b/src/sdk/wxscintilla/src/scintilla/lexers/LexMMIXAL.cxx -@@ -99,12 +99,11 @@ - } - } else if (sc.state == SCE_MMIXAL_REF) { // REF - if (!IsAWordChar(sc.ch) ) { -- char s[100]; -- sc.GetCurrent(s, sizeof(s)); -+ char s0[100]; -+ sc.GetCurrent(s0, sizeof(s0)); -+ const char *s = s0; - if (*s == ':') { // ignore base prefix for match -- for (size_t i = 0; i != sizeof(s); ++i) { -- *(s+i) = *(s+i+1); -- } -+ ++s; - } - if (special_register.InList(s)) { - sc.ChangeState(SCE_MMIXAL_REGISTER); diff --git a/dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch b/dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch deleted file mode 100644 index d641dcb75f83..000000000000 --- a/dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch +++ /dev/null @@ -1,61 +0,0 @@ -Upstream patch: https://sourceforge.net/p/codeblocks/code/12074/ -Upstream issue: https://sourceforge.net/p/codeblocks/tickets/839/ -Gentoo issue: https://bugs.gentoo.org/925955 - ---- a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp -+++ b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp -@@ -101,8 +101,8 @@ - - // constructor - DoxyBlocks::DoxyBlocks() : -- m_pToolbar(0l), -- m_DoxyBlocksLog(0l), -+ m_pToolbar(nullptr), -+ m_DoxyBlocksLog(nullptr), - m_LogPageIndex(0), - m_bAutoVersioning(false) - { -@@ -234,8 +234,10 @@ - */ - void DoxyBlocks::OnUpdateUI(wxUpdateUIEvent& WXUNUSED(event)) - { -- if(Manager::Get()->GetProjectManager()->GetProjects()->GetCount() == 0){ -- m_pToolbar->Enable(false); -+ if (Manager::Get()->GetProjectManager()->GetProjects()->GetCount() == 0) -+ { -+ if (m_pToolbar) -+ m_pToolbar->Enable(false); - wxMenuBar *menuBar = Manager::Get()->GetAppFrame()->GetMenuBar(); - menuBar->FindItem(ID_MENU_DOXYWIZARD)->Enable(false); - menuBar->FindItem(ID_MENU_EXTRACTPROJECT)->Enable(false); -@@ -264,14 +266,15 @@ - Manager::Get()->ProcessEvent(evt); - } - } -- m_DoxyBlocksLog = 0; --} -- --cbConfigurationPanel *DoxyBlocks::GetConfigurationPanel(wxWindow *parent) -+ m_DoxyBlocksLog = nullptr; -+} -+ -+cbConfigurationPanel* DoxyBlocks::GetConfigurationPanel(wxWindow *parent) - { - //create and display the configuration dialog for your plugin -- if(!IsAttached()){ -- return 0; -+ if (!IsAttached()) -+ { -+ return nullptr; - } - - // Get the version string before instantiating the panel so that it is recorded before -@@ -346,7 +349,7 @@ - - cbConfigurationPanel* DoxyBlocks::GetProjectConfigurationPanel(wxWindow* /*parent*/, cbProject* /*project*/) - { -- return 0; -+ return nullptr; - } - - void DoxyBlocks::OnConfigure(wxCommandEvent & WXUNUSED(event)) |