commit: c57d92c7c443593c89d2033abe2dc9a3b7431d91
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail
<DOT> com>
AuthorDate: Thu Oct 6 16:59:18 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 12:05:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c57d92c7
dev-util/codeblocks: remove unused patches
.../codeblocks/files/codeblocks-10.05-gcc47.patch | 91 ----------------------
.../files/codeblocks-10.05-wxChartCtrl-crash.patch | 34 --------
2 files changed, 125 deletions(-)
diff --git a/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch
b/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch
deleted file mode 100644
index 12dfe31..00000000
--- a/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- a/src/include/scripting/bindings/sc_base_types.h
-+++ b/src/include/scripting/bindings/sc_base_types.h
-@@ -33,6 +33,7 @@ DECLARE_INSTANCE_TYPE(wxPoint);
- DECLARE_INSTANCE_TYPE(wxSize);
- DECLARE_INSTANCE_TYPE(wxString);
-
-+using SqPlus::GetTypeName;
- // C::B primitives and types
- DECLARE_INSTANCE_TYPE(ConfigManager);
- DECLARE_INSTANCE_TYPE(EditorManager);
-@@ -59,6 +60,7 @@ namespace SqPlus \
- inline T Get(TypeWrapper<T>,HSQUIRRELVM v,int idx) { SQInteger i;
SQPLUS_CHECK_GET(sq_getinteger(v,idx,&i)); return (T)i; } \
- }
-
-+using SqPlus::Push;
- DECLARE_ENUM_TYPE(wxPathFormat);
- DECLARE_ENUM_TYPE(wxPathNormalize);
- DECLARE_ENUM_TYPE(PrintColourMode);
---- /dev/null
-+++ b/src/include/scripting/squirrel/sqmem.h
-@@ -0,0 +1,8 @@
-+/* see copyright notice in squirrel.h */
-+#ifndef _SQMEM_H_
-+#define _SQMEM_H_
-+
-+void *sq_vm_malloc(SQUnsignedInteger size);
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
-+#endif //_SQMEM_H_
---- a/src/include/scripting/squirrel/sqstate.h
-+++ b/src/include/scripting/squirrel/sqstate.h
-@@ -136,8 +136,4 @@ extern SQObjectPtr _one_;
- extern SQObjectPtr _minusone_;
-
- bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
--
--void *sq_vm_malloc(SQUnsignedInteger size);
--void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
--void sq_vm_free(void *p,SQUnsignedInteger size);
- #endif //_SQSTATE_H_
---- a/src/include/scripting/squirrel/squtils.h
-+++ b/src/include/scripting/squirrel/squtils.h
-@@ -2,6 +2,7 @@
- #ifndef _SQUTILS_H_
- #define _SQUTILS_H_
-
-+#include "sqmem.h"
- #define sq_new(__ptr,__type) {__ptr=(__type
*)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
- #define sq_delete(__ptr,__type)
{__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
- #define SQ_MALLOC(__size) sq_vm_malloc((__size));
---- a/src/plugins/contrib/help_plugin/defs.h
-+++ b/src/plugins/contrib/help_plugin/defs.h
-@@ -289,7 +289,7 @@ class QMap : public std::map<Key, T>
-
- if (i.second == false && overwrite)
- {
-- find(k)->second = t;
-+ this->find(k)->second = t;
- }
-
- return i.first;
-@@ -297,7 +297,7 @@ class QMap : public std::map<Key, T>
-
- int remove(const Key &k)
- {
-- return erase(k);
-+ return this->erase(k);
- }
- };
-
---- a/src/plugins/contrib/help_plugin/man2html.cpp
-+++ b/src/plugins/contrib/help_plugin/man2html.cpp
-@@ -123,7 +123,7 @@
-
- #include <ctype.h>
-
--//#include <unistd.h>
-+#include <unistd.h>
- #include <string.h>
-
- #include <stdio.h>
---- a/src/plugins/debuggergdb/gdb_driver.cpp
-+++ b/src/plugins/debuggergdb/gdb_driver.cpp
-@@ -72,6 +72,7 @@ static wxRegEx reChildPid3(_T("Thread[ \t]+[xA-Fa-f0-9-]+[
\t]+\\(LWP ([0-9]+)\\
-
-
- // scripting support
-+using SqPlus::Push;
- DECLARE_INSTANCE_TYPE(GDB_driver);
-
- GDB_driver::GDB_driver(DebuggerGDB* plugin)
diff --git a/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch
b/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch
deleted file mode 100644
index af95ac2..00000000
--- a/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-codeblocks crashes when a wxChartCtrl is added with wxSmith
-
-https://bugs.gentoo.org/show_bug.cgi?id=372837
-https://developer.berlios.de/bugs/?func=detailbug&bug_id=18182&group_id=5358
-
-
----
a/src/plugins/contrib/wxSmithContribItems/wxchart/wxchart-1.0/src/chartwindow.cpp
-+++
b/src/plugins/contrib/wxSmithContribItems/wxchart/wxchart-1.0/src/chartwindow.cpp
-@@ -156,7 +156,13 @@ void wxChartWindow::DrawHLines(
- }
-
- wxChartSizes *sizes = GetSizes();
--
-+
-+ // sizes may be NULL, in this case do nothing
-+ // not sure if this is the right way to do things
-+ // gw.foss...@gmail.com
-+ if (!sizes)
-+ return;
-+
- hp->SetPen( *wxBLACK_DASHED_PEN );
-
- double current = lower;
-@@ -188,6 +194,10 @@ ChartValue wxChartWindow::GetVirtualWidth() const
- int iNodes = static_cast<int>(ceil( GetVirtualMaxX() ));
- wxChartSizes *sizes = GetSizes();
-
-+ /// sizes may be NULL, in this case return a fixes value
-+ if (!sizes)
-+ return 1;
-+
- ChartValue x = 0;
-
- for ( int iNode = 0; iNode <= iNodes; ++ iNode )
