src/patches/libsigc++-gcc43.patch

   1 diff -urN libsigc++-2.0-2.0.17.old/sigc++/signal.h libsigc++-2.0-2.0.17/sigc++/signal.h
   2 --- libsigc++-2.0-2.0.17.old/sigc++/signal.h    2005-12-20 08:35:21.000000000 +0000
   3 +++ libsigc++-2.0-2.0.17/sigc++/signal.h        2008-02-22 00:22:44.000000000 +0000
   4 @@ -1661,7 +1661,7 @@
   5    typedef internal::signal_emit0<T_return, T_accumulator> emitter_type;
   6    typedef typename emitter_type::result_type         result_type;
   7    typedef slot<T_return>    slot_type;
   8 -  typedef slot_list<slot_type>                       slot_list_type;
   9 +  typedef sigc::slot_list<slot_type>                       slot_list_type;
  10    typedef typename slot_list_type::iterator               iterator;
  11    typedef typename slot_list_type::const_iterator         const_iterator;
  12    typedef typename slot_list_type::reverse_iterator       reverse_iterator;
  13 @@ -1770,7 +1770,7 @@
  14    typedef internal::signal_emit1<T_return, T_arg1, T_accumulator> emitter_type;
  15    typedef typename emitter_type::result_type         result_type;
  16    typedef slot<T_return, T_arg1>    slot_type;
  17 -  typedef slot_list<slot_type>                       slot_list_type;
  18 +  typedef sigc::slot_list<slot_type>                       slot_list_type;
  19    typedef typename slot_list_type::iterator               iterator;
  20    typedef typename slot_list_type::const_iterator         const_iterator;
  21    typedef typename slot_list_type::reverse_iterator       reverse_iterator;
  22 @@ -1881,7 +1881,7 @@
  23    typedef internal::signal_emit2<T_return, T_arg1,T_arg2, T_accumulator> emitter_type;
  24    typedef typename emitter_type::result_type         result_type;
  25    typedef slot<T_return, T_arg1,T_arg2>    slot_type;
  26 -  typedef slot_list<slot_type>                       slot_list_type;
  27 +  typedef sigc::slot_list<slot_type>                       slot_list_type;
  28    typedef typename slot_list_type::iterator               iterator;
  29    typedef typename slot_list_type::const_iterator         const_iterator;
  30    typedef typename slot_list_type::reverse_iterator       reverse_iterator;
  31 @@ -1994,7 +1994,7 @@
  32    typedef internal::signal_emit3<T_return, T_arg1,T_arg2,T_arg3, T_accumulator> emitter_type;
  33    typedef typename emitter_type::result_type         result_type;
  34    typedef slot<T_return, T_arg1,T_arg2,T_arg3>    slot_type;
  35 -  typedef slot_list<slot_type>                       slot_list_type;
  36 +  typedef sigc::slot_list<slot_type>                       slot_list_type;
  37    typedef typename slot_list_type::iterator               iterator;
  38    typedef typename slot_list_type::const_iterator         const_iterator;
  39    typedef typename slot_list_type::reverse_iterator       reverse_iterator;
  40 @@ -2109,7 +2109,7 @@
  41    typedef internal::signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, T_accumulator> emitter_type;
  42    typedef typename emitter_type::result_type         result_type;
  43    typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4>    slot_type;
  44 -  typedef slot_list<slot_type>                       slot_list_type;
  45 +  typedef sigc::slot_list<slot_type>                       slot_list_type;
  46    typedef typename slot_list_type::iterator               iterator;
  47    typedef typename slot_list_type::const_iterator         const_iterator;
  48    typedef typename slot_list_type::reverse_iterator       reverse_iterator;
  49 @@ -2226,7 +2226,7 @@
  50    typedef internal::signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, T_accumulator> emitter_type;
  51    typedef typename emitter_type::result_type         result_type;
  52    typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>    slot_type;
  53 -  typedef slot_list<slot_type>                       slot_list_type;
  54 +  typedef sigc::slot_list<slot_type>                       slot_list_type;
  55    typedef typename slot_list_type::iterator               iterator;
  56    typedef typename slot_list_type::const_iterator         const_iterator;
  57    typedef typename slot_list_type::reverse_iterator       reverse_iterator;
  58 @@ -2345,7 +2345,7 @@
  59    typedef internal::signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, T_accumulator> emitter_type;
  60    typedef typename emitter_type::result_type         result_type;
  61    typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>    slot_type;
  62 -  typedef slot_list<slot_type>                       slot_list_type;
  63 +  typedef sigc::slot_list<slot_type>                       slot_list_type;
  64    typedef typename slot_list_type::iterator               iterator;
  65    typedef typename slot_list_type::const_iterator         const_iterator;
  66    typedef typename slot_list_type::reverse_iterator       reverse_iterator;
  67 @@ -2466,7 +2466,7 @@
  68    typedef internal::signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, T_accumulator> emitter_type;
  69    typedef typename emitter_type::result_type         result_type;
  70    typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>    slot_type;
  71 -  typedef slot_list<slot_type>                       slot_list_type;
  72 +  typedef sigc::slot_list<slot_type>                       slot_list_type;
  73    typedef typename slot_list_type::iterator               iterator;
  74    typedef typename slot_list_type::const_iterator         const_iterator;
  75    typedef typename slot_list_type::reverse_iterator       reverse_iterator;
  76 diff -urN libsigc++-2.0-2.0.17.old/tests/test_copy_invalid_slot.cc libsigc++-2.0-2.0.17/tests/test_copy_invalid_slot.cc
  77 --- libsigc++-2.0-2.0.17.old/tests/test_copy_invalid_slot.cc    2005-05-01 02:00:47.000000000 +0000
  78 +++ libsigc++-2.0-2.0.17/tests/test_copy_invalid_slot.cc        2008-02-22 00:24:08.000000000 +0000
  79 @@ -1,4 +1,6 @@
  80  #include <iostream>
  81 +#include <cstdlib>
  82 +#include <cstring>
  83  #include <sigc++/sigc++.h>
  84
  85  void Foo(sigc::trackable &t) {}