Fix signals not being passed to tomboy properly, bug #387097 by Hans de Graaff.

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

6 files changed, 114 insertions, 20 deletions

diff --git a/dev-dotnet/dbus-sharp/ChangeLog b/dev-dotnet/dbus-sharp/ChangeLog
index efa100538a20..11f08faf55f0 100644
--- a/dev-dotnet/dbus-sharp/ChangeLog
+++ b/dev-dotnet/dbus-sharp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-dotnet/dbus-sharp
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/dbus-sharp/ChangeLog,v 1.16 2011/11/10 19:19:14 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/dbus-sharp/ChangeLog,v 1.17 2012/01/21 13:22:06 pacho Exp $
+
+*dbus-sharp-0.7.0-r1 (21 Jan 2012)
+
+  21 Jan 2012; Pacho Ramos <pacho@gentoo.org> +dbus-sharp-0.7.0-r1.ebuild,
+  +files/dbus-sharp-0.7.0-fix-signals.patch,
+  +files/dbus-sharp-0.7.0-fix-signals2.patch:
+  Fix signals not being passed to tomboy properly, bug #387097 by Hans de
+  Graaff.
 
   10 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> dbus-sharp-0.7.0.ebuild:
   ppc stable wrt #389181
diff --git a/dev-dotnet/dbus-sharp/Manifest b/dev-dotnet/dbus-sharp/Manifest
index cb253b980e94..fb3be4cace65 100644
--- a/dev-dotnet/dbus-sharp/Manifest
+++ b/dev-dotnet/dbus-sharp/Manifest
@@ -1,24 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX dbus-sharp-0.7.0-fix-signals.patch 1242 RMD160 e2b05016ddc20c47a15e70a49032f654641a61b8 SHA1 ee3a745098f2febf5e4a3aaffa26d37ed0641106 SHA256 7a9ab7be15804251c4a666394db426755f6b1b0a7004dc6d38ba9f2ad2fc197a
+AUX dbus-sharp-0.7.0-fix-signals2.patch 978 RMD160 db1c57266f940d4a85842d31f3ec5532d2c381c0 SHA1 6d560188d6f4de3655f5537f86b4a8de626dd3d4 SHA256 04de01e4a409947e7b4677339106cb2cfdc74ac2d71457d866943058b8461615
 DIST dbus-sharp-0.7.0.tar.gz 127651 RMD160 6f24068ea649d86282cabf11b633074165c2ed9f SHA1 7e7b05aadb6a289cd862dc630a36d9b87b5b84cb SHA256 92529aef9063f477d1975947c6388c63d03234018f45d007c07716dd3e21dd41
+EBUILD dbus-sharp-0.7.0-r1.ebuild 715 RMD160 c2fe8df6393e6966ca04a681d8ac8061324312f5 SHA1 f2bf33f9ac54f07eace96a8f52d168305d278c22 SHA256 b4a1cba6dce1cc5365ff8484665ca8bdc194bbf8cdde01e4a24335def84bec25
 EBUILD dbus-sharp-0.7.0.ebuild 567 RMD160 6ca42875cb1173b5791aa8a68f4bd7580d37e5d8 SHA1 8a6a24bdf8f132f5de46cea42a44405b8ee949ac SHA256 fa43f44c041ed8ae539fcac8e763e9113eca8a7c6ac7d369c808cddeef28ee74
-MISC ChangeLog 781 RMD160 c9e88d6a799ad43242a2a3291e2d89548a896cbd SHA1 a81e9d9c051db5620d24b8058a81de77e31d55e3 SHA256 6a195fb08b5ec6e4a121f83b4159f8484a00d6dbff37e74c940eae4b6eee9bc9
+MISC ChangeLog 1063 RMD160 0f4c21bf252432e60d4b37a73a37cea53cf4d0b2 SHA1 2c0c6ed839eca4b7698b5756004146445f47a1cb SHA256 8b0699a84c167df28833b35af80d8d1f0fe47b8966184c3faf838650fb6c9c9a
 MISC metadata.xml 257 RMD160 045b473249faac279edd7ce1ae3bdb86732405d0 SHA1 4d5b4ae24183d8096b302777f09508bb109d284d SHA256 96f53ed644a6f330e8e70e2069b331b98f85c21c8e9753fdd083b3cd15fdf57a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOvCO3AAoJEF0huFKJUZL5JKsP/RCSz6b/0FQPFlKmD52TtzXG
