From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-107440-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1L8Nun-0002cf-BG
	for garchives@archives.gentoo.org; Thu, 04 Dec 2008 23:47:25 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C9BF9E05A2;
	Thu,  4 Dec 2008 23:47:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 5A6DFE05A2
	for <gentoo-commits@lists.gentoo.org>; Thu,  4 Dec 2008 23:47:24 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id DB9C564B1E
	for <gentoo-commits@lists.gentoo.org>; Thu,  4 Dec 2008 23:47:23 +0000 (UTC)
Received: from loki_val by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <loki_val@gentoo.org>)
	id 1L8Nuk-0000sv-MH
	for gentoo-commits@lists.gentoo.org; Thu, 04 Dec 2008 23:47:23 +0000
From: "Peter Alfredsen (loki_val)" <loki_val@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, loki_val@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/beast/files: beast-0.7.1-gcc43.patch
X-VCS-Repository: gentoo-x86
X-VCS-Files: beast-0.7.1-gcc43.patch
X-VCS-Directories: media-sound/beast/files
X-VCS-Committer: loki_val
X-VCS-Committer-Name: Peter Alfredsen
Content-Type: text/plain; charset=utf8
Message-Id: <E1L8Nuk-0000sv-MH@stork.gentoo.org>
Sender: Peter Alfredsen <loki_val@stork.gentoo.org>
Date: Thu, 04 Dec 2008 23:47:22 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 4ee58c99-33fd-4307-b2d6-8bf12b9c4777
X-Archives-Hash: 53bff19ccaf4cfc7d40d55f05b800bbf

loki_val    08/12/04 23:47:22

  Modified:             beast-0.7.1-gcc43.patch
  Log:
  Update gcc-4.3 patch to allow compilation with oldish compilers. Bug 24=
9665. Thanks to Debian and their inexhaustable supply of ready-made patch=
es.
  (Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64)

Revision  Changes    Path
1.2                  media-sound/beast/files/beast-0.7.1-gcc43.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/=
files/beast-0.7.1-gcc43.patch?rev=3D1.2&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/=
files/beast-0.7.1-gcc43.patch?rev=3D1.2&content-type=3Dtext/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/beast/=
files/beast-0.7.1-gcc43.patch?r1=3D1.1&r2=3D1.2

Index: beast-0.7.1-gcc43.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvsroot/gentoo-x86/media-sound/beast/files/beast-0.7.1-gcc=
43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beast-0.7.1-gcc43.patch	2 Nov 2008 14:59:31 -0000	1.1
+++ beast-0.7.1-gcc43.patch	4 Dec 2008 23:47:22 -0000	1.2
@@ -1,5 +1,7 @@
---- beast-0.7.1.orig/bse/tests/resamplehandle.cc
-+++ beast-0.7.1/bse/tests/resamplehandle.cc
+Index: beast-0.7.1/bse/tests/resamplehandle.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/bse/tests/resamplehandle.cc	2006-11-29 01:05:01.000=
000000 +0000
++++ beast-0.7.1/bse/tests/resamplehandle.cc	2008-03-24 14:10:47.00000000=
0 +0000
 @@ -24,6 +24,7 @@
  #include <bse/gsldatautils.h>
  #include <bse/bseblockutils.hh>
@@ -8,10 +10,10 @@
 =20
  using std::vector;
  using std::max;
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/bse/tests/firhandle.cc
-+++ beast-0.7.1/bse/tests/firhandle.cc
+Index: beast-0.7.1/bse/tests/firhandle.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/bse/tests/firhandle.cc	2006-12-10 16:55:16.00000000=
0 +0000
++++ beast-0.7.1/bse/tests/firhandle.cc	2008-03-24 14:10:47.000000000 +00=
00
 @@ -26,6 +26,7 @@
  #include <math.h>
  #include <complex>
@@ -20,10 +22,10 @@
 =20
  using std::vector;
  using std::min;
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/bse/tests/filtertest.cc
-+++ beast-0.7.1/bse/tests/filtertest.cc
+Index: beast-0.7.1/bse/tests/filtertest.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/bse/tests/filtertest.cc	2006-12-11 00:19:16.0000000=
00 +0000
++++ beast-0.7.1/bse/tests/filtertest.cc	2008-03-24 14:10:47.000000000 +0=
000
 @@ -26,6 +26,7 @@
  #include "topconfig.h"
  #include <math.h>
