[beast/devel: 25/26] BSE: use 'patch -f' for workarounds to cope with different Rapicorn versions

[Tim Janik <timj src gnome org>]

commit 460ce9042dbcbc7d26b7c6bc9aaea9aa35924f14
Author: Tim Janik <timj gnu org>
Date:   Sun Oct 12 16:22:22 2014 +0200

    BSE: use 'patch -f' for workarounds to cope with different Rapicorn versions

 bse/Makefile.am                |    2 +-
 bse/patch-bseserverapi.cc.diff |   30 +++++++++---------------------
 2 files changed, 10 insertions(+), 22 deletions(-)
---
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 013a19f..b59e661 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -312,7 +312,7 @@ bseserverapi.cc: $(srcdir)/bseapi.idl $(AUXTYPES_PY)
        $(AM_V_GEN)
        $(Q) ${AIDACC} -x CxxStub -x $(AUXTYPES_PY) -G servercc -G cppguard=__BST_BSESERVERAPI_CC_ \
                -G iface-base=Bse::ImplicitBase $< -o xgen-$(@F)
-       $(Q) patch < patch-bseserverapi.cc.diff
+       $(Q) patch -f < patch-bseserverapi.cc.diff || true
        $(Q) mv xgen-$(@F) $@
 GENERATED += bseserverapi.cc
 
diff --git a/bse/patch-bseserverapi.cc.diff b/bse/patch-bseserverapi.cc.diff
index cbd420a..af65c10 100644
--- a/bse/patch-bseserverapi.cc.diff
+++ b/bse/patch-bseserverapi.cc.diff
@@ -1,35 +1,23 @@
 --- xgen-bseserverapi.cc
 +++ xgen-bseserverapi.cc
-@@ -43,14 +43,14 @@ interface_to_remote_handle ($AIDA_iface_base$ *ibase)
-   SMH target;
-   struct CastingServerConnection : ServerConnection { using ServerConnection::cast_interface_handle; };
-   CastingServerConnection *cs_con = (CastingServerConnection*) server_connection;
+@@ -71,1 +71,1 @@ interface_to_remote_handle ($AIDA_iface_base$ *ibase)
 -  cs_con->cast_interface_handle (target, Rapicorn::BaseObject::shared_ptr (ibase));
 +  cs_con->cast_interface_handle (target, ibase ? ibase->shared_from_this() : ImplicitBaseP());
-   return target;
- }
- 
- template<class Target> static inline void
- field_buffer_add_interface (Rapicorn::Aida::FieldBuffer &fb, Target *instane)
- {
+@@ -78,1 +78,1 @@ field_buffer_add_interface (Rapicorn::Aida::FieldBuffer
 -  server_connection->add_interface (fb, Rapicorn::BaseObject::shared_ptr (instane));
 +  server_connection->add_interface (fb, instane ? instane->shared_from_this() : ImplicitBaseP());
- }
- 
- template<class Target> static inline Target*
-@@ -113,6 +113,7 @@
- 
- namespace Rapicorn { namespace Aida {
- // namespace Rapicorn::Aida needed for argument dependent lookups of the operators
+@@ -136,12 +136,14 @@
 +#if 0
  static void operator<<= (Rapicorn::Aida::FieldBuffer &fb, const Rapicorn::Aida::Any &v);
  static void operator>>= (Rapicorn::Aida::FieldReader &fr, Rapicorn::Aida::Any &v);
  static void
-@@ -125,6 +126,7 @@
+ operator<<= (Rapicorn::Aida::FieldBuffer &fb, const Rapicorn::Any &v)
+ {
+   fb.add_any (v, *__AIDA_Local__::server_connection);
+ }
+ static void
+ operator>>= (Rapicorn::Aida::FieldReader &fr, Rapicorn::Any &v)
  {
    v = fr.pop_any (*__AIDA_Local__::server_connection);
  }
 +#endif
- } } // Rapicorn::Aida
- 
-