Hello community,
here is the log from the commit of package swig for openSUSE:Factory
checked in at Wed Sep 21 17:23:14 CEST 2011.
--------
--- swig/swig.changes 2011-05-19 21:51:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/swig/swig.changes 2011-09-20
12:51:08.000000000 +0200
@@ -1,0 +2,25 @@
+Tue Sep 20 09:31:28 UTC 2011 - kkae...@suse.com
+
+- Update to swig 2.0.4
+ (see CHANGES.current for complete list)
+ * [Perl] Patch #3260265 fixing overloading of non-primitive types and
integers in
+ Perl 5.12 and later.
+ * [Ruby] Fix %import where one of the imported files %include one of the STL
include
+ files such as std_vector.i.
+ * [python] Additional fixes for python3.2 support.
+ * [python] Fixed PyGetSetDescr for python3.2.
+ * Bug 2635919: Convenience method to convert std::map to a python dict.
+ * Fixed bug 1163440: vararg typemaps.
+ * [Python] Applied patch #1932484: migrate PyCObject to PyCapsule.
+ * [Python] Merged in the szager-python-builtin branch, adding the -builtin
feature
+ for python. The -builtin option may provide a significant performance gain
+ in python wrappers. For full details and limitations, refer to
Doc/Manual/Python.html.
+ A small test suite designed to demonstrate the performance gain is in
+ Examples/python/performance.
+
+-------------------------------------------------------------------
+Tue Sep 20 08:46:19 UTC 2011 - kkae...@suse.com
+
+- Fix RHEL/Fedora build
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
swig-2.0.3-disable-broken-tests.patch
swig-2.0.3-perl512.patch
swig-2.0.3-perl514.patch
swig-2.0.3-support-python32.patch
swig-2.0.3-use-python-capsule-api.patch
swig-2.0.3.tar.bz2
New:
----
swig-2.0.4-disable-broken-tests.patch
swig-2.0.4-disable-broken-tests_rhel4.patch
swig-2.0.4-ptrdiff_t.patch
swig-2.0.4-support-python32.patch
swig-2.0.4.tar.bz2
swig.rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ swig.spec ++++++
--- /var/tmp/diff_new_pack.nDiAEA/_old 2011-09-21 17:23:08.000000000 +0200
+++ /var/tmp/diff_new_pack.nDiAEA/_new 2011-09-21 17:23:08.000000000 +0200
@@ -26,15 +26,17 @@
%if 0%{?rhel_version} > 0
BuildRequires: -vim
%endif
-%if 0%{?fedora} + 0%{?rhel_version} > 0
+%if 0%{?fedora} + 0%{?rhel_version} + 0%{?centos_version} > 0
+%define docpath %{_docdir}/%{name}-%{version}
BuildRequires: pkgconfig
BuildRequires: ruby-devel
-%if 0%{?rhel_version} == 0
+%if 0%{?rhel_version} + 0%{?centos_version} == 0
BuildRequires: perl-devel
%endif
%endif
%if 0%{?suse_version} > 0
-%if 0%{?suse_version} > 1020
+%define docpath %{_docdir}/%{name}
+%if 0%{?suse_version} > 1010
BuildRequires: fdupes
%endif
# SLE9
@@ -47,23 +49,22 @@
BuildRequires: ruby-devel
%endif
%endif
-Version: 2.0.3
+Version: 2.0.4
Release: 5
License: GPLv3+ and BSD
Summary: Simplified Wrapper and Interface Generator
Url: http://www.swig.org
Group: Development/Languages/C and C++
-Source: swig-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM swig-2.0.3-perl512.patch idoen...@suse.de -- Upstream bug
#3260265
-Patch1: swig-2.0.3-perl512.patch
-# PATCH-FIX-UPSTREAM swig-2.0.3-disable-broken-tests.patch idoen...@suse.de --
Disable broken tests
-Patch2: swig-2.0.3-disable-broken-tests.patch
-# PATCH-FIX-UPSTREAM swig-2.0.3-use-python-capsule-api.patch idoen...@suse.de
-- Use Python capsule api
-Patch3: swig-2.0.3-use-python-capsule-api.patch
-# PATCH-FIX-UPSTREAM swig-2.0.3-support-python32.patch idoen...@suse.de --
Support Python 3.2
-Patch4: swig-2.0.3-support-python32.patch
-# PATCH-FIX-UPSTREAM swig-2.0.3-perl514.patch idoen...@suse.de -- Fix Perl
5.14 test failure
-Patch5: swig-2.0.3-perl514.patch
+Source: %{name}-%{version}.tar.bz2
+Source1: %{name}.rpmlintrc
+# PATCH-FIX-UPSTREAM swig-2.0.4-support-python32.patch idoen...@suse.de --
Support Python 3.2
+Patch1: swig-2.0.4-support-python32.patch
+# swig-2.0.4-ptrdiff_t.patch kkae...@suse.com -- import_stl fails under Python
+Patch2: swig-2.0.4-ptrdiff_t.patch
+# PATCH-FIX-UPSTREAM swig-2.0.4-disable-broken-tests.patch idoen...@suse.de --
Disable broken tests
+Patch3: swig-2.0.4-disable-broken-tests.patch
+# swig-2.0.4-disable-broken-tests_rhel4.patch kkae...@suse.com -- disable
tests failing on RHEL4
+Patch4: swig-2.0.4-disable-broken-tests_rhel4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -119,27 +120,30 @@
%prep
%setup -q
%patch1 -p1
-%patch2
-%patch3 -p1
+%patch2 -p1
+%patch3
+%if 0%{?rhel_version} >= 400 && 0%{?rhel_version} < 500
%patch4 -p1
-%patch5 -p1
+%endif
%build
-./autogen.sh
%configure --disable-ccache
make %{?_smp_mflags}
%check
+# check fails on SLES9
+%if 0%{?sles_version} != 9
# This test is buggy on x86-64
rm -f Examples/test-suite/python/li_boost_shared_ptr_runme.py
make check
+%endif
%install
-%make_install
+make install DESTDIR=%{buildroot}
-install -d %{buildroot}%{_docdir}/%{name}
+install -d %{buildroot}%{docpath}
cp -a TODO ANNOUNCE CHANGES* LICENSE README Doc/{Devel,Manual} \
- %{buildroot}%{_docdir}/%{name}/
+ %{buildroot}%{docpath}
install -d %{buildroot}%{_libdir}/swig
cp -a Examples %{buildroot}%{_libdir}/swig/examples
@@ -149,29 +153,33 @@
-name '*.o' -o -name '*_wrap.c' | xargs rm
# fix perms
-chmod -x %{buildroot}%_docdir/%{name}/Manual/*
+chmod -x %{buildroot}%{docpath}/Manual/*
find %{buildroot}%{_libdir}/swig -name '*.h' -perm +111 | \
xargs --no-run-if-empty chmod -x
-ln -s %{_libdir}/swig/examples %{buildroot}%_docdir/%{name}/Examples
+ln -s %{_libdir}/swig/examples %{buildroot}%{docpath}/Examples
+
+%if 0%{?suse_version} > 1010
+%fdupes $RPM_BUILD_ROOT
+%endif
%clean
rm -rf %{buildroot}
%files
%defattr(644,root,root,755)
-%dir %{_docdir}/%{name}
-%{_docdir}/%{name}/[A-Z][A-Z]*
+%dir %{docpath}
+%{docpath}/[A-Z][A-Z]*
%{_datadir}/swig
%attr(755,root,root) %{_bindir}/swig
%files doc
%defattr(-,root,root)
-%{_docdir}/%{name}/Devel
-%{_docdir}/%{name}/Manual
+%{docpath}/Devel
+%{docpath}/Manual
%files examples
%defattr(-,root,root)
-%{_docdir}/%{name}/Examples
+%{docpath}/Examples
%{_libdir}/swig
%changelog
++++++ swig-2.0.3-disable-broken-tests.patch ->
swig-2.0.4-disable-broken-tests.patch ++++++
--- swig/swig-2.0.3-disable-broken-tests.patch 2011-05-03 13:27:38.000000000
+0200
+++ /mounts/work_src_done/STABLE/swig/swig-2.0.4-disable-broken-tests.patch
2011-09-20 15:43:16.000000000 +0200
@@ -1,18 +1,7 @@
---- Examples/test-suite/python/Makefile.in 2010-07-22 18:59:08.000000000
+0200
-+++ Examples/test-suite/python/Makefile.in 2011-05-03 12:29:40.193936593
+0200
-@@ -53,9 +53,7 @@
- li_std_pair_extra \
- li_std_set \
- li_std_stream \
-- li_std_string_extra \
- li_std_wstream \
-- li_std_wstring \
- primitive_types \
- python_abstractbase \
- python_kwargs \
---- Examples/test-suite/common.mk 2011-03-09 23:31:08.000000000 +0100
-+++ Examples/test-suite/common.mk 2011-05-03 12:31:23.644936552 +0200
-@@ -393,7 +393,6 @@
+diff -wruN -x '*~' ../orig-swig-2.0.4/Examples/test-suite/common.mk
./Examples/test-suite/common.mk
+--- ../orig-swig-2.0.4/Examples/test-suite/common.mk 2011-05-02
23:11:15.000000000 +0200
++++ ./Examples/test-suite/common.mk 2011-09-20 15:35:39.000000000 +0200
+@@ -394,7 +394,6 @@
template_virtual \
template_whitespace \
threads \
++++++ swig-2.0.4-disable-broken-tests_rhel4.patch ++++++
diff -wruN -x '*~' ../orig-swig-2.0.4/Examples/test-suite/common.mk
./Examples/test-suite/common.mk
--- ../orig-swig-2.0.4/Examples/test-suite/common.mk 2011-05-02
23:11:15.000000000 +0200
+++ ./Examples/test-suite/common.mk 2011-09-20 21:20:03.000000000 +0200
@@ -113,7 +113,6 @@
argout \
array_member \
array_typedef_memberin \
- arrayref \
arrays_dimensionless \
arrays_global \
arrays_global_twodim \
@@ -240,7 +239,6 @@
member_template \
minherit \
minherit2 \
- mixed_types \
multiple_inheritance \
name_cxx \
name_warnings \
++++++ swig-2.0.4-ptrdiff_t.patch ++++++
diff -wruN -x '*~' ../orig-swig-2.0.4/Lib/python/pycontainer.swg
./Lib/python/pycontainer.swg
--- ../orig-swig-2.0.4/Lib/python/pycontainer.swg 2011-09-20
12:14:29.000000000 +0200
+++ ./Lib/python/pycontainer.swg 2011-09-20 12:13:22.000000000 +0200
@@ -189,7 +189,7 @@
namespace swig {
inline size_t
- check_index(ptrdiff_t i, size_t size, bool insert = false) {
+ check_index(std::ptrdiff_t i, size_t size, bool insert = false) {
if ( i < 0 ) {
if ((size_t) (-i) <= size)
return (size_t) (i + size);
@@ -203,7 +203,7 @@
}
inline size_t
- slice_index(ptrdiff_t i, size_t size) {
+ slice_index(std::ptrdiff_t i, size_t size) {
if ( i < 0 ) {
if ((size_t) (-i) <= size) {
return (size_t) (i + size);
diff -wruN -x '*~' ../orig-swig-2.0.4/Lib/python/pyiterators.swg
./Lib/python/pyiterators.swg
--- ../orig-swig-2.0.4/Lib/python/pyiterators.swg 2011-04-29
20:25:16.000000000 +0200
+++ ./Lib/python/pyiterators.swg 2011-09-20 12:14:10.000000000 +0200
@@ -41,7 +41,7 @@
}
// Random access iterator methods, but not required in Python
- virtual ptrdiff_t distance(const SwigPyIterator &/*x*/) const
+ virtual std::ptrdiff_t distance(const SwigPyIterator &/*x*/) const
{
throw std::invalid_argument("operation not supported");
}
@@ -78,7 +78,7 @@
return obj;
}
- SwigPyIterator *advance(ptrdiff_t n)
+ SwigPyIterator *advance(std::ptrdiff_t n)
{
return (n > 0) ? incr(n) : decr(-n);
}
@@ -93,27 +93,27 @@
return ! operator==(x);
}
- SwigPyIterator& operator += (ptrdiff_t n)
+ SwigPyIterator& operator += (std::ptrdiff_t n)
{
return *advance(n);
}
- SwigPyIterator& operator -= (ptrdiff_t n)
+ SwigPyIterator& operator -= (std::ptrdiff_t n)
{
return *advance(-n);
}
- SwigPyIterator* operator + (ptrdiff_t n) const
+ SwigPyIterator* operator + (std::ptrdiff_t n) const
{
return copy()->advance(n);
}
- SwigPyIterator* operator - (ptrdiff_t n) const
+ SwigPyIterator* operator - (std::ptrdiff_t n) const
{
return copy()->advance(-n);
}
- ptrdiff_t operator - (const SwigPyIterator& x) const
+ std::ptrdiff_t operator - (const SwigPyIterator& x) const
{
return x.distance(*this);
}
@@ -170,7 +170,7 @@
}
}
- ptrdiff_t distance(const SwigPyIterator &iter) const
+ std::ptrdiff_t distance(const SwigPyIterator &iter) const
{
const self_type *iters = dynamic_cast<const self_type *>(&iter);
if (iters) {
@@ -334,8 +334,8 @@
Mark methods that return new objects
*/
%newobject SwigPyIterator::copy;
- %newobject SwigPyIterator::operator + (ptrdiff_t n) const;
- %newobject SwigPyIterator::operator - (ptrdiff_t n) const;
+ %newobject SwigPyIterator::operator + (std::ptrdiff_t n) const;
+ %newobject SwigPyIterator::operator - (std::ptrdiff_t n) const;
%nodirector SwigPyIterator;
@@ -356,11 +356,11 @@
%catches(swig::stop_iteration) SwigPyIterator::__next__();
%catches(swig::stop_iteration) SwigPyIterator::next();
%catches(swig::stop_iteration) SwigPyIterator::previous();
- %catches(swig::stop_iteration) SwigPyIterator::advance(ptrdiff_t n);
- %catches(swig::stop_iteration) SwigPyIterator::operator += (ptrdiff_t n);
- %catches(swig::stop_iteration) SwigPyIterator::operator -= (ptrdiff_t n);
- %catches(swig::stop_iteration) SwigPyIterator::operator + (ptrdiff_t n)
const;
- %catches(swig::stop_iteration) SwigPyIterator::operator - (ptrdiff_t n)
const;
+ %catches(swig::stop_iteration) SwigPyIterator::advance(std::ptrdiff_t n);
+ %catches(swig::stop_iteration) SwigPyIterator::operator += (std::ptrdiff_t
n);
+ %catches(swig::stop_iteration) SwigPyIterator::operator -= (std::ptrdiff_t
n);
+ %catches(swig::stop_iteration) SwigPyIterator::operator + (std::ptrdiff_t n)
const;
+ %catches(swig::stop_iteration) SwigPyIterator::operator - (std::ptrdiff_t n)
const;
struct SwigPyIterator
{
@@ -380,7 +380,7 @@
virtual SwigPyIterator *decr(size_t n = 1);
// Random access iterator methods, but not required in Python
- virtual ptrdiff_t distance(const SwigPyIterator &x) const;
+ virtual std::ptrdiff_t distance(const SwigPyIterator &x) const;
virtual bool equal (const SwigPyIterator &x) const;
@@ -390,15 +390,15 @@
PyObject *next();
PyObject *__next__();
PyObject *previous();
- SwigPyIterator *advance(ptrdiff_t n);
+ SwigPyIterator *advance(std::ptrdiff_t n);
bool operator == (const SwigPyIterator& x) const;
bool operator != (const SwigPyIterator& x) const;
- SwigPyIterator& operator += (ptrdiff_t n);
- SwigPyIterator& operator -= (ptrdiff_t n);
- SwigPyIterator* operator + (ptrdiff_t n) const;
- SwigPyIterator* operator - (ptrdiff_t n) const;
- ptrdiff_t operator - (const SwigPyIterator& x) const;
+ SwigPyIterator& operator += (std::ptrdiff_t n);
+ SwigPyIterator& operator -= (std::ptrdiff_t n);
+ SwigPyIterator* operator + (std::ptrdiff_t n) const;
+ SwigPyIterator* operator - (std::ptrdiff_t n) const;
+ std::ptrdiff_t operator - (const SwigPyIterator& x) const;
};
}
++++++ swig-2.0.3-support-python32.patch -> swig-2.0.4-support-python32.patch
++++++
--- swig/swig-2.0.3-support-python32.patch 2011-05-04 08:50:30.000000000
+0200
+++ /mounts/work_src_done/STABLE/swig/swig-2.0.4-support-python32.patch
2011-09-20 12:51:07.000000000 +0200
@@ -1,15 +1,15 @@
-diff -up swig-2.0.3/Lib/python/pycontainer.swg.rh666429
swig-2.0.3/Lib/python/pycontainer.swg
---- swig-2.0.3/Lib/python/pycontainer.swg.rh666429 2010-10-19
08:31:31.000000000 +0200
-+++ swig-2.0.3/Lib/python/pycontainer.swg 2011-04-22 15:42:42.185982189
+0200
-@@ -630,6 +630,7 @@ namespace swig
+diff -wruN -x '*~' ../orig-swig-2.0.4/Lib/python/pycontainer.swg
./Lib/python/pycontainer.swg
+--- ../orig-swig-2.0.4/Lib/python/pycontainer.swg 2011-04-10
00:07:22.000000000 +0200
++++ ./Lib/python/pycontainer.swg 2011-09-20 11:27:19.000000000 +0200
+@@ -657,6 +657,7 @@
return x;
}
+#if !NO_PYSLICE
/* typemap for slice object support */
%typemap(in) PySliceObject* {
- $1 = (PySliceObject *) $input;
-@@ -637,6 +638,7 @@ namespace swig
+ if (!PySlice_Check($input)) {
+@@ -667,6 +668,7 @@
%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER) PySliceObject* {
$1 = PySlice_Check($input);
}
@@ -17,7 +17,7 @@
Sequence* __getslice__(difference_type i, difference_type j) throw
(std::out_of_range) {
return swig::getslice(self, i, j);
-@@ -659,7 +661,11 @@ namespace swig
+@@ -689,7 +691,11 @@
/* Overloaded methods for Python 3 compatibility
* (Also useful in Python 2.x)
*/
@@ -29,8 +29,8 @@
Py_ssize_t i, j, step;
if( !PySlice_Check(slice) ) {
SWIG_Error(SWIG_TypeError, "Slice object expected.");
-@@ -668,8 +674,11 @@ namespace swig
- PySlice_GetIndices(slice, self->size(), &i, &j, &step);
+@@ -698,8 +704,11 @@
+ PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), self->size(), &i, &j,
&step);
return swig::getslice(self, i, j);
}
-
@@ -42,8 +42,8 @@
throw (std::out_of_range, std::invalid_argument) {
Py_ssize_t i, j, step;
if( !PySlice_Check(slice) ) {
-@@ -680,7 +689,11 @@ namespace swig
- swig::setslice(self, i, j, v);
+@@ -721,7 +730,11 @@
+ swig::delslice(self, i,j);
}
+#if NO_PYSLICE
@@ -54,10 +54,10 @@
throw (std::out_of_range) {
Py_ssize_t i, j, step;
if( !PySlice_Check(slice) ) {
-diff -up swig-2.0.3/Source/Modules/python.cxx.rh666429
swig-2.0.3/Source/Modules/python.cxx
---- swig-2.0.3/Source/Modules/python.cxx.rh666429 2011-03-14
08:22:08.000000000 +0100
-+++ swig-2.0.3/Source/Modules/python.cxx 2011-04-22 15:43:45.122661120
+0200
-@@ -438,6 +438,7 @@ public:
+diff -wruN -x '*~' ../orig-swig-2.0.4/Source/Modules/python.cxx
./Source/Modules/python.cxx
+--- ../orig-swig-2.0.4/Source/Modules/python.cxx 2011-05-20
07:58:05.000000000 +0200
++++ ./Source/Modules/python.cxx 2011-09-20 11:27:19.000000000 +0200
+@@ -527,6 +527,7 @@
if (py3) {
/* force disable features that not compatible with Python 3.x */
classic = 0;
++++++ swig-2.0.3.tar.bz2 -> swig-2.0.4.tar.bz2 ++++++
++++ 16545 lines of diff (skipped)
++++++ swig.rpmlintrc ++++++
addFilter("devel-file-in-non-devel-package .*/usr/share/swig/.*/.*/.*")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