@@ -32,10 +34,10 @@
 =20
  typedef std::complex<double> Complex;
  using namespace Birnet;
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/bse/bseresamplerimpl.hh
-+++ beast-0.7.1/bse/bseresamplerimpl.hh
+Index: beast-0.7.1/bse/bseresamplerimpl.hh
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/bse/bseresamplerimpl.hh	2006-11-25 16:04:33.0000000=
00 +0000
++++ beast-0.7.1/bse/bseresamplerimpl.hh	2008-03-24 14:10:47.000000000 +0=
000
 @@ -23,6 +23,8 @@
  #include <bse/bseresampler.hh>
  #include <birnet/birnet.hh>
@@ -45,10 +47,10 @@
  #ifdef __SSE__
  #include <xmmintrin.h>
  #endif
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/bse/bseprocidl.cc
-+++ beast-0.7.1/bse/bseprocidl.cc
+Index: beast-0.7.1/bse/bseprocidl.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/bse/bseprocidl.cc	2006-11-25 16:04:31.000000000 +00=
00
++++ beast-0.7.1/bse/bseprocidl.cc	2008-03-24 14:10:47.000000000 +0000
 @@ -24,6 +24,7 @@
  #include <stdio.h>
  #include <string>
@@ -57,81 +59,83 @@
 =20
  std::set<std::string> needTypes;
  std::set<std::string> needClasses;
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/bse/bsecxxplugin.hh
-+++ beast-0.7.1/bse/bsecxxplugin.hh
-@@ -56,7 +56,7 @@
+Index: beast-0.7.1/bse/bsecxxplugin.hh
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/bse/bsecxxplugin.hh	2006-11-27 00:34:30.000000000 +=
0000
++++ beast-0.7.1/bse/bsecxxplugin.hh	2008-03-24 14:32:56.000000000 +0000
+@@ -18,6 +18,14 @@
+ #ifndef __BSE_CXX_PLUGIN_H__
+ #define __BSE_CXX_PLUGIN_H__
+=20
++#define static_template static
++#if defined __GNUC__
++#  if __GNUC__ > 4 || (__GNUC__ =3D=3D 4 && __GNUC_MINOR__ >=3D 3)
++#    undef static_template
++#    define static_template
++#  endif
++#endif
++
+ #include <bse/bsecxxmodule.hh>
+ #include <bse/bseexports.h>
+ #include <bse/bseparam.h>
+@@ -56,7 +64,7 @@
  #define BSE_CXX_REGISTER_STATIC_HOOK(HookType)  BSE_CXX_REGISTER_HOOK_N=
ODE (HookType, 1)
  #define BSE_CXX_REGISTER_HOOK_NODE(HookType, __static)                 =
 \
    template<class E> static BseExportNode* bse_export_node ();          =
 \
 -  template<> static BseExportNode*                                     =
 \
