webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

libsigc++: Update to 2.0.18.

Browse Source 
Fix build with GCC 4.4.
This commit is contained in:
Michael Tremer
2012-08-20 15:22:02 +02:00
parent 156ef876ca
commit 7bc516ec7f
2 changed files with 88 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lfs/libsigc++
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.0.17
VER = 2.0.18
THISAPP = libsigc++-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = fde0ee69e3125e982746d9fe005763e1
$(DL_FILE)_MD5 = ddebf5aafc8525d10366a8724abc9f28
install : $(TARGET)
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsigc++-gcc43.patch
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install

85
src/patches/libsigc++-gcc43.patch Normal file
View File

@@ -0,0 +1,85 @@
diff -urN libsigc++-2.0-2.0.17.old/sigc++/signal.h libsigc++-2.0-2.0.17/sigc++/signal.h
--- libsigc++-2.0-2.0.17.old/sigc++/signal.h 2005-12-20 08:35:21.000000000 +0000
+++ libsigc++-2.0-2.0.17/sigc++/signal.h 2008-02-22 00:22:44.000000000 +0000
@@ -1661,7 +1661,7 @@
typedef internal::signal_emit0<T_return, T_accumulator> emitter_type;
typedef typename emitter_type::result_type result_type;
typedef slot<T_return> slot_type;
- typedef slot_list<slot_type> slot_list_type;
+ typedef sigc::slot_list<slot_type> slot_list_type;
typedef typename slot_list_type::iterator iterator;
typedef typename slot_list_type::const_iterator const_iterator;
typedef typename slot_list_type::reverse_iterator reverse_iterator;
@@ -1770,7 +1770,7 @@
typedef internal::signal_emit1<T_return, T_arg1, T_accumulator> emitter_type;
typedef typename emitter_type::result_type result_type;
typedef slot<T_return, T_arg1> slot_type;
- typedef slot_list<slot_type> slot_list_type;
+ typedef sigc::slot_list<slot_type> slot_list_type;
typedef typename slot_list_type::iterator iterator;
typedef typename slot_list_type::const_iterator const_iterator;
typedef typename slot_list_type::reverse_iterator reverse_iterator;
@@ -1881,7 +1881,7 @@
typedef internal::signal_emit2<T_return, T_arg1,T_arg2, T_accumulator> emitter_type;
typedef typename emitter_type::result_type result_type;
typedef slot<T_return, T_arg1,T_arg2> slot_type;
- typedef slot_list<slot_type> slot_list_type;
+ typedef sigc::slot_list<slot_type> slot_list_type;
typedef typename slot_list_type::iterator iterator;
typedef typename slot_list_type::const_iterator const_iterator;
typedef typename slot_list_type::reverse_iterator reverse_iterator;
@@ -1994,7 +1994,7 @@
typedef internal::signal_emit3<T_return, T_arg1,T_arg2,T_arg3, T_accumulator> emitter_type;
typedef typename emitter_type::result_type result_type;
typedef slot<T_return, T_arg1,T_arg2,T_arg3> slot_type;
- typedef slot_list<slot_type> slot_list_type;
+ typedef sigc::slot_list<slot_type> slot_list_type;
typedef typename slot_list_type::iterator iterator;
typedef typename slot_list_type::const_iterator const_iterator;
typedef typename slot_list_type::reverse_iterator reverse_iterator;
@@ -2109,7 +2109,7 @@
typedef internal::signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, T_accumulator> emitter_type;
typedef typename emitter_type::result_type result_type;
typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> slot_type;
- typedef slot_list<slot_type> slot_list_type;
+ typedef sigc::slot_list<slot_type> slot_list_type;
typedef typename slot_list_type::iterator iterator;
typedef typename slot_list_type::const_iterator const_iterator;
typedef typename slot_list_type::reverse_iterator reverse_iterator;
@@ -2226,7 +2226,7 @@
typedef internal::signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, T_accumulator> emitter_type;
typedef typename emitter_type::result_type result_type;
typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> slot_type;
- typedef slot_list<slot_type> slot_list_type;
+ typedef sigc::slot_list<slot_type> slot_list_type;
typedef typename slot_list_type::iterator iterator;
typedef typename slot_list_type::const_iterator const_iterator;
typedef typename slot_list_type::reverse_iterator reverse_iterator;
@@ -2345,7 +2345,7 @@
typedef internal::signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, T_accumulator> emitter_type;
typedef typename emitter_type::result_type result_type;
typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> slot_type;
- typedef slot_list<slot_type> slot_list_type;
+ typedef sigc::slot_list<slot_type> slot_list_type;
typedef typename slot_list_type::iterator iterator;
typedef typename slot_list_type::const_iterator const_iterator;
typedef typename slot_list_type::reverse_iterator reverse_iterator;
@@ -2466,7 +2466,7 @@
typedef internal::signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, T_accumulator> emitter_type;
typedef typename emitter_type::result_type result_type;
typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> slot_type;
- typedef slot_list<slot_type> slot_list_type;
+ typedef sigc::slot_list<slot_type> slot_list_type;
typedef typename slot_list_type::iterator iterator;
typedef typename slot_list_type::const_iterator const_iterator;
typedef typename slot_list_type::reverse_iterator reverse_iterator;
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
--- libsigc++-2.0-2.0.17.old/tests/test_copy_invalid_slot.cc 2005-05-01 02:00:47.000000000 +0000
+++ libsigc++-2.0-2.0.17/tests/test_copy_invalid_slot.cc 2008-02-22 00:24:08.000000000 +0000
@@ -1,4 +1,6 @@
#include <iostream>
+#include <cstdlib>
+#include <cstring>
#include <sigc++/sigc++.h>
void Foo(sigc::trackable &t) {}