I'm planning on uploading this as an NMU. Since it's blocking the sip4 transition, I'm not planning on uploading to delayed.
Scott K
diff -u avogadro-1.0.1/debian/changelog avogadro-1.0.1/debian/changelog
--- avogadro-1.0.1/debian/changelog
+++ avogadro-1.0.1/debian/changelog
@@ -1,3 +1,11 @@
+avogadro (1.0.1-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with new SIP API (8.0) (Closes: #616183)
+ - Patch from Gentoo Bug 345423 via Ubuntu
+
+ -- Scott Kitterman <sc...@kitterman.com> Wed, 09 Mar 2011 09:05:07 -0500
+
avogadro (1.0.1-3.1) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- avogadro-1.0.1.orig/libavogadro/src/python/sip.cpp
+++ avogadro-1.0.1/libavogadro/src/python/sip.cpp
@@ -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()
signature.asc
Description: This is a digitally signed message part.