-r2NIWntbXL/UsuD4TiJMorg2CIqXVb20P984dE5nBeVhmVqz5AaS2gMjkhAhjKRk
-8IWI5rFgp90veMawMPv6LCh7DWIEvXdtxEotpR1lyJXf9ce1Rt8QAo3eGitsp9BQ
-Ati/mbI/HAKAZO0tTMu0JWeuncYI7BD9+n8BTZvmPadxWDb4QfBFWDJqNT4LpyV3
-qH2AIXGqmYObgri9IcbKLti4faPsxzY3WK9hk+PItTTrMwYg66yJa7eRif2+3YWi
-A7/IcodLt2jAamHUlvy4Ot0sZEKjV5M0qPgaSbbZwRE8JCucdG5bPpgmL2ToMieW
-TIyl/weaM8pbSsq+qUA2dmSV2PjE9iE2OZlVyICqk0RmkTdxW4Q7p3bXyV1C1uMs
-NJYB12v2F9P/oQKIhqCzQSVY7GO6vZK2qOZAtuk+3czrSLC0Zo/DzJ+3Y/jokL1V
-/+yIpOyGQL86adZCt3beXnxk9s6wtB3o2zRKWgunh5hqj4l5dQ1hhf3SxCVuFjHi
-dzoZ4qjOgQfw4Jls68ewbfd3g8XJ2TKWJqlwh+1AKg7bIIguHbUg6dx1N4rq/h54
-uwj7/bDTAhTxa6l8HQsgOLnC84zM6Q/fDHu0SYIyfSjSOmQ5+2yTjpSS3D4kSOai
-bPvj+RnB0h5NYPHu/WdS
-=dnpn
+iEYEARECAAYFAk8avAMACgkQCaWpQKGI+9RMFQCfe5qciYloguy0Eg5AqiKuLHbB
+IdcAmgIRpAjNoAb4l+8GxKC4pWTV4szu
+=vbiE
 -----END PGP SIGNATURE-----
diff --git a/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r1.ebuild b/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..981c9387eb0f
--- /dev/null
+++ b/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r1.ebuild,v 1.1 2012/01/21 13:22:05 pacho Exp $
+
+EAPI="4"
+inherit mono eutils
+
+DESCRIPTION="D-Bus for .NET"
+HOMEPAGE="https://github.com/mono/dbus-sharp"
+SRC_URI="https://github.com/downloads/mono/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/mono
+	sys-apps/dbus"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	DOCS="AUTHORS README"
+}
+
+src_prepare() {
+	# Fix signals, bug #387097
+	epatch "${FILESDIR}/${P}-fix-signals.patch"
+	epatch "${FILESDIR}/${P}-fix-signals2.patch"
+}
diff --git a/dev-dotnet/dbus-sharp/files/dbus-sharp-0.7.0-fix-signals.patch b/dev-dotnet/dbus-sharp/files/dbus-sharp-0.7.0-fix-signals.patch
new file mode 100644
index 000000000000..934d7630d164
--- /dev/null
+++ b/dev-dotnet/dbus-sharp/files/dbus-sharp-0.7.0-fix-signals.patch
@@ -0,0 +1,28 @@
+From 608328ba1e0ccc8d0387c244793b229bcc184648 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Laval?= <jeremie.laval@gmail.com>
+Date: Fri, 10 Dec 2010 15:03:12 +0000
+Subject: [PATCH] Disable broken matching on sender for signals. Fix issue #8.
+
+---
+ src/BusObject.cs |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/BusObject.cs b/src/BusObject.cs
+index e12207e..fe32b72 100644
+--- a/src/BusObject.cs
++++ b/src/BusObject.cs
+@@ -56,7 +56,10 @@ public void ToggleSignal (string iface, string member, Delegate dlg, bool adding
+ 			rule.Fields.Add (FieldCode.Interface, new MatchTest (iface));
+ 			rule.Fields.Add (FieldCode.Member, new MatchTest (member));
+ 			rule.Fields.Add (FieldCode.Path, new MatchTest (object_path));
+-			rule.Fields.Add (FieldCode.Sender, new MatchTest (alt_bus_name ?? bus_name));
++			// FIXME: Cause a regression compared to 0.6 as name wasn't matched before
++			// the problem arises because busname is not used by DBus daemon and
++			// instead it uses the canonical name of the sender (i.e. similar to ':1.13')
++			//rule.Fields.Add (FieldCode.Sender, new MatchTest (alt_bus_name ?? bus_name));
+ 
+ 			if (adding) {
+ 				if (conn.Handlers.ContainsKey (rule))
+-- 
+1.7.5.4
+
diff --git a/dev-dotnet/dbus-sharp/files/dbus-sharp-0.7.0-fix-signals2.patch b/dev-dotnet/dbus-sharp/files/dbus-sharp-0.7.0-fix-signals2.patch
new file mode 100644
index 000000000000..d74361c08019
--- /dev/null
+++ b/dev-dotnet/dbus-sharp/files/dbus-sharp-0.7.0-fix-signals2.patch
@@ -0,0 +1,26 @@
+From 76f43e6cc25eae25b658831111b37b10376311d2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Laval?= <jeremie.laval@gmail.com>
+Date: Thu, 10 Feb 2011 17:31:38 +0000
+Subject: [PATCH] Remove sender match check on receiving side too. Properly
+ fix issue 8.
+
+---
+ src/Connection.cs |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Connection.cs b/src/Connection.cs
+index b414994..e593db9 100644
+--- a/src/Connection.cs
++++ b/src/Connection.cs
+@@ -278,7 +278,7 @@ internal void HandleSignal (Message msg)
+ 			rule.MessageType = MessageType.Signal;
+ 			rule.Fields.Add (FieldCode.Interface, new MatchTest (signal.Interface));
+ 			rule.Fields.Add (FieldCode.Member, new MatchTest (signal.Member));
+-			rule.Fields.Add (FieldCode.Sender, new MatchTest (signal.Sender));
++			//rule.Fields.Add (FieldCode.Sender, new MatchTest (signal.Sender));
+ 			rule.Fields.Add (FieldCode.Path, new MatchTest (signal.Path));
+ 
+ 			Delegate dlg;
+-- 
+1.7.5.4
+
diff --git a/dev-dotnet/evolution-sharp/Manifest b/dev-dotnet/evolution-sharp/Manifest
index ccb13117e1d6..835d19cf5d92 100644
--- a/dev-dotnet/evolution-sharp/Manifest
+++ b/dev-dotnet/evolution-sharp/Manifest
@@ -1,8 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evolution-sharp-0.21.1-drop-soversion.patch 1091 RMD160 316aafbb1db3fe9cead14a0b7838a21a88bd317d SHA1 6be9806f1c5a032b112e62bc972c50ee4f7116f5 SHA256 c23d59cdb19e2c8a457fde6b2918aaa3f986004c66224c39f4d310d6320c4f9b
 AUX evolution-sharp-0.21.1-gtk-sharp-dropped.patch 3818 RMD160 0a7712b7119bbb0134d1047a828bc5067530da41 SHA1 a001e3cd143214c9339b3d273a4c067fa85e6ebb SHA256 93fa74cfd3a1f67b137af92a1d3d62758b6125218f819d5e824f75b3577e5a87
 AUX evolution-sharp-0.21.1-version-check.patch 1202 RMD160 24e0a3bf76d976f22c699efd62dde580ab5c516d SHA1 9b9ef521fb71393975c313b0c27fd53db92bdda4 SHA256 80f98baf3336383241deac73c3f0d3a0905c9a2a3790db7ec4bf6089a577cf5b
 DIST evolution-sharp-0.21.1.tar.bz2 316152 RMD160 89e42f3b63ee7b4600ca5969f8327e745806869d SHA1 d2a8623812dce0476acd6bbc42e6d7d7d4f6bed4 SHA256 3cb78088e332f71b2a7958d2e8c6af3c9ff168731c8fb423aad7038cbdef3a1c
 EBUILD evolution-sharp-0.21.1-r1.ebuild 1387 RMD160 65424103fb007f21a0da62ee2144189dfb2feed0 SHA1 3c72bfc994a01362114c8747e6528d0232fc6124 SHA256 b169cb52ace4ad6b97cd9ec1c84a0c2015d3f84f326d413688df2bfd1055cd05
-EBUILD evolution-sharp-0.21.1.ebuild 1262 RMD160 e0a34e3b1653115a8ba5705d3c59f60f4f8a792c SHA1 95dae16beaf91397ba4e042b5efb31b2a9674ae2 SHA256 bc5c9526c802334b7189c61ac4eecbec65fc02f0d0730e893e3459fcb358722e
-MISC ChangeLog 9753 RMD160 1f6db2d153a4390277cb9697742eeb20954822b8 SHA1 bcf723bc908d252174e86db0f2336c50f64811a8 SHA256 678b4acb64323140cde5c883dd5dd721f2ca1ed85133f9755d6cff1b0ae83e25
+MISC ChangeLog 9843 RMD160 28cac88d59f855e26c722caffc8456d4c91fbcb2 SHA1 ec150d03d25ec88cb23f972eafb622c25668cb93 SHA256 4f1179d88ef343eec856ed2eb14f2912511e2bfe6a64ba1a79d63eb75c6ae58a
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk8avGMACgkQCaWpQKGI+9SfDgCdHY6QyNkv2CkpX0K/m2pgwp3k
+fyAAnRUDapWhX7GdwWL8B1lXeW0wpdX8
+=kCkZ
+-----END PGP SIGNATURE-----