diff options
author | koobs <koobs@FreeBSD.org> | 2014-07-07 10:37:16 +0800 |
---|---|---|
committer | koobs <koobs@FreeBSD.org> | 2014-07-07 10:37:16 +0800 |
commit | f385ac3a34debe7efbb8fe1545b285e591f07001 (patch) | |
tree | cee748c10d74526d8a2d2c0aa188c31546defa95 /devel | |
parent | 4073b272e3c4bccf98affebb24946f3b262005d1 (diff) | |
download | freebsd-ports-gnome-f385ac3a34debe7efbb8fe1545b285e591f07001.tar.gz freebsd-ports-gnome-f385ac3a34debe7efbb8fe1545b285e591f07001.tar.zst freebsd-ports-gnome-f385ac3a34debe7efbb8fe1545b285e591f07001.zip |
devel/swig20: Update to 2.0.12
- Update to 2.0.12
- Remove C++11 support patches (upstreamed [1])
Changes:
https://github.com/swig/swig/blob/rel-2.0.12/CHANGES.current
[1] https://github.com/swig/swig/issues/73
PR: 186817
Approved by: maintainer
Diffstat (limited to 'devel')
-rw-r--r-- | devel/swig20/Makefile | 3 | ||||
-rw-r--r-- | devel/swig20/distinfo | 4 | ||||
-rw-r--r-- | devel/swig20/files/patch-Lib__std__std_container.i | 53 | ||||
-rw-r--r-- | devel/swig20/files/patch-Lib__std__std_map.i | 20 | ||||
-rw-r--r-- | devel/swig20/files/patch-Lib__std__std_set.i | 19 |
5 files changed, 3 insertions, 96 deletions
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile index 9225a184c646..eb4a0a83b74d 100644 --- a/devel/swig20/Makefile +++ b/devel/swig20/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= swig -PORTVERSION= 2.0.11 -PORTREVISION= 1 +PORTVERSION= 2.0.12 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/devel/swig20/distinfo b/devel/swig20/distinfo index c488a7b430f8..eaa9697c451b 100644 --- a/devel/swig20/distinfo +++ b/devel/swig20/distinfo @@ -1,2 +1,2 @@ -SHA256 (swig-2.0.11.tar.gz) = 63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e -SIZE (swig-2.0.11.tar.gz) = 5310295 +SHA256 (swig-2.0.12.tar.gz) = 65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7 +SIZE (swig-2.0.12.tar.gz) = 5312394 diff --git a/devel/swig20/files/patch-Lib__std__std_container.i b/devel/swig20/files/patch-Lib__std__std_container.i deleted file mode 100644 index 066bd33c0479..000000000000 --- a/devel/swig20/files/patch-Lib__std__std_container.i +++ /dev/null @@ -1,53 +0,0 @@ ---- ./Lib/std/std_container.i.orig 2014-01-12 12:49:23.125903702 +1100 -+++ ./Lib/std/std_container.i 2014-01-12 17:22:07.027709014 +1100 -@@ -46,8 +46,14 @@ - void resize(size_type new_size); - - #ifdef SWIG_EXPORT_ITERATOR_METHODS -- iterator erase(iterator pos); -- iterator erase(iterator first, iterator last); -+// Backport C++11 support -+// Issue ID: https://github.com/swig/swig/issues/73 -+// Commit: https://github.com/swig/swig/commit/92128eef445f75f674894e3f5d4e1fc2a1818957 -+%extend { -+ // %extend wrapper used for differing definitions of these methods introduced in C++11 -+ iterator erase(iterator pos) { return $self->erase(pos); } -+ iterator erase(iterator first, iterator last) { return $self->erase(first, last); } -+} - #endif - - %enddef -@@ -68,8 +74,14 @@ - 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); -+// Backport C++11 support -+// Issue ID: https://github.com/swig/swig/issues/73 -+// Commit: https://github.com/swig/swig/commit/92128eef445f75f674894e3f5d4e1fc2a1818957 -+%extend { -+ // %extend wrapper used for differing definitions of these methods introduced in C++11 -+ iterator insert(iterator pos, const value_type& x) { return $self->insert(pos, x); } -+ void insert(iterator pos, size_type n, const value_type& x) { $self->insert(pos, n, x); } -+} - #endif - - %enddef -@@ -89,8 +101,14 @@ - 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); -+// Backport C++11 support -+// Issue ID: https://github.com/swig/swig/issues/73 -+// Commit: https://github.com/swig/swig/commit/92128eef445f75f674894e3f5d4e1fc2a1818957 -+%extend { -+ // %extend wrapper used for differing definitions of these methods introduced in C++11 -+ iterator insert(iterator pos, value_type x) { return $self->insert(pos, x); } -+ void insert(iterator pos, size_type n, value_type x) { $self->insert(pos, n, x); } -+} - #endif - - %enddef diff --git a/devel/swig20/files/patch-Lib__std__std_map.i b/devel/swig20/files/patch-Lib__std__std_map.i deleted file mode 100644 index 3e6838e98404..000000000000 --- a/devel/swig20/files/patch-Lib__std__std_map.i +++ /dev/null @@ -1,20 +0,0 @@ ---- ./Lib/std/std_map.i.orig 2014-01-12 17:22:34.464286699 +1100 -+++ ./Lib/std/std_map.i 2014-01-12 17:25:54.847499215 +1100 -@@ -12,9 +12,14 @@ - size_type count(const key_type& x) const; - - #ifdef SWIG_EXPORT_ITERATOR_METHODS --// iterator insert(iterator position, const value_type& x); -- void erase(iterator position); -- void erase(iterator first, iterator last); -+// Backport C++11 support -+// Issue ID: https://github.com/swig/swig/issues/73 -+// Commit: https://github.com/swig/swig/commit/92128eef445f75f674894e3f5d4e1fc2a1818957 -+%extend { -+ // %extend wrapper used for differing definitions of these methods introduced in C++11 -+ void erase(iterator position) { $self->erase(position); } -+ void erase(iterator first, iterator last) { $self->erase(first, last); } -+} - - iterator find(const key_type& x); - iterator lower_bound(const key_type& x); diff --git a/devel/swig20/files/patch-Lib__std__std_set.i b/devel/swig20/files/patch-Lib__std__std_set.i deleted file mode 100644 index eba374d70e28..000000000000 --- a/devel/swig20/files/patch-Lib__std__std_set.i +++ /dev/null @@ -1,19 +0,0 @@ ---- ./Lib/std/std_set.i.orig 2014-01-12 17:24:56.140822773 +1100 -+++ ./Lib/std/std_set.i 2014-01-12 17:25:47.509154979 +1100 -@@ -29,8 +29,14 @@ - reverse_iterator rbegin(); - reverse_iterator rend(); - -- void erase(iterator pos); -- void erase(iterator first, iterator last); -+// Backport C++11 support -+// Issue ID: https://github.com/swig/swig/issues/73 -+// Commit: https://github.com/swig/swig/commit/92128eef445f75f674894e3f5d4e1fc2a1818957 -+%extend { -+ // %extend wrapper used for differing definitions of these methods introduced in C++11 -+ void erase(iterator pos) { $self->erase(pos); } -+ void erase(iterator first, iterator last) { $self->erase(first, last); } -+} - - iterator find(const key_type& x); - iterator lower_bound(const key_type& x); |