[arch-commits] Commit in avogadro/trunk (PKGBUILD sip-4.11.patch)

[Andrea Scarpino]

    Date: Wednesday, November 17, 2010 @ 11:42:36
  Author: andrea
Revision: 99787

update sip patch with the patch applied upstream

Modified:
  avogadro/trunk/PKGBUILD
  avogadro/trunk/sip-4.11.patch

----------------+
 PKGBUILD       |    6 +++---
 sip-4.11.patch |   28 ++++------------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-17 16:37:24 UTC (rev 99786)
+++ PKGBUILD	2010-11-17 16:42:36 UTC (rev 99787)
@@ -9,16 +9,16 @@
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
 license=('GPL2')
-depends=('eigen' 'openbabel' 'pyqt' 'boost-libs' 'glew' 'python-numpy')
+depends=('openbabel' 'pyqt' 'boost-libs' 'glew' 'python-numpy')
 makedepends=('cmake' 'boost')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'sip-4.11.patch')
 md5sums=('0d5c391197101f0aab7be6b59f81e6fd'
-        'e78c3f96d0dc702947f75de1c094f580')
+        '5202204b1381cf298a583aab06d9cca4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/sip-4.11.patch
+  patch -Np0 -i ${srcdir}/sip-4.11.patch
 
   cd ${srcdir}
   mkdir build

Modified: sip-4.11.patch
===================================================================
--- sip-4.11.patch	2010-11-17 16:37:24 UTC (rev 99786)
+++ sip-4.11.patch	2010-11-17 16:42:36 UTC (rev 99787)
@@ -1,31 +1,11 @@
-diff -ur avogadro-1.0.1/cmake/modules/PythonDeps.cmake avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake
---- avogadro-1.0.1/cmake/modules/PythonDeps.cmake	2010-05-02 18:31:22.000000000 +0200
-+++ avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake	2010-09-14 19:11:50.000000000 +0200
-@@ -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.")
-diff -ur avogadro-1.0.1/libavogadro/src/python/sip.cpp avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp
---- avogadro-1.0.1/libavogadro/src/python/sip.cpp	2010-05-02 18:31:22.000000000 +0200
-+++ avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp	2010-09-14 19:13:31.000000000 +0200
+--- libavogadro/src/python/sip.cpp~	2010-05-02 18:31:22.000000000 +0200
++++ libavogadro/src/python/sip.cpp	2010-09-14 19:13:31.000000000 +0200
 @@ -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);
++#if SIP_API_MAJOR_NR >= 8
++    return wrapper->data;
 +#else
      return wrapper->u.cppPtr;
 +#endif