Following the change in gnome-panel, drop in-process support for bonobo applets here too, upstream bug #642637 (bug #361927 by Marko D., patch by Vuntz).

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

4 files changed, 133 insertions, 15 deletions

diff --git a/dev-cpp/libpanelappletmm/ChangeLog b/dev-cpp/libpanelappletmm/ChangeLog
index cdd0131b3bcd..0232b98e65c6 100644
--- a/dev-cpp/libpanelappletmm/ChangeLog
+++ b/dev-cpp/libpanelappletmm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-cpp/libpanelappletmm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpanelappletmm/ChangeLog,v 1.6 2011/03/29 06:12:41 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpanelappletmm/ChangeLog,v 1.7 2011/04/04 18:54:30 pacho Exp $
+
+*libpanelappletmm-2.26.0-r1 (04 Apr 2011)
+
+  04 Apr 2011; Pacho Ramos <pacho@gentoo.org>
+  +libpanelappletmm-2.26.0-r1.ebuild,
+  +files/libpanelappletmm-2.26.0-no-shlib.patch:
+  Following the change in gnome-panel, drop in-process support for bonobo
+  applets here too, upstream bug #642637 (bug #361927 by Marko D., patch by
+  Vuntz).
 
   29 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   libpanelappletmm-2.26.0.ebuild:
diff --git a/dev-cpp/libpanelappletmm/Manifest b/dev-cpp/libpanelappletmm/Manifest
index 4401e432f321..295bc328d23e 100644
--- a/dev-cpp/libpanelappletmm/Manifest
+++ b/dev-cpp/libpanelappletmm/Manifest
@@ -1,24 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libpanelappletmm-2.26.0-no-shlib.patch 3344 RMD160 380acbe1ea0058aceac05d262dd4b4b9df3de6d1 SHA1 201c6adb425b8c7e575413d89501bc93a2af41ed SHA256 8356e8e01e320b23d4f3cbed22c0c44d603ced461edb3cf23fb1f9a63aa3ed13
 DIST libpanelappletmm-2.26.0.tar.bz2 281034 RMD160 f1a33ba0b92d00d32b2764beda01e7c68f4ace41 SHA1 1e66f6f7668944120518be47f93a7c7456004790 SHA256 7aa569660b7ab36c1d86a7fa0beb7458306678e46bb2b7b1fd782bbcb5eb3852
+EBUILD libpanelappletmm-2.26.0-r1.ebuild 871 RMD160 221f20fb685b4c2537fc6a41b8c5184a70037367 SHA1 4b1e94cc5e411234067a86a247bb69206606cd96 SHA256 43fa0441e13deeb0b9850093af036b0a056c55380ed8ae91fafd2f6c6f3f6786
 EBUILD libpanelappletmm-2.26.0.ebuild 666 RMD160 ac5650efcadd8c3fd34100550e0159b8e73cf158 SHA1 c284468af663844b578fd04765df2612963391af SHA256 96327fa4641d74a5dea664c90356d717f9728b61962981d21f650918826cdb50
-MISC ChangeLog 998 RMD160 2cbbe4af3834140ea26ba0418bc20500a44aa658 SHA1 bdd66e823a4cc3cc80e467583d794e8882a19eee SHA256 b8efa9dd299e42cfce8c1cb518283b4ae89d9bc2fe1d1f5fffcb9ddc90eb8497
+MISC ChangeLog 1332 RMD160 70a09efd9f48914d266b73e3a670dfbe9e7386a8 SHA1 78eff6606d9b1027e13c48fe05966bf0e80092c7 SHA256 41b2e874e1a3e785a8ac5db3c2cf38f1ee92718be6a8eb5d5df1ee642828c6a4
 MISC metadata.xml 261 RMD160 d2071389c58d1199e929d0b39fc68c0774c90b65 SHA1 6b85eb9d9b5367481412879432c3ea64037fc424 SHA256 16958661e4d70b5e9b3d0ab0887889484c9c838fe7a92d6cd4b8902154d50f83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNkXhgAAoJEO/kOhxWD91k6fUP/1lRKDSr9lXW387MMG84am+C
-kwAUDAZ/IFA1s+Hoz/EuG49MeYRcsqbSAejJaKXdiEnFlYyfqfojKxzryRmn09zs
-3YCtLtCSmh7Fi58crHG8cwbF9hz8rYMAwkzyuU2Au99a8uFisfpC9eLO5VQrr6lY
-rliZorX2TXJUksfgchRUM3X+6wCldHY/dhSgi1twFLSkHRibMpagyp0saCfWS/QQ
-wB8JgXBy0PfyZzFlro6M+iMmfeTkJhu81CZahsemyzXCJkfnCsMSXGn+wfV6BixQ
-TQIVYX76NaAyRXmkiMB4HasquHrLYLpEWGn6yyDInExzL1A6azKevZDtGLl78XB0
-awNoO6My7m+FXxzGrTbtH8bgMBsbwuErtfxnD5WEYEAympU2fi2vHILVnA/7WDrX
-WKHUBz55PQpMervWTu4cQ2WGYhhJHXnK03Ipd5LGyuFVUqtm9vBya38pMSkdTCwq
-NtLiaAUglJDSUYna82N3Icrh+0KZrRB/UdYZyEeMqTtVVcDFQKcbkPbdaDnVQOJ5
-5/pB9EJp2jzz5hA1NKQ8EbbwU/5oRg1+xFuhvZmMbkitxuZ0p/Mt5W68POP+JBmx
-OPY2OAEFfJB7q71l8NpZN7lIrVzbw/6gy6HjFdP2F2JovSv+eG5rbc1x7/2Hsegm
-cLhE4Cf/mvzItRFPWCyy
-=nNGN
+iEYEARECAAYFAk2aE+sACgkQCaWpQKGI+9QocACfQreImp4qucNJC9mcQ1xdq5IX
+xRcAoIWPdc+IFQ9zZkkuOyW3woJ0XXM6
+=nXmg
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/libpanelappletmm/files/libpanelappletmm-2.26.0-no-shlib.patch b/dev-cpp/libpanelappletmm/files/libpanelappletmm-2.26.0-no-shlib.patch
new file mode 100644
index 000000000000..497b6c33fdba
--- /dev/null
+++ b/dev-cpp/libpanelappletmm/files/libpanelappletmm-2.26.0-no-shlib.patch
@@ -0,0 +1,85 @@
+Index: libpanelappletmm-2.26.0/libpanelapplet/libpanelappletmm/factory.cc
+===================================================================
+--- libpanelappletmm-2.26.0.orig/libpanelapplet/libpanelappletmm/factory.cc
++++ libpanelappletmm-2.26.0/libpanelapplet/libpanelappletmm/factory.cc
+@@ -30,11 +30,6 @@ int factory_main_closure(const Glib::ust
+   return panel_applet_factory_main_closure(iid.c_str(), Applet::get_type(), closure);
+ }
+ 
+-Bonobo_Unknown shlib_factory_closure(const Glib::ustring& iid, PortableServer_POA poa, void * impl_ptr, GClosure * closure, CORBA_Environment * ev)
+-{
+-  return panel_applet_shlib_factory_closure(iid.c_str(), Applet::get_type(), poa, impl_ptr, closure, ev);
+-}
+-
+ } // namespace Panel
+ } // namespace Gnome
+ 
+Index: libpanelappletmm-2.26.0/libpanelapplet/libpanelappletmm/factory.h
+===================================================================
+--- libpanelappletmm-2.26.0.orig/libpanelapplet/libpanelappletmm/factory.h
++++ libpanelappletmm-2.26.0/libpanelapplet/libpanelappletmm/factory.h
+@@ -83,13 +83,8 @@ bool applet_factory_callback(PanelApplet
+ template<class DerivedApplet>
+ int factory_main(const Glib::ustring& iid);
+ 
+-template<class DerivedApplet>
+-Bonobo_Unknown shlib_factory(const Glib::ustring& iid, PortableServer_POA poa, void* impl_ptr, const SlotFactory& slot, CORBA_Environment* ev);
+-
+ int factory_main_closure(const Glib::ustring& iid, GClosure *closure);
+ 
+-Bonobo_Unknown shlib_factory_closure(const Glib::ustring& iid, PortableServer_POA poa, void* impl_ptr, GClosure* closure, CORBA_Environment* ev);
+-
+ 
+ template<class DerivedApplet>
+ int factory_main(const Glib::ustring& iid)
+@@ -99,14 +94,6 @@ int factory_main(const Glib::ustring& ii
+   return panel_applet_factory_main( iid.c_str(), Applet::get_type(), SignalProxy_Factory::c_callback, &proxy);
+ }
+ 
+-template<class DerivedApplet>
+-Bonobo_Unknown shlib_factory(const Glib::ustring& iid, PortableServer_POA poa, void* impl_ptr, const SlotFactory& slot, CORBA_Environment* ev)
+-{
+-  SignalProxy_Factory proxy( sigc::ptr_fun(&applet_factory_callback<DerivedApplet>) );
+-
+-  return panel_applet_shlib_factory( iid.c_str(), Applet::get_type(), poa, impl_ptr, SignalProxy_Factory::c_callback, &proxy, ev);
+-}
+-
+ } // namespace Panel
+ } // namespace Gnome
+ 
+Index: libpanelappletmm-2.26.0/libpanelapplet/src/libpanelapplet_methods.defs
+===================================================================
+--- libpanelappletmm-2.26.0.orig/libpanelapplet/src/libpanelapplet_methods.defs
++++ libpanelappletmm-2.26.0/libpanelapplet/src/libpanelapplet_methods.defs
+@@ -371,31 +371,4 @@
+   )
+ )
+ 
+-(define-function panel_applet_shlib_factory
+-  (c-name "panel_applet_shlib_factory")
+-  (return-type "Bonobo_Unknown")
+-  (parameters
+-    '("const-char*" "iid")
+-    '("GType" "applet_type")
+-    '("PortableServer_POA" "poa")
+-    '("gpointer" "impl_ptr")
+-    '("PanelAppletFactoryCallback" "callback")
+-    '("gpointer" "user_data")
+-    '("CORBA_Environment*" "ev")
+-  )
+-)
+-
+-(define-function panel_applet_shlib_factory_closure
+-  (c-name "panel_applet_shlib_factory_closure")
+-  (return-type "Bonobo_Unknown")
+-  (parameters
+-    '("const-char*" "iid")
+-    '("GType" "applet_type")
+-    '("PortableServer_POA" "poa")
+-    '("gpointer" "impl_ptr")
+-    '("GClosure*" "closure")
+-    '("CORBA_Environment*" "ev")
+-  )
+-)
+-
+ 
diff --git a/dev-cpp/libpanelappletmm/libpanelappletmm-2.26.0-r1.ebuild b/dev-cpp/libpanelappletmm/libpanelappletmm-2.26.0-r1.ebuild
new file mode 100644
index 000000000000..398a49c300cf
--- /dev/null
+++ b/dev-cpp/libpanelappletmm/libpanelappletmm-2.26.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpanelappletmm/libpanelappletmm-2.26.0-r1.ebuild,v 1.1 2011/04/04 18:54:30 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils
+
+DESCRIPTION="C++ interface for gnome panel"
+HOMEPAGE="http://www.gtkmm.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2.6"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-cpp/gconfmm-2.4
+	>=dev-cpp/glibmm-2.4:2
+	>=dev-cpp/gtkmm-2.4:2.4
+	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
+	<gnome-base/gnome-panel-2.91.6"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	dev-util/pkgconfig"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Following the change in gnome-panel, drop in-process support for bonobo applets here too, upstream bug #642637
+	epatch "${FILESDIR}/${P}-no-shlib.patch"
+}