File avogadro-1.0.1-fix_sip.patch of Package avogadro

Overview Repositories Revisions Requests Users Attributes Meta

File avogadro-1.0.1-fix_sip.patch of Package avogadro (Revision 0268cae44c73718e13dba3ce616be87b)

Currently displaying revision 0268cae44c73718e13dba3ce616be87b , Show latest

--- cmake/modules/PythonDeps.cmake.orig
+++ cmake/modules/PythonDeps.cmake
@@ -59,10 +59,13 @@
   if (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
     message(STATUS "Found sip.h header...")
     execute_process(COMMAND sip -V OUTPUT_VARIABLE SIP_VERSION)
-    if (${SIP_VERSION} VERSION_GREATER "4.8")
+    if (NOT ${SIP_VERSION} VERSION_LESS "4.11")
+      message(STATUS "using sip version 4.11 or above...")
+      add_definitions( -DSIP_4_11 -DSIP_4_8 )
+    elseif (NOT ${SIP_VERSION} VERSION_LESS "4.8")
       message(STATUS "using sip version 4.8 or above...")
       add_definitions( -DSIP_4_8 )
-    endif (${SIP_VERSION} VERSION_GREATER "4.8")
+    endif (NOT ${SIP_VERSION} VERSION_LESS "4.11")
   else (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
     message(STATUS "sip.h header NOT found - Python support disabled")
   #  message(STATUS "debian/ubuntu: install the python-sip4-dev package.")

--- libavogadro/src/python/sip.cpp.orig
+++ libavogadro/src/python/sip.cpp
@@ -204,7 +204,11 @@
     sipWrapper *wrapper = reinterpret_cast<sipWrapper*>(obj_ptr);
 #endif
     // return the C++ pointer
+#ifdef SIP_4_11
+    return sip_API->api_get_address(wrapper);
+#else
     return wrapper->u.cppPtr;
+#endif
   }
     
   QClass_converters()

Places

File avogadro-1.0.1-fix_sip.patch of Package avogadro (Revision 0268cae44c73718e13dba3ce616be87b)

Places