[med-svn] [ball] 01/03: FTBFS with sip 4.19.x
Andreas Tille
tille at debian.org
Tue Aug 22 13:51:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ball.
commit 8c26f346e3f33c649d45633d5086c2f7b1d868f7
Author: Andreas Tille <tille at debian.org>
Date: Tue Aug 22 14:38:52 2017 +0200
FTBFS with sip 4.19.x
---
debian/changelog | 8 +
debian/patches/gcc7_458598c...a0eb440.diff | 717 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 726 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index bd7727a..9c7d305 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ball (1.4.3~beta1-4) UNRELEASED; urgency=medium
+
+ * FTBFS with sip 4.19.x (Thanks for the hint to upsteam solution given
+ by Dmitry Shachnev <mitya57 at debian.org>)
+ Closes: #867660
+
+ -- Andreas Tille <tille at debian.org> Tue, 22 Aug 2017 14:38:06 +0200
+
ball (1.4.3~beta1-3) unstable; urgency=medium
* Ignore test suite result on non-amd64
diff --git a/debian/patches/gcc7_458598c...a0eb440.diff b/debian/patches/gcc7_458598c...a0eb440.diff
new file mode 100644
index 0000000..7124730
--- /dev/null
+++ b/debian/patches/gcc7_458598c...a0eb440.diff
@@ -0,0 +1,717 @@
+Author: Thomas Kemmer
+Last-Update: Aug 01, 2017
+Bug-Debian: https://bugs.debian.org/867660
+Source: https://github.com/BALL-Project/ball/compare/458598c...a0eb440.diff
+Description: Fix FTBFS with sip 4.19.x
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -416,7 +416,7 @@ IF (BALL_PYTHON_SUPPORT)
+ IF (PYTHONLIBS_FOUND)
+ BALL_COMBINE_LIBS(PYTHON_LIBRARIES "${PYTHON_LIBRARIES}" "${PYTHON_DEBUG_LIBRARIES}")
+ SET(SIP_EXTRA_OPTIONS "-e")
+- FIND_PACKAGE(SIP)
++ FIND_PACKAGE(SIP 4.8)
+ SET(BALL_SIP_VERSION ${SIP_VERSION})
+ SET(BALL_SIP_VERSION_STR ${SIP_VERSION_STR})
+ ENDIF()
+--- /dev/null
++++ b/include/BALL/PYTHON/pyUnaryProcessors.h
+@@ -0,0 +1,20 @@
++#ifndef BALL_PYTHON_PYPROCESSOR_H
++#define BALL_PYTHON_PYPROCESSOR_H
++
++#include <BALL/KERNEL/atomContainer.h>
++
++namespace BALL
++{
++ using AtomContainerProcessor = UnaryProcessor<AtomContainer>;
++ using AtomProcessor = UnaryProcessor<Atom>;
++ using BondProcessor = UnaryProcessor<Bond>;
++ using ChainProcessor = UnaryProcessor<Chain>;
++ using CompositeProcessor = UnaryProcessor<Composite>;
++ using FragmentProcessor = UnaryProcessor<Fragment>;
++ using ResidueProcessor = UnaryProcessor<Residue>;
++
++ using ConstAtomProcessor = ConstUnaryProcessor<Atom>;
++ using ConstCompositeProcessor = ConstUnaryProcessor<Composite>;
++}
++
++#endif //BALL_PYTHON_PYPROCESSOR_H
+--- a/source/PYTHON/EXTENSIONS/BALL/BALLCore.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/BALLCore.sip
+@@ -255,13 +255,7 @@
+ %Include extractors.sip
+ %Include pyIndexList.sip // a list of numbers (indices etc.)
+ %Include pyAtomDict.sip // a dictionary mapping to atoms
+-%Include pyAtomProcessor.sip
+-%Include pyBondProcessor.sip
+-%Include pyFragmentProcessor.sip
+-%Include pyResidueProcessor.sip
+-%Include pyCompositeProcessor.sip
+-%Include pyChainProcessor.sip
+-//%Include pyLists.sip
++%Include pyUnaryProcessors.sip
+
+ // QSAR
+ //%Include descriptor.sip
+--- a/source/PYTHON/EXTENSIONS/BALL/PTE_.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/PTE_.sip
+@@ -9,7 +9,6 @@
+ %End
+
+ class Element
+- : PropertyManager
+ {
+ %TypeHeaderCode
+ #include <BALL/KERNEL/PTE.h>
+@@ -65,7 +64,6 @@ class Element
+ };
+
+ class PTE_
+- : PropertyManager
+ {
+ public:
+ PTE_();
+--- a/source/PYTHON/EXTENSIONS/BALL/addHydrogenProcessor.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/addHydrogenProcessor.sip
+@@ -1,6 +1,7 @@
+ class AddHydrogenProcessor : CompositeProcessor
+ {
+ %TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
+ #include <BALL/STRUCTURE/addHydrogenProcessor.h>
+ using namespace BALL;
+ %End
+--- a/source/PYTHON/EXTENSIONS/BALL/aromaticityProcessor.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/aromaticityProcessor.sip
+@@ -6,17 +6,16 @@
+ %ModuleCode
+ #include <BALL/QSAR/aromaticityProcessor.h>
+ using namespace BALL;
+- typedef UnaryProcessor<Composite> CompositeProcessor;
+ %End
+
+ class AromaticityProcessor
+- : CompositeProcessor
++ : AtomContainerProcessor
+ {
+ %TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
+ #include <BALL/QSAR/aromaticityProcessor.h>
+ using namespace BALL;
+ using namespace BALL::Exception;
+- typedef UnaryProcessor<Composite> CompositeProcessor;
+ %End
+
+ public:
+--- a/source/PYTHON/EXTENSIONS/BALL/assignBondOrderProcessor.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/assignBondOrderProcessor.sip
+@@ -5,19 +5,18 @@
+ %ModuleCode
+ #include <BALL/STRUCTURE/assignBondOrderProcessor.h>
+ using namespace BALL;
+- typedef UnaryProcessor<Composite> CompositeProcessor;
+ %End
+
+
+
+ class AssignBondOrderProcessor
+- : CompositeProcessor
++ : AtomContainerProcessor
+ {
+ %TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
+ #include <BALL/STRUCTURE/assignBondOrderProcessor.h>
+ using namespace BALL;
+ using namespace BALL::Exception;
+- typedef UnaryProcessor<Composite> CompositeProcessor;
+ %End
+
+ public:
+--- a/source/PYTHON/EXTENSIONS/BALL/connectedComponentsProcessor.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/connectedComponentsProcessor.sip
+@@ -7,23 +7,17 @@
+ %ModuleCode
+ #include <BALL/STRUCTURE/connectedComponentsProcessor.h>
+ using namespace BALL;
+- typedef UnaryProcessor<Composite> CompositeProcessor;
+ %End
+
+-
+-
+ class ConnectedComponentsProcessor
+- : CompositeProcessor
++ : AtomContainerProcessor
+ {
+ %TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
+ #include <BALL/STRUCTURE/connectedComponentsProcessor.h>
+ using namespace std;
+ using namespace BALL;
+ using namespace BALL::Exception;
+- typedef UnaryProcessor<Composite> CompositeProcessor;
+-
+- //typedef vector<Atom*> Component;
+- //typedef vector<Component> ComponentVector;
+ %End
+
+ public:
+--- a/source/PYTHON/EXTENSIONS/BALL/exception.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/exception.sip
+@@ -382,6 +382,26 @@ using namespace BALL::Exception;
+ %End
+ };
+
++%Exception File::CannotWrite(GeneralException) /PyName=CannotWrite/
++{
++%TypeHeaderCode
++ #include <BALL/DATATYPE/string.h>
++ #include <BALL/COMMON/exception.h>
++ using namespace BALL;
++ using namespace BALL::Exception;
++%End
++%RaiseCode
++ String detail =
++ (String)(sipExceptionRef.getName()) + " in line " + String(sipExceptionRef.getLine()) + " of " + sipExceptionRef.getFile()
++ + ": " + sipExceptionRef.getMessage();
++
++ SIP_BLOCK_THREADS
++ PyErr_SetString(sipException_File_CannotWrite, detail.c_str());
++ SIP_UNBLOCK_THREADS
++%End
++};
++
++
+ /// creates a crash under windows:
+ class GlobalExceptionHandler
+ {
+--- a/source/PYTHON/EXTENSIONS/BALL/file.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/file.sip
+@@ -14,8 +14,6 @@ class std__openmode
+ public:
+ };
+
+-
+-
+ class File
+ {
+ %TypeHeaderCode
+@@ -34,28 +32,6 @@ class File
+ %End
+ public:
+
+- // nested class File::CannotWrite
+- class CannotWrite
+- {
+- public:
+- CannotWrite(const char*, int, const String&) throw();
+- ~CannotWrite() throw();
+- String getFilename() const throw();
+- };
+-
+-
+- /*
+- unsigned enum {
+- MODE_IN,
+- MODE_OUT,
+- MODE_APP,
+- MODE_BINARY,
+- MODE_ATE,
+- MODE_TRUNC
+- };
+- */
+-
+-
+ File();
+ // default open mode: IN
+ File(const String&, OpenMode openmode = std::ios::in);
+--- a/source/PYTHON/EXTENSIONS/BALL/geometricProperties.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/geometricProperties.sip
+@@ -5,13 +5,12 @@
+ //
+
+ class BoundingBoxProcessor
+-// : public UnaryProcessor<Atom>
+- : AtomProcessor
++ : ConstAtomProcessor
+ {
+ %TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
+ #include <BALL/STRUCTURE/geometricProperties.h>
+ using namespace BALL;
+- typedef UnaryProcessor<Atom> AtomProcessor;
+ %End
+ public:
+ virtual bool start() throw();
+@@ -26,13 +25,12 @@ class BoundingBoxProcessor
+ };
+
+ class GeometricCenterProcessor
+-// : public UnaryProcessor<Atom>
+- : AtomProcessor
++ : ConstAtomProcessor
+ {
+ %TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
+ #include <BALL/STRUCTURE/geometricProperties.h>
+ using namespace BALL;
+- typedef UnaryProcessor<Atom> AtomProcessor;
+ %End
+ public:
+ virtual bool start() throw();
+@@ -45,13 +43,12 @@ class GeometricCenterProcessor
+ };
+
+ class FragmentDistanceCollector
+-// : public UnaryProcessor<Composite>
+- : CompositeProcessor
++ : ConstCompositeProcessor
+ {
+ %TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
+ #include <BALL/STRUCTURE/geometricProperties.h>
+ using namespace BALL;
+- typedef UnaryProcessor<Composite> CompositeProcessor;
+ %End
+ public:
+ FragmentDistanceCollector();
+--- a/source/PYTHON/EXTENSIONS/BALL/geometricTransformations.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/geometricTransformations.sip
+@@ -5,13 +5,12 @@
+ //
+
+ class TranslationProcessor
+-// : public UnaryProcessor<Atom>
+ : AtomProcessor
+ {
+ %TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
+ #include <BALL/STRUCTURE/geometricTransformations.h>
+ using namespace BALL;
+- typedef UnaryProcessor<Atom> AtomProcessor;
+ %End
+ public:
+ TranslationProcessor();
+@@ -25,13 +24,12 @@ class TranslationProcessor
+ };
+
+ class TransformationProcessor
+-// :public UnaryProcessor<Atom>
+ : AtomProcessor
+ {
+ %TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
+ #include <BALL/STRUCTURE/geometricTransformations.h>
+ using namespace BALL;
+- typedef UnaryProcessor<Atom> AtomProcessor;
+ %End
+ public:
+ TransformationProcessor();
+--- a/source/PYTHON/EXTENSIONS/BALL/pyAtomProcessor.sip
++++ /dev/null
+@@ -1,23 +0,0 @@
+-// -*- Mode: C++; tab-width: 2; -*-
+-// vi: set ts=2:
+-//
+-// $Id$
+-//
+-
+-class AtomProcessor
+-{
+-%TypeHeaderCode
+- #include <BALL/CONCEPT/processor.h>
+- #include <BALL/KERNEL/atom.h>
+- using namespace BALL;
+- typedef UnaryProcessor<Atom> AtomProcessor;
+-%End
+- public:
+- bool start();
+- bool finish();
+- Processor::Result operator () (Atom&);
+-%MethodCode
+- sipRes = sipCpp->operator () (*a0);
+-%End
+-};
+-
+--- a/source/PYTHON/EXTENSIONS/BALL/pyBondProcessor.sip
++++ /dev/null
+@@ -1,23 +0,0 @@
+-// -*- Mode: C++; tab-width: 2; -*-
+-// vi: set ts=2:
+-//
+-// $Id$
+-//
+-
+-class BondProcessor
+-{
+-%TypeHeaderCode
+- #include <BALL/CONCEPT/processor.h>
+- #include <BALL/KERNEL/bond.h>
+- using namespace BALL;
+- typedef UnaryProcessor<Bond> BondProcessor;
+-%End
+- public:
+- bool start();
+- bool finish();
+- Processor::Result operator () (Bond&);
+-%MethodCode
+- sipRes = sipCpp->operator () (*a0);
+-%End
+-};
+-
+--- a/source/PYTHON/EXTENSIONS/BALL/pyChainProcessor.sip
++++ /dev/null
+@@ -1,22 +0,0 @@
+-// -*- Mode: C++; tab-width: 2; -*-
+-// vi: set ts=2:
+-//
+-
+-class ChainProcessor
+-{
+-%TypeHeaderCode
+- #include <BALL/CONCEPT/processor.h>
+- #include <BALL/KERNEL/chain.h>
+- using namespace BALL;
+- typedef UnaryProcessor<Chain> ChainProcessor;
+-%End
+- public:
+- bool start();
+- bool finish();
+- Processor::Result operator () (Chain&);
+-%MethodCode
+- sipRes = sipCpp->operator () (*a0);
+-%End
+-};
+-
+-
+--- a/source/PYTHON/EXTENSIONS/BALL/pyCompositeProcessor.sip
++++ /dev/null
+@@ -1,23 +0,0 @@
+-// -*- Mode: C++; tab-width: 2; -*-
+-// vi: set ts=2:
+-//
+-// $Id$
+-//
+-
+-class CompositeProcessor
+-{
+-%TypeHeaderCode
+- #include <BALL/CONCEPT/processor.h>
+- #include <BALL/CONCEPT/composite.h>
+- using namespace BALL;
+- typedef UnaryProcessor<Composite> CompositeProcessor;
+-%End
+- public:
+- bool start();
+- bool finish();
+- Processor::Result operator () (Composite&);
+-%MethodCode
+- sipRes = sipCpp->operator () (*a0);
+-%End
+-};
+-
+--- a/source/PYTHON/EXTENSIONS/BALL/pyFragmentProcessor.sip
++++ /dev/null
+@@ -1,23 +0,0 @@
+-// -*- Mode: C++; tab-width: 2; -*-
+-// vi: set ts=2:
+-//
+-// $Id$
+-//
+-
+-class FragmentProcessor
+-{
+-%TypeHeaderCode
+- #include <BALL/CONCEPT/processor.h>
+- #include <BALL/KERNEL/fragment.h>
+- using namespace BALL;
+- typedef UnaryProcessor<Fragment> FragmentProcessor;
+-%End
+- public:
+- bool start();
+- bool finish();
+- Processor::Result operator () (Fragment&);
+-%MethodCode
+- sipRes = sipCpp->operator () (*a0);
+-%End
+-};
+-
+--- a/source/PYTHON/EXTENSIONS/BALL/pyResidueProcessor.sip
++++ /dev/null
+@@ -1,23 +0,0 @@
+-// -*- Mode: C++; tab-width: 2; -*-
+-// vi: set ts=2:
+-//
+-// $Id$
+-//
+-
+-class ResidueProcessor
+-{
+-%TypeHeaderCode
+- #include <BALL/CONCEPT/processor.h>
+- #include <BALL/KERNEL/residue.h>
+- using namespace BALL;
+- typedef UnaryProcessor<Residue> ResidueProcessor;
+-%End
+- public:
+- bool start();
+- bool finish();
+- Processor::Result operator () (Residue&);
+-%MethodCode
+- sipRes = sipCpp->operator () (*a0);
+-%End
+-};
+-
+--- /dev/null
++++ b/source/PYTHON/EXTENSIONS/BALL/pyUnaryProcessors.sip
+@@ -0,0 +1,134 @@
++class AtomProcessor
++{
++%TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
++ using namespace BALL;
++%End
++ public:
++ bool start();
++ bool finish();
++ Processor::Result operator () (Atom&);
++%MethodCode
++ sipRes = sipCpp->operator () (*a0);
++%End
++};
++
++class AtomContainerProcessor
++{
++%TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
++ using namespace BALL;
++%End
++ public:
++ bool start();
++ bool finish();
++ Processor::Result operator () (AtomContainer&);
++%MethodCode
++ sipRes = sipCpp->operator () (*a0);
++%End
++};
++
++class BondProcessor
++{
++%TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
++ using namespace BALL;
++%End
++ public:
++ bool start();
++ bool finish();
++ Processor::Result operator () (Bond&);
++%MethodCode
++ sipRes = sipCpp->operator () (*a0);
++%End
++};
++
++class ChainProcessor
++{
++%TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
++ using namespace BALL;
++%End
++ public:
++ bool start();
++ bool finish();
++ Processor::Result operator () (Chain&);
++%MethodCode
++ sipRes = sipCpp->operator () (*a0);
++%End
++};
++
++class CompositeProcessor
++{
++%TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
++ using namespace BALL;
++%End
++ public:
++ bool start();
++ bool finish();
++ Processor::Result operator () (Composite&);
++%MethodCode
++ sipRes = sipCpp->operator () (*a0);
++%End
++};
++
++class FragmentProcessor
++{
++%TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
++ using namespace BALL;
++%End
++ public:
++ bool start();
++ bool finish();
++ Processor::Result operator () (Fragment&);
++%MethodCode
++ sipRes = sipCpp->operator () (*a0);
++%End
++};
++
++class ResidueProcessor
++{
++%TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
++ using namespace BALL;
++%End
++ public:
++ bool start();
++ bool finish();
++ Processor::Result operator () (Residue&);
++%MethodCode
++ sipRes = sipCpp->operator () (*a0);
++%End
++};
++
++class ConstAtomProcessor
++{
++%TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
++ using namespace BALL;
++%End
++ public:
++ bool start();
++ bool finish();
++ Processor::Result operator () (Atom&);
++%MethodCode
++ sipRes = sipCpp->operator () (*a0);
++%End
++};
++
++class ConstCompositeProcessor
++{
++%TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
++ using namespace BALL;
++%End
++ public:
++ bool start();
++ bool finish();
++ Processor::Result operator () (Composite&);
++%MethodCode
++ sipRes = sipCpp->operator () (*a0);
++%End
++};
+--- a/source/PYTHON/EXTENSIONS/BALL/structureMapper.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/structureMapper.sip
+@@ -6,6 +6,7 @@ class StructureMapper
+ : TransformationProcessor
+ {
+ %TypeHeaderCode
++ #include <BALL/PYTHON/pyUnaryProcessors.h>
+ #include <BALL/STRUCTURE/structureMapper.h>
+ using namespace BALL;
+ %End
+--- a/source/PYTHON/EXTENSIONS/BALL/vector3.sip
++++ b/source/PYTHON/EXTENSIONS/BALL/vector3.sip
+@@ -5,7 +5,6 @@
+ //
+
+ class Vector3
+- : PersistentObject
+ {
+ %TypeHeaderCode
+ #include <BALL/MATHS/vector3.h>
+--- a/source/PYTHON/EXTENSIONS/BALLPyMacros.h
++++ b/source/PYTHON/EXTENSIONS/BALLPyMacros.h
+@@ -6,8 +6,6 @@
+ #define BALL_PYTHON_EXTENSIONS_BALLPYMACROS_H
+
+ // some macros to help us with using sip
+-#if SIP_VERSION >= 0x040800
+-
+ #define BALL_SIP_TYPE(type)\
+ sipType_##type
+
+@@ -42,42 +40,4 @@
+ }\
+ else\
+
+-#else
+-
+-#define BALL_SIP_TYPE(type)\
+- sipClass_##type
+-
+-#define BALL_CONVERT_FROM_INSTANCE(object, type, transferObject)\
+- sipConvertFromInstance(object, sipClass_##type, transferObject)
+-
+-#define BALL_CONVERT_FROM_MAPPED_TYPE(object, type, transferObject)\
+- sipConvertFromMappedType(object, sipMappedType_##type, transferObject)
+-
+-#define BALL_CONVERT_TO_CPP(type)\
+- (type *)sipConvertToCpp(sipPy, sipClass_##type, sipIsErr)
+-
+-#define BALL_CONVERT_TO_INSTANCE(object, type, state)\
+- reinterpret_cast<type*>(sipConvertToInstance(object, sipClass_##type, 0, SIP_NOT_NONE, &state, sipIsErr))
+-
+-#define BALL_IS_SUBCLASS_INSTANCE(object, type)\
+- sipIsSubClassInstance(object, sipClass_##type)
+-
+-#define BALL_CAN_CONVERT_TO_INSTANCE(object, type)\
+- sipCanConvertToInstance(object, sipClass_##type, SIP_NOT_NONE)
+-
+-#define BALL_FORCE_CONVERT_TO_TYPE(key, type)\
+- sipForceConvertTo_##type(key, sipIsErr)
+-
+-#define BALL_RELEASE_INSTANCE(object, type, state)\
+- sipReleaseInstance(object, sipClass_##type, state)
+-
+-#define BALL_TO_SIP_MAP(type)\
+- if (RTTI::isKindOf<type>(sipCpp))\
+- {\
+- sipClass = sipClass_##type;\
+- }\
+- else\
+-
+-#endif
+-
+ #endif // BALL_PYTHON_EXTENSIONS_BALLPYMACROS_H
+--- a/source/PYTHON/EXTENSIONS/VIEW/pyBALLSipHelper.C
++++ b/source/PYTHON/EXTENSIONS/VIEW/pyBALLSipHelper.C
+@@ -1,26 +1,16 @@
+-// -*- Mode: C++; tab-width: 2; -*-
+-// vi: set ts=2:
+-//
+-// $Id: pyBALLSipHelper.C,v 1.4.28.2 2007-03-28 13:58:08 amoll Exp $
+-
+-#include <typeinfo>
+ #include "sipAPIVIEW.h"
+ #include <BALL/KERNEL/PDBAtom.h>
+ #include <BALL/KERNEL/bond.h>
+ #include <BALL/KERNEL/secondaryStructure.h>
+ #include <BALL/KERNEL/chain.h>
+ #include <BALL/KERNEL/system.h>
+-#include <BALL/KERNEL/protein.h>
+-#include <BALL/KERNEL/nucleicAcid.h>
+-#include <BALL/KERNEL/nucleotide.h>
+-#include <BALL/KERNEL/molecule.h>
+
+ namespace BALL
+ {
+
+ #define BALL_TO_SIP_MAP_BASECLASS(type)\
+ if (dynamic_cast<const type*>(&object) != NULL)\
+- return BALL_CONVERT_FROM_INSTANCE(&object, type, 0);
++ return sipConvertFromType(&object, sipFindType(#type), 0);
+
+ PyObject* pyMapBALLObjectToSip(Composite& object)
+ {
+--- a/source/PYTHON/EXTENSIONS/VIEW/serverWidget.sip
++++ b/source/PYTHON/EXTENSIONS/VIEW/serverWidget.sip
+@@ -18,7 +18,7 @@ class ServerWidget
+ ~ServerWidget() throw();
+ virtual void clear() throw();
+
+- %Exception ServerWidget::NotCompositeObject(GeneralException) /PyName=ServerWidget_NotCompositeObject/
++ %Exception ServerWidget::NotCompositeObject(SIP_Exception) /PyName=ServerWidget_NotCompositeObject/
+ {
+ %TypeHeaderCode
+ #include <BALL/DATATYPE/string.h>
diff --git a/debian/patches/series b/debian/patches/series
index f4957ad..b0e9d3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ modify-rtti-isKindOf-to-take-pointer.patch
fix-PoseClustering_Test-replace-file-compare-with-deserialize.patch
fix-XDRPersistenceManager_test.patch
disable-AmberFF_test.patch
+gcc7_458598c...a0eb440.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ball.git
More information about the debian-med-commit
mailing list