Adapt to swig 1.3.40

diff --git a/VERSION.cmake b/VERSION.cmake
index a7c7f3e..d9df9dd 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,3 +1,3 @@
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "5")
-SET(VERSION_PATCH "3")
+SET(VERSION_PATCH "4")

diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake
index 39f4df1..edbb870 100644 (file)
--- a/libzypp-bindings.spec.cmake
+++ b/libzypp-bindings.spec.cmake
@@ -17,7 +17,8 @@ License:        GPL v2 or later
 Summary:        Bindings for libzypp
 Group:          Development/Sources
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  cmake gcc-c++ python-devel ruby-devel swig
+BuildRequires:  cmake gcc-c++ python-devel ruby-devel
+BuildRequires:  swig >= 1.3.40
 BuildRequires:  libzypp-devel >= 5.8.0
 Source:         %{name}-%{version}.tar.bz2
 

diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes
index 33674bc..7ddf4f5 100644 (file)
--- a/package/libzypp-bindings.changes
+++ b/package/libzypp-bindings.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Apr  8 16:54:59 CEST 2010 - ma@suse.de
+
+- Adapt to swig 1.3.40
+- version 0.5.4
+
+-------------------------------------------------------------------
 Wed Mar 24 12:11:07 CET 2010 - ma@suse.de
 
 - Work around swig not understanding nested class.

diff --git a/swig/Capabilities.i b/swig/Capabilities.i
index 7f3104a..88e5c30 100644 (file)
--- a/swig/Capabilities.i
+++ b/swig/Capabilities.i
@@ -5,27 +5,6 @@
 by_value_iterator(zypp::Capabilities);
 #endif
 
-
-// The ruby std_set.i can only handle one template parameter
-
-// #ifdef SWIGPYTHON
-// %template(CapabilitiesTemp) std::set<Capability, CapOrder>;
-// typedef std::set<Capability,CapOrder> CapabilitiesTemp;
-// #endif
-
-#ifdef SWIGPYTHON
-%extend zypp::Capabilities
-{
-  // just a test
-  const Capability* haha()
-  {
-    Capabilities::const_iterator i = self->begin();
-    const Capability* tmp = &*i;
-    return tmp;
-  }
-}
-#endif
-
 #ifdef SWIGPERL5
 forwarditer(zypp::Capabilities, zypp::Capability);
 #endif

diff --git a/swig/Product.i b/swig/Product.i
index 7922e77..4b8ce3f 100644 (file)
--- a/swig/Product.i
+++ b/swig/Product.i
@@ -1 +1,2 @@
-%include <zypp/Product.h>
\ No newline at end of file
+%ignore zypp::Product::type;
+%include <zypp/Product.h>

diff --git a/swig/ResPool.i b/swig/ResPool.i
index 87e0295..951bfe1 100644 (file)
--- a/swig/ResPool.i
+++ b/swig/ResPool.i
@@ -59,17 +59,17 @@ iter3(ResPool, PoolItem*);
 #ifdef SWIGPYTHON
 %newobject ResPool::const_iterator(PyObject **PYTHON_SELF);
 %extend  ResPool {
-  swig::PySwigIterator* iterator(PyObject **PYTHON_SELF)
+  swig::SwigPyIterator* iterator(PyObject **PYTHON_SELF)
   {
     return swig::make_output_iterator(self->begin(), self->begin(),
                                       self->end(), *PYTHON_SELF);
   }
-  swig::PySwigIterator* kinditerator(PyObject **PYTHON_SELF, const ResObject::Kind & kind_r)
+  swig::SwigPyIterator* kinditerator(PyObject **PYTHON_SELF, const ResObject::Kind & kind_r)
   {
     return swig::make_output_iterator(self->byKindBegin( kind_r ), self->byKindBegin( kind_r ),
                                       self->byKindEnd( kind_r ), *PYTHON_SELF);
   }
-  swig::PySwigIterator* nameiterator(PyObject **PYTHON_SELF, const std::string &name)
+  swig::SwigPyIterator* nameiterator(PyObject **PYTHON_SELF, const std::string &name)
   {
     return swig::make_output_iterator(self->byNameBegin( name ), self->byNameBegin( name ),
                                       self->byNameEnd( name ), *PYTHON_SELF);