summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2011-03-27 09:13:23 -0400
committerRobby Workman <rworkman@slackbuilds.org>2011-03-27 11:26:55 -0500
commit0543cfa813faf9e626f21a51c84eb32742787304 (patch)
tree1fba1894e6c8a0ab0743335fd3d99435a57f3d14
parent7e69a418f47e7fff1031bcc46c96ebbfdde47de0 (diff)
downloadslackbuilds-0543cfa813faf9e626f21a51c84eb32742787304.tar.gz
academic/avogadro: Patched to build with sip 4.11.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--academic/avogadro/avogadro-1.0.1-sip-4.11.patch23
-rw-r--r--academic/avogadro/avogadro.SlackBuild2
2 files changed, 25 insertions, 0 deletions
diff --git a/academic/avogadro/avogadro-1.0.1-sip-4.11.patch b/academic/avogadro/avogadro-1.0.1-sip-4.11.patch
new file mode 100644
index 0000000000..e0a6e69e5b
--- /dev/null
+++ b/academic/avogadro/avogadro-1.0.1-sip-4.11.patch
@@ -0,0 +1,23 @@
+--- libavogadro/src/python/sip.cpp.old 2010-11-14 14:55:44.928487067 -0800
++++ libavogadro/src/python/sip.cpp 2010-11-14 15:37:31.589487066 -0800
+@@ -198,13 +198,19 @@
+ #endif
+
+ // reinterpret to sipWrapper
++#if SIP_API_MAJOR_NR >= 8
++ sipSimpleWrapper *wrapper = reinterpret_cast<sipSimpleWrapper*>(obj_ptr);
++ return wrapper->data;
++#else
++
+ #ifdef SIP_4_8
+ sipSimpleWrapper *wrapper = reinterpret_cast<sipSimpleWrapper*>(obj_ptr);
+ #else
+ sipWrapper *wrapper = reinterpret_cast<sipWrapper*>(obj_ptr);
++ // return the C++ pointer
+ #endif
+- // return the C++ pointer
+ return wrapper->u.cppPtr;
++#endif
+ }
+
+ QClass_converters()
diff --git a/academic/avogadro/avogadro.SlackBuild b/academic/avogadro/avogadro.SlackBuild
index 5c84c6dc41..d66ea05c9a 100644
--- a/academic/avogadro/avogadro.SlackBuild
+++ b/academic/avogadro/avogadro.SlackBuild
@@ -53,6 +53,8 @@ find . \
# Fix manpage directory.
sed -i 's|share/man|man|' doc/CMakeLists.txt
+# Patch to work with sip 4.11.2
+patch -p0 < $CWD/avogadro-1.0.1-sip-4.11.patch
mkdir build && cd build
cmake \