diff options
Diffstat (limited to 'sci-chemistry/ball/files/ball-1.4.1-python.patch')
-rw-r--r-- | sci-chemistry/ball/files/ball-1.4.1-python.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/sci-chemistry/ball/files/ball-1.4.1-python.patch b/sci-chemistry/ball/files/ball-1.4.1-python.patch deleted file mode 100644 index f7a235a3bd78..000000000000 --- a/sci-chemistry/ball/files/ball-1.4.1-python.patch +++ /dev/null @@ -1,82 +0,0 @@ - source/PYTHON/EXTENSIONS/BALL/file.sip | 2 +- - source/PYTHON/EXTENSIONS/BALL/periodicBoundary.sip | 4 ++-- - source/PYTHON/EXTENSIONS/VIEW/mainControl.sip | 2 +- - source/PYTHON/pyInterpreter.C | 9 +++++---- - 4 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/source/PYTHON/EXTENSIONS/BALL/file.sip b/source/PYTHON/EXTENSIONS/BALL/file.sip -index e29170a..6ec6dc4 100644 ---- a/source/PYTHON/EXTENSIONS/BALL/file.sip -+++ b/source/PYTHON/EXTENSIONS/BALL/file.sip -@@ -70,7 +70,7 @@ class File - // std::fstream& getFileStream(); - bool copyTo(const String&); - bool moveTo(const String&); -- bool remove() const; -+ bool remove(); - bool renameTo(const String&); - bool truncate(int) const; - bool operator == (const File& /file/) const; -diff --git a/source/PYTHON/EXTENSIONS/BALL/periodicBoundary.sip b/source/PYTHON/EXTENSIONS/BALL/periodicBoundary.sip -index 2b79778..46daade 100644 ---- a/source/PYTHON/EXTENSIONS/BALL/periodicBoundary.sip -+++ b/source/PYTHON/EXTENSIONS/BALL/periodicBoundary.sip -@@ -22,8 +22,8 @@ using namespace BALL; - void disable(); - SimpleBox3 getBox() const; - void setBox(const SimpleBox3&); -- int addSolvent(const String&) const; -- int removeSolvent() const; -+ int addSolvent(const String& /In/); -+ int removeSolvent(); - bool isEnabled() const; - void updateMolecules(); - Options* options; -diff --git a/source/PYTHON/EXTENSIONS/VIEW/mainControl.sip b/source/PYTHON/EXTENSIONS/VIEW/mainControl.sip -index 0a6c319..61d4596 100644 ---- a/source/PYTHON/EXTENSIONS/VIEW/mainControl.sip -+++ b/source/PYTHON/EXTENSIONS/VIEW/mainControl.sip -@@ -139,7 +139,7 @@ class MainControl - virtual void openFile(const String&) throw(); - void saveBALLViewProjectFile(const String&); - void loadBALLViewProjectFile(const String&) throw(); -- void quickSave() const; -+ void quickSave(); - void quickLoad(); - void processEvents(Size); - }; -diff --git a/source/PYTHON/pyInterpreter.C b/source/PYTHON/pyInterpreter.C -index 155a09f..7a12c33 100644 ---- a/source/PYTHON/pyInterpreter.C -+++ b/source/PYTHON/pyInterpreter.C -@@ -4,9 +4,9 @@ - // $Id: ball-1.4.1-python.patch,v 1.1 2012/03/25 14:13:39 jlec Exp $ - // - --#include <Python.h> -- - #include <BALL/PYTHON/pyInterpreter.h> -+#include <Python.h> -+ - #include <BALL/PYTHON/BALLPythonConfig.h> - - #include <BALL/FORMAT/lineBasedFile.h> -@@ -34,7 +34,6 @@ namespace BALL - PyObject* result = PyRun_String(const_cast<char*>(str.c_str()), mode, context_, context_); - if (PyErr_Occurred()) - { -- PyErr_Print(); - PyObject* type; - PyObject* value; - PyObject* range; -@@ -50,7 +49,9 @@ namespace BALL - { - error_message_ += " (error message could not be parsed)"; - } -- -+ -+ PyErr_Print(); -+ - error_message_ += "\n"; - - return 0; |