diff options
| author | joerg <joerg@pkgsrc.org> | 2013-05-11 21:30:09 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-05-11 21:30:09 +0000 |
| commit | 3323192c82ac2cd5f704c63512e3aef7286987ce (patch) | |
| tree | c398d2216584de157d9017e158d481b947a96b42 /devel | |
| parent | 843f9c72d32b29f4940bee5f0a8dde9231d9d44f (diff) | |
| download | pkgsrc-3323192c82ac2cd5f704c63512e3aef7286987ce.tar.gz | |
Fix iterator types for STL containers to use const_iterator as defined.
This fixes the build of GNU radio with libc++.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/swig/Makefile | 4 | ||||
| -rw-r--r-- | devel/swig/distinfo | 3 | ||||
| -rw-r--r-- | devel/swig/patches/patch-Lib_std_std__container.i | 37 |
3 files changed, 41 insertions, 3 deletions
diff --git a/devel/swig/Makefile b/devel/swig/Makefile index 30a96b81c46..ebbd338e74d 100644 --- a/devel/swig/Makefile +++ b/devel/swig/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2012/11/03 23:44:44 gdt Exp $ +# $NetBSD: Makefile,v 1.33 2013/05/11 21:30:09 joerg Exp $ DISTNAME= swig-1.3.36 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=swig/} diff --git a/devel/swig/distinfo b/devel/swig/distinfo index f827731afe0..d0d4986986e 100644 --- a/devel/swig/distinfo +++ b/devel/swig/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.11 2010/04/12 13:57:59 taca Exp $ +$NetBSD: distinfo,v 1.12 2013/05/11 21:30:09 joerg Exp $ SHA1 (swig-1.3.36.tar.gz) = eed715da3200f45cfe688a64ab6630eadf118ae4 RMD160 (swig-1.3.36.tar.gz) = bd57f6837de1dc3aebefd9ad23a52235deefcd33 Size (swig-1.3.36.tar.gz) = 4604982 bytes +SHA1 (patch-Lib_std_std__container.i) = e4bb2b51b88651adfcec63318d8a228e7f3f8971 SHA1 (patch-aa) = 66374c0708cfda23810bd5744e0c4bb0abc605f5 SHA1 (patch-ab) = c690480ad10256c7198fc19699557e0b3f46b087 SHA1 (patch-ad) = f5787be95bb896cdba0f42587c4f586caed9b7a2 diff --git a/devel/swig/patches/patch-Lib_std_std__container.i b/devel/swig/patches/patch-Lib_std_std__container.i new file mode 100644 index 00000000000..a02dfe967cb --- /dev/null +++ b/devel/swig/patches/patch-Lib_std_std__container.i @@ -0,0 +1,37 @@ +$NetBSD: patch-Lib_std_std__container.i,v 1.1 2013/05/11 21:30:09 joerg Exp $ + +--- Lib/std/std_container.i.orig 2008-03-26 20:25:56.000000000 +0000 ++++ Lib/std/std_container.i +@@ -46,8 +46,8 @@ + void resize(size_type new_size); + + #ifdef SWIG_EXPORT_ITERATOR_METHODS +- iterator erase(iterator pos); +- iterator erase(iterator first, iterator last); ++ iterator erase(const_iterator pos); ++ iterator erase(const_iterator first, const_iterator last); + #endif + + %enddef +@@ -68,8 +68,8 @@ + void resize(size_type new_size, const value_type& x); + + #ifdef SWIG_EXPORT_ITERATOR_METHODS +- iterator insert(iterator pos, const value_type& x); +- void insert(iterator pos, size_type n, const value_type& x); ++ iterator insert(const_iterator pos, const value_type& x); ++ void insert(const_iterator pos, size_type n, const value_type& x); + #endif + + %enddef +@@ -89,8 +89,8 @@ + void resize(size_type new_size, value_type x); + + #ifdef SWIG_EXPORT_ITERATOR_METHODS +- iterator insert(iterator pos, value_type x); +- void insert(iterator pos, size_type n, value_type x); ++ iterator insert(const_iterator pos, value_type x); ++ void insert(const_iterator pos, size_type n, value_type x); + #endif + + %enddef |