From b0ea3a410e4fc25b89ef38dcd767c27083159860 Mon Sep 17 00:00:00 2001
From: hans <hans@pkgsrc.org>
Date: Wed, 29 Feb 2012 16:37:28 +0000
Subject: Add build fix for build with gcc46. From
 https://svn.boost.org/trac/boost/attachment/ticket/4999/fix4999.patch

---
 meta-pkgs/boost/distinfo                             |  3 ++-
 .../patch-libs_signals_src_named_slot_map.cpp        | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 meta-pkgs/boost/patches/patch-libs_signals_src_named_slot_map.cpp

(limited to 'meta-pkgs')

diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index a9e1338cc8d..231a023fc09 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2012/02/29 14:22:24 hans Exp $
+$NetBSD: distinfo,v 1.42 2012/02/29 16:37:28 hans Exp $
 
 SHA1 (boost_1_49_0.tar.bz2) = 26a52840e9d12f829e3008589abf0a925ce88524
 RMD160 (boost_1_49_0.tar.bz2) = 3504c6f27c63ab52182c822d45d020fa30179abc
@@ -12,3 +12,4 @@ SHA1 (patch-ag) = b19bf29b0c08ede6470e0a697f99d4ea796ab987
 SHA1 (patch-ai) = e55ca82da06d23c362f041b0b5f92bbd09663379
 SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a
 SHA1 (patch-ar) = 91981e2edb93666de78c203a6cef3d5011b2b26a
+SHA1 (patch-libs_signals_src_named_slot_map.cpp) = 4e0127e3286e93b6a7cdcd46add582b27dadc0d8
diff --git a/meta-pkgs/boost/patches/patch-libs_signals_src_named_slot_map.cpp b/meta-pkgs/boost/patches/patch-libs_signals_src_named_slot_map.cpp
new file mode 100644
index 00000000000..6ea1d6813df
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-libs_signals_src_named_slot_map.cpp
@@ -0,0 +1,20 @@
+--- libs/signals/src/named_slot_map.cpp.orig	2009-11-08 02:48:37.000000000 +0100
++++ libs/signals/src/named_slot_map.cpp	2011-10-24 16:04:24.749105300 +0200
+@@ -102,7 +102,7 @@ void named_slot_map::disconnect(const st
+       i->first.disconnect();
+       i = next;
+     }
+-    groups.erase(group);
++    groups.erase((const_group_iterator) group);
+   }
+ }
+ 
+@@ -125,7 +125,7 @@ void named_slot_map::remove_disconnected
+     }
+ 
+     // Clear out empty groups
+-    if (empty(g)) groups.erase(g++);
++    if (empty(g)) groups.erase((const_group_iterator) g++);
+     else ++g;
+   }
+ }
-- 
cgit v1.2.3