* [gentoo-commits] gentoo-x86 commit in sci-chemistry/ball/files: ball-1.4.1-pthread.patch ball-1.4.1-multilib.patch ball-1.4.1-libsvm.patch ball-1.4.1-python.patch
@ 2012-03-25 14:13 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2012-03-25 14:13 UTC (permalink / raw
To: gentoo-commits
jlec 12/03/25 14:13:39
Added: ball-1.4.1-pthread.patch ball-1.4.1-multilib.patch
ball-1.4.1-libsvm.patch ball-1.4.1-python.patch
Log:
New addition, written by me, #406401
(Portage version: 2.2.0_alpha95/cvs/Linux x86_64)
Revision Changes Path
1.1 sci-chemistry/ball/files/ball-1.4.1-pthread.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.1-pthread.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.1-pthread.patch?rev=1.1&content-type=text/plain
Index: ball-1.4.1-pthread.patch
===================================================================
CMakeLists.txt | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a68497f..264f321 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -426,6 +426,11 @@ LIST(APPEND BALL_DEP_LIBRARIES
${PYTHON_LIBRARIES}
)
+
+IF(UNIX)
+ LIST(APPEND BALL_DEP_LIBRARIES "pthread")
+ENDIF()
+
IF(TBB_FOUND)
LIST(APPEND BALL_DEP_LIBRARIES ${TBB_LIBRARIES})
ENDIF()
1.1 sci-chemistry/ball/files/ball-1.4.1-multilib.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.1-multilib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.1-multilib.patch?rev=1.1&content-type=text/plain
Index: ball-1.4.1-multilib.patch
===================================================================
From 5b8f4e58b4e54bcdfa6f287e01f91d9dfd4e5a14 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Sun, 25 Mar 2012 14:12:21 +0200
Subject: [PATCH] Correct path for multilib installation.
Libraries should go into lib64 not lib on native 64bit. Therefore we can use the LIBDIR detected by cmake.
---
CMakeLists.txt | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 940ebf4..7eb3db4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -426,8 +426,8 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
## These variables are used in all install-targets
IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET(BALL_RUNTIME_INSTALL_DIRECTORY "bin")
- SET(BALL_LIBRARY_INSTALL_DIRECTORY "lib")
- SET(BALL_ARCHIVE_INSTALL_DIRECTORY "lib")
+ SET(BALL_LIBRARY_INSTALL_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
+ SET(BALL_ARCHIVE_INSTALL_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
SET(BALL_HEADER_INSTALL_DIRECTORY ".")
SET(BALL_DATA_INSTALL_DIRECTORY "share/BALL")
SET(BALL_DOCUMENTATION_INSTALL_DIRECTORY "share/BALL/doc")
@@ -435,8 +435,8 @@ IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET(BALL_PYTHON_INSTALL_DIRECTORY "bin")
SET(BALL_PLUGIN_INSTALL_DIRECTORY "bin")
ELSE()
- SET(BALL_PYTHON_INSTALL_DIRECTORY "lib")
- SET(BALL_PLUGIN_INSTALL_DIRECTORY "lib")
+ SET(BALL_PYTHON_INSTALL_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
+ SET(BALL_PLUGIN_INSTALL_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
ENDIF()
ELSE()
SET(BALL_BUNDLE_INSTALL_DIRECTORY "Applications")
--
1.7.8.5
1.1 sci-chemistry/ball/files/ball-1.4.1-libsvm.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.1-libsvm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.1-libsvm.patch?rev=1.1&content-type=text/plain
Index: ball-1.4.1-libsvm.patch
===================================================================
From 60a5f677587046b3e2077872c21b005bad549b85 Mon Sep 17 00:00:00 2001
Message-Id: <60a5f677587046b3e2077872c21b005bad549b85.1332678065.git.jlec@gentoo.org>
From: Justin Lecher <jlec@gentoo.org>
Date: Sun, 25 Mar 2012 14:15:16 +0200
Subject: [PATCH 1/2] Correct deprecated usage of svm_destroy_model to
svm_free_and_destroy_model
---
source/QSAR/libsvmModel.C | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/source/QSAR/libsvmModel.C b/source/QSAR/libsvmModel.C
index 58ce4dc..1f24e15 100644
--- a/source/QSAR/libsvmModel.C
+++ b/source/QSAR/libsvmModel.C
@@ -81,7 +81,7 @@ void LibsvmModel::train()
//free(prob);
//free(prob->y); free(prob->x);
- svm_destroy_model((::svm_model*)svm_train_result_);
+ svm_free_and_destroy_model((::svm_model**)svm_train_result_);
}
}
1.1 sci-chemistry/ball/files/ball-1.4.1-python.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.1-python.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ball/files/ball-1.4.1-python.patch?rev=1.1&content-type=text/plain
Index: ball-1.4.1-python.patch
===================================================================
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;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-25 14:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-25 14:13 [gentoo-commits] gentoo-x86 commit in sci-chemistry/ball/files: ball-1.4.1-pthread.patch ball-1.4.1-multilib.patch ball-1.4.1-libsvm.patch ball-1.4.1-python.patch Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox