From fe249cc867cf045266d094913a16108df40303d02b77a4446945c342835d06a8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 12 Oct 2007 22:11:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libsigc++2?expand=0&rev=4 --- libsigc++2-gcc43.patch | 92 ++++++++++++++++++++++++++++++++++++++++++ libsigc++2.changes | 5 +++ libsigc++2.spec | 7 +++- 3 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 libsigc++2-gcc43.patch diff --git a/libsigc++2-gcc43.patch b/libsigc++2-gcc43.patch new file mode 100644 index 0000000..340a56a --- /dev/null +++ b/libsigc++2-gcc43.patch @@ -0,0 +1,92 @@ +Index: libsigc++-2.0.18/sigc++/signal.h +=================================================================== +--- libsigc++-2.0.18.orig/sigc++/signal.h 2007-08-13 13:18:01.000000000 +0200 ++++ libsigc++-2.0.18/sigc++/signal.h 2007-10-12 11:28:34.000000000 +0200 +@@ -1660,8 +1660,8 @@ class signal0 + public: + typedef internal::signal_emit0 emitter_type; + typedef typename emitter_type::result_type result_type; +- typedef slot slot_type; +- typedef slot_list slot_list_type; ++ typedef sigc::slot slot_type; ++ typedef sigc::slot_list 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; +@@ -1769,8 +1769,8 @@ class signal1 + public: + typedef internal::signal_emit1 emitter_type; + typedef typename emitter_type::result_type result_type; +- typedef slot slot_type; +- typedef slot_list slot_list_type; ++ typedef sigc::slot slot_type; ++ typedef sigc::slot_list 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; +@@ -1880,8 +1880,8 @@ class signal2 + public: + typedef internal::signal_emit2 emitter_type; + typedef typename emitter_type::result_type result_type; +- typedef slot slot_type; +- typedef slot_list slot_list_type; ++ typedef sigc::slot slot_type; ++ typedef sigc::slot_list 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; +@@ -1993,8 +1993,8 @@ class signal3 + public: + typedef internal::signal_emit3 emitter_type; + typedef typename emitter_type::result_type result_type; +- typedef slot slot_type; +- typedef slot_list slot_list_type; ++ typedef sigc::slot slot_type; ++ typedef sigc::slot_list 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; +@@ -2108,8 +2108,8 @@ class signal4 + public: + typedef internal::signal_emit4 emitter_type; + typedef typename emitter_type::result_type result_type; +- typedef slot slot_type; +- typedef slot_list slot_list_type; ++ typedef sigc::slot slot_type; ++ typedef sigc::slot_list 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; +@@ -2225,8 +2225,8 @@ class signal5 + public: + typedef internal::signal_emit5 emitter_type; + typedef typename emitter_type::result_type result_type; +- typedef slot slot_type; +- typedef slot_list slot_list_type; ++ typedef sigc::slot slot_type; ++ typedef sigc::slot_list 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; +@@ -2344,8 +2344,8 @@ class signal6 + public: + typedef internal::signal_emit6 emitter_type; + typedef typename emitter_type::result_type result_type; +- typedef slot slot_type; +- typedef slot_list slot_list_type; ++ typedef sigc::slot slot_type; ++ typedef sigc::slot_list 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; +@@ -2465,8 +2465,8 @@ class signal7 + public: + typedef internal::signal_emit7 emitter_type; + typedef typename emitter_type::result_type result_type; +- typedef slot slot_type; +- typedef slot_list slot_list_type; ++ typedef sigc::slot slot_type; ++ typedef sigc::slot_list 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 --git a/libsigc++2.changes b/libsigc++2.changes index ea142b1..e04b871 100644 --- a/libsigc++2.changes +++ b/libsigc++2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 12 11:37:19 CEST 2007 - rguenther@suse.de + +- Add patch to fix C++ problems, enables building with GCC 4.3. + ------------------------------------------------------------------- Wed Sep 19 16:32:29 CEST 2007 - sbrabec@suse.cz diff --git a/libsigc++2.spec b/libsigc++2.spec index 07c44b8..6a9462e 100644 --- a/libsigc++2.spec +++ b/libsigc++2.spec @@ -14,12 +14,13 @@ Name: libsigc++2 %define _name libsigc++ BuildRequires: gcc-c++ Version: 2.0.18 -Release: 1 +Release: 5 Group: Development/Libraries/C and C++ License: LGPL v2 or later Summary: Typesafe Signal Framework for C++ Url: http://libsigc.sourceforge.net/ Source: %{_name}-%{version}.tar.bz2 +Patch: libsigc++2-gcc43.patch AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -72,6 +73,7 @@ Authors: %prep %setup -q -n %{_name}-%{version} +%patch -p1 %build # FIXME: Cannot autoreconf, bad templates: @@ -118,8 +120,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %{_libdir}/sigc++-2.0 %{_includedir}/* - %changelog +* Fri Oct 12 2007 - rguenther@suse.de +- Add patch to fix C++ problems, enables building with GCC 4.3. * Wed Sep 19 2007 - sbrabec@suse.cz - Updated to version 2.0.18: * Fix a build error in the examples, on Sun CC.