-+  template<> BseExportNode*                                      \
++  template<> static_template BseExportNode*                            =
 \
    bse_export_node<HookType> ()                                         =
 \
    {                                                                    =
 \
      static BseExportNodeHook hnode =3D {                               =
   \
-@@ -91,7 +91,7 @@
+@@ -91,7 +99,7 @@
    (::NameSpace::bse_type_keeper__3##EnumType.get_type ())
  #define BSE_CXX_DECLARE_ENUM(EnumType,EnumName,N,ICode)                =
 \
    template<class E> static BseExportNode* bse_export_node ();          =
 \
 -  template<> static BseExportNode*                                     =
 \
-+  template<> BseExportNode*                                      \
++  template<> static_template BseExportNode*                            =
 \
    bse_export_node<EnumType> ()                                         =
 \
    {                                                                    =
 \
      static BseExportNodeEnum enode =3D {                               =
   \
-@@ -145,7 +145,7 @@
+@@ -145,7 +153,7 @@
    (::NameSpace::bse_type_keeper__1##RecordType.get_type ())
  #define BSE_CXX_DECLARE_RECORD(RecordType)                             =
 \
    template<class E> static BseExportNode* bse_export_node ();          =
 \
 -  template<> static BseExportNode*                                     =
 \
-+  template<> BseExportNode*                                      \
++  template<> static_template BseExportNode*                            =
 \
    bse_export_node<RecordType> ()                                       =
 \
    {                                                                    =
 \
      static BseExportNodeBoxed bnode =3D {                              =
   \
-@@ -181,7 +181,7 @@
+@@ -181,7 +189,7 @@
    (::NameSpace::bse_type_keeper__2##SequenceType.get_type ())
  #define BSE_CXX_DECLARE_SEQUENCE(SequenceType)                         =
         \
    template<class E> static BseExportNode* bse_export_node ();          =
         \
 -  template<> static BseExportNode*                                     =
         \
-+  template<> BseExportNode*                                            =
  \
++  template<> static_template BseExportNode*                            =
         \
    bse_export_node<SequenceType> ()                                     =
         \
    {                                                                    =
         \
      static BseExportNodeBoxed bnode =3D {                              =
           \
-@@ -219,7 +219,7 @@
+@@ -219,7 +227,7 @@
    extern ::Bse::ExportTypeKeeper bse_type_keeper__9##ProcType;
  #define BSE_CXX_REGISTER_PROCEDURE(ProcType)                           =
         \
    template<class C> static ::BseExportNode* bse_export_node ();        =
         \
 -  template<> static ::BseExportNode*                                   =
         \
-+  template<> ::BseExportNode*                                          =
  \
++  template<> static_template ::BseExportNode*                          =
         \
    bse_export_node<Procedure::ProcType> ()                              =
         \
    {                                                                    =
         \
      static ::BseExportNodeProc pnode =3D {                             =
           \
-@@ -259,7 +259,7 @@
+@@ -259,7 +267,7 @@
  #define BSE_CXX_REGISTER_EFFECT(Effect)                                =
         \
    BSE_CXX_DEFINE_STATIC_DATA (Effect##Base);                           =
         \
    template<class C> static ::BseExportNode* bse_export_node ();        =
         \
 -  template<> static ::BseExportNode*                                   =
         \
-+  template<> ::BseExportNode*                                          =
  \
++  template<> static_template ::BseExportNode*                          =
         \
    bse_export_node<Effect> ()                                           =
         \
    {                                                                    =
         \
      static ::BseExportNodeClass cnode =3D {                            =
           \
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/bse/Makefile.in
-+++ beast-0.7.1/bse/Makefile.in
-@@ -422,7 +422,7 @@
- # need -I$(srcdir) for "bseserver.h" in .genprc.c
- # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
- INCLUDES =3D -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. \
--	$(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
-+	$(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS
- EXTRA_HEADERS =3D
- MAINTAINERCLEANFILES =3D $(GENERATED) $(am__append_2)
- #	-Wl,-Bsymbolic
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/bse/bseloader-guspatch.cc
-+++ beast-0.7.1/bse/bseloader-guspatch.cc
+Index: beast-0.7.1/bse/bseloader-guspatch.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/bse/bseloader-guspatch.cc	2006-11-25 16:04:31.00000=
0000 +0000
++++ beast-0.7.1/bse/bseloader-guspatch.cc	2008-03-24 14:10:47.000000000 =
+0000
 @@ -22,6 +22,7 @@
  #include <errno.h>
  #include <vector>
@@ -140,10 +144,10 @@
 =20
  #undef  WITH_GUSPATCH_XINFOS
  static SFI_MSG_TYPE_DEFINE (debug_guspatch, "guspatch", SFI_MSG_DEBUG, =
NULL);
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/bse/bsesequencer.cc
-+++ beast-0.7.1/bse/bsesequencer.cc
+Index: beast-0.7.1/bse/bsesequencer.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/bse/bsesequencer.cc	2006-12-26 21:41:25.000000000 +=
0000
++++ beast-0.7.1/bse/bsesequencer.cc	2008-03-24 14:10:47.000000000 +0000
 @@ -30,6 +30,7 @@
  #include <fcntl.h>
  #include <errno.h>
@@ -152,10 +156,10 @@
 =20
  /* due to a linker/compiler bug on SuSE 9.2, we need to
   * define extern "C" symbols outside of any C++ namespace,
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/sfi/sfidl-cxxbase.cc
-+++ beast-0.7.1/sfi/sfidl-cxxbase.cc
+Index: beast-0.7.1/sfi/sfidl-cxxbase.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/sfi/sfidl-cxxbase.cc	2005-03-07 06:23:55.000000000 =
+0000
++++ beast-0.7.1/sfi/sfidl-cxxbase.cc	2008-03-24 14:10:47.000000000 +0000
 @@ -23,6 +23,7 @@
  #include <unistd.h>
  #include <errno.h>
@@ -164,10 +168,10 @@
  #include "sfidl-namespace.hh"
  #include "sfidl-options.hh"
  #include "sfidl-parser.hh"
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/sfi/sfidl-namespace.cc
-+++ beast-0.7.1/sfi/sfidl-namespace.cc
+Index: beast-0.7.1/sfi/sfidl-namespace.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/sfi/sfidl-namespace.cc	2005-03-07 06:23:55.00000000=
0 +0000
++++ beast-0.7.1/sfi/sfidl-namespace.cc	2008-03-24 14:10:47.000000000 +00=
00
 @@ -21,6 +21,7 @@
  #include <list>
  #include <string>
@@ -176,10 +180,10 @@
  #include "sfidl-namespace.hh"
  #include <sfi/glib-extra.h>
 =20
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/sfi/sfidl-options.cc
-+++ beast-0.7.1/sfi/sfidl-options.cc
+Index: beast-0.7.1/sfi/sfidl-options.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/sfi/sfidl-options.cc	2005-03-07 06:23:55.000000000 =
+0000
++++ beast-0.7.1/sfi/sfidl-options.cc	2008-03-24 14:10:47.000000000 +0000
 @@ -22,6 +22,7 @@
  #include "topconfig.h"
  #include <sfi/glib-extra.h>
@@ -188,10 +192,10 @@
 =20
  /* FIXME: should be filled out and written into topconfig.h by configur=
e */
  #define SFIDL_VERSION        BST_VERSION
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/sfi/sficxx.hh
-+++ beast-0.7.1/sfi/sficxx.hh
+Index: beast-0.7.1/sfi/sficxx.hh
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/sfi/sficxx.hh	2006-10-05 10:21:50.000000000 +0000
++++ beast-0.7.1/sfi/sficxx.hh	2008-03-24 14:10:47.000000000 +0000
 @@ -23,6 +23,7 @@
  #include <sfi/sfi.h>
  #include <string>
@@ -200,10 +204,10 @@
 =20
  namespace Sfi {
 =20
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/sfi/sfidl-factory.cc
-+++ beast-0.7.1/sfi/sfidl-factory.cc
+Index: beast-0.7.1/sfi/sfidl-factory.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/sfi/sfidl-factory.cc	2005-03-07 06:23:55.000000000 =
+0000
++++ beast-0.7.1/sfi/sfidl-factory.cc	2008-03-24 14:10:47.000000000 +0000
 @@ -18,6 +18,7 @@
   */
  #include "sfidl-factory.hh"
@@ -212,10 +216,10 @@
 =20
  using namespace Sfidl;
  using namespace std;
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/sfi/sfidl-parser.cc
-+++ beast-0.7.1/sfi/sfidl-parser.cc
+Index: beast-0.7.1/sfi/sfidl-parser.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/sfi/sfidl-parser.cc	2006-11-14 22:51:36.000000000 +=
0000
++++ beast-0.7.1/sfi/sfidl-parser.cc	2008-03-24 14:10:47.000000000 +0000
 @@ -27,6 +27,9 @@
  #include <iostream>
  #include <set>
@@ -226,10 +230,10 @@
 =20
  const std::string
  Sfidl::string_from_int (long long int lli)
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/tests/bse/filtertest.cc
-+++ beast-0.7.1/tests/bse/filtertest.cc
+Index: beast-0.7.1/tests/bse/filtertest.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/tests/bse/filtertest.cc	2006-12-04 00:01:08.0000000=
00 +0000
++++ beast-0.7.1/tests/bse/filtertest.cc	2008-03-24 14:10:47.000000000 +0=
000
 @@ -28,6 +28,7 @@
  #include <birnet/birnettests.h>
  #include "topconfig.h"
@@ -238,10 +242,10 @@
 =20
  using std::string;
  using std::vector;
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/tools/bsewavetool.cc
-+++ beast-0.7.1/tools/bsewavetool.cc
+Index: beast-0.7.1/tools/bsewavetool.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/tools/bsewavetool.cc	2006-12-11 19:00:07.000000000 =
+0000
++++ beast-0.7.1/tools/bsewavetool.cc	2008-03-24 14:10:47.000000000 +0000
 @@ -34,6 +34,7 @@
  #include <fcntl.h>
  #include <vector>
@@ -250,10 +254,10 @@
 =20
 =20
  namespace BseWaveTool {
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/tools/bsefcompare.cc
-+++ beast-0.7.1/tools/bsefcompare.cc
+Index: beast-0.7.1/tools/bsefcompare.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/tools/bsefcompare.cc	2006-12-04 00:01:06.000000000 =
+0000
++++ beast-0.7.1/tools/bsefcompare.cc	2008-03-24 14:10:47.000000000 +0000
 @@ -28,6 +28,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -262,10 +266,10 @@
 =20
  #include "topconfig.h"
 =20
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/tools/bsefextract.cc
-+++ beast-0.7.1/tools/bsefextract.cc
+Index: beast-0.7.1/tools/bsefextract.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/tools/bsefextract.cc	2006-11-05 02:21:30.000000000 =
+0000
++++ beast-0.7.1/tools/bsefextract.cc	2008-03-24 14:10:47.000000000 +0000
 @@ -27,6 +27,8 @@
  #include <errno.h>
  #include <assert.h>
@@ -275,10 +279,10 @@
 =20
  #include <map>
  #include <string>
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/birnet/tests/sorting.cc
-+++ beast-0.7.1/birnet/tests/sorting.cc
+Index: beast-0.7.1/birnet/tests/sorting.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/birnet/tests/sorting.cc	2006-10-21 15:13:41.0000000=
00 +0000
++++ beast-0.7.1/birnet/tests/sorting.cc	2008-03-24 14:10:47.000000000 +0=
000
 @@ -19,6 +19,8 @@
  // #define TEST_VERBOSE
  #include <birnet/birnettests.h>
@@ -288,10 +292,10 @@
 =20
  namespace {
  using namespace Birnet;
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/birnet/tests/strings.cc
-+++ beast-0.7.1/birnet/tests/strings.cc
+Index: beast-0.7.1/birnet/tests/strings.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/birnet/tests/strings.cc	2006-12-18 17:58:23.0000000=
00 +0000
++++ beast-0.7.1/birnet/tests/strings.cc	2008-03-24 14:10:47.000000000 +0=
000
 @@ -18,6 +18,7 @@
   */
  //#define TEST_VERBOSE
@@ -300,10 +304,10 @@
  using namespace Birnet;
 =20
  namespace {
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/birnet/tests/threads.cc
-+++ beast-0.7.1/birnet/tests/threads.cc
+Index: beast-0.7.1/birnet/tests/threads.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/birnet/tests/threads.cc	2006-10-21 15:12:11.0000000=
00 +0000
++++ beast-0.7.1/birnet/tests/threads.cc	2008-03-24 14:10:47.000000000 +0=
000
 @@ -18,6 +18,7 @@
   */
  //#define TEST_VERBOSE
@@ -312,10 +316,10 @@
 =20
  namespace {
  using namespace Birnet;
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/birnet/birnetutils.cc
-+++ beast-0.7.1/birnet/birnetutils.cc
+Index: beast-0.7.1/birnet/birnetutils.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/birnet/birnetutils.cc	2006-12-18 17:58:24.000000000=
 +0000
++++ beast-0.7.1/birnet/birnetutils.cc	2008-03-24 14:10:47.000000000 +000=
0
 @@ -31,6 +31,7 @@
  #include <algorithm>
  #include <cxxabi.h>
@@ -324,10 +328,10 @@
 =20
  #ifndef _
  #define _(s)    s
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/birnet/birnetsignal.hh
-+++ beast-0.7.1/birnet/birnetsignal.hh
+Index: beast-0.7.1/birnet/birnetsignal.hh
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/birnet/birnetsignal.hh	2006-10-06 21:57:38.00000000=
0 +0000
++++ beast-0.7.1/birnet/birnetsignal.hh	2008-03-24 14:10:47.000000000 +00=
00
 @@ -435,7 +435,7 @@
  /* --- predefined signals --- */
  template<class Emitter>
@@ -346,10 +350,10 @@
    explicit SignalVoid (Emitter &emitter)                               =
  : Signal0 (emitter) {}
    explicit SignalVoid (Emitter &emitter, void (Emitter::*method) (void)=
) : Signal0 (emitter, method) {}
    BIRNET_PRIVATE_CLASS_COPY (SignalVoid);
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/birnet/birnetmsg.cc
-+++ beast-0.7.1/birnet/birnetmsg.cc
+Index: beast-0.7.1/birnet/birnetmsg.cc
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/birnet/birnetmsg.cc	2006-11-21 01:31:27.000000000 +=
0000
++++ beast-0.7.1/birnet/birnetmsg.cc	2008-03-24 14:10:47.000000000 +0000
 @@ -21,6 +21,7 @@
  #include "birnetthread.hh"
  #include <syslog.h>
@@ -358,10 +362,10 @@
 =20
  #ifndef _ // FIXME
  #define _(x)    (x)
-only in patch2:
-unchanged:
---- beast-0.7.1.orig/birnet/birnetsignaltemplate.hh
-+++ beast-0.7.1/birnet/birnetsignaltemplate.hh
+Index: beast-0.7.1/birnet/birnetsignaltemplate.hh
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- beast-0.7.1.orig/birnet/birnetsignaltemplate.hh	2006-10-03 23:12:43.=
000000000 +0000
++++ beast-0.7.1/birnet/birnetsignaltemplate.hh	2008-03-24 14:10:47.00000=
0000 +0000
 @@ -165,7 +165,7 @@
  template<class Emitter, typename R0, typename A1, typename A2, typename=
 A3, class Collector>
  struct Signal<Emitter, R0 (A1, A2, A3), Collector> : Signal3<Emitter, R=
0, A1, A2, A3, Collector>