← Back to branch summary

~ubuntu-branches/debian/jessie/banshee/jessie

« back to all changes in this revision

Viewing changes to debian/patches/Use-dbus-2.patch

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2013-12-09 20:04:08 UTC
  • Revision ID: package-import@ubuntu.com-20131209200408-p6iiylk1ar90hpek
Tags: 2.6.1-4
* [c1bf3f2] Backport the dbus#2 patch
* [ba50d2a] Build-dep on dbus#2

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/Use-dbus-2.patch
 
1
From: Chow Loong Jin <hyperair@debian.org>
 
2
Date: Mon, 25 Nov 2013 01:18:19 +0800
 
3
Subject: Use dbus# 2
 
4
 
 
5
---
 
6
 build/m4/banshee/dbus.m4                                             | 4 ++--
 
7
 build/pkg-config/banshee-collection-indexer.pc.in                    | 2 +-
 
8
 build/pkg-config/banshee-core.pc.in                                  | 2 +-
 
9
 src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs | 5 +----
 
10
 4 files changed, 5 insertions(+), 8 deletions(-)
 
11
 
 
12
diff --git a/build/m4/banshee/dbus.m4 b/build/m4/banshee/dbus.m4
 
13
index 3b8579e..f76ff8c 100644
 
14
--- a/build/m4/banshee/dbus.m4
 
15
+++ b/build/m4/banshee/dbus.m4
 
16
@@ -1,9 +1,9 @@
 
17
 AC_DEFUN([BANSHEE_CHECK_DBUS_SHARP],
 
18
 [
 
19
-       PKG_CHECK_MODULES(DBUS_SHARP_GLIB, dbus-sharp-glib-1.0 >= 0.5)
 
20
+       PKG_CHECK_MODULES(DBUS_SHARP_GLIB, dbus-sharp-glib-2.0 >= 0.5)
 
21
        AC_SUBST(DBUS_SHARP_GLIB_LIBS)
 
22
 
 
23
-       PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-1.0 >= 0.7)
 
24
+       PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-2.0 >= 0.7)
 
25
        AC_SUBST(DBUS_SHARP_LIBS)
 
26
 ])
 
27
 
 
28
diff --git a/build/pkg-config/banshee-collection-indexer.pc.in b/build/pkg-config/banshee-collection-indexer.pc.in
 
29
index 40636bb..a12b03c 100644
 
30
--- a/build/pkg-config/banshee-collection-indexer.pc.in
 
31
+++ b/build/pkg-config/banshee-collection-indexer.pc.in
 
32
@@ -7,6 +7,6 @@ Libraries=${bansheedir}/Banshee.CollectionIndexer.dll
 
33
 Name: Banshee Collection Indexer Helper
 
34
 Description: A library for applications to bundle to easily consume the Banshee Collection Indexer
 
35
 Version: @VERSION@
 
36
-Requires: dbus-sharp-1.0
 
37
+Requires: dbus-sharp-2.0
 
38
 Libs: -r:${Libraries}
 
39
 
 
40
diff --git a/build/pkg-config/banshee-core.pc.in b/build/pkg-config/banshee-core.pc.in
 
41
index 9d4c3b9..09f54e8 100644
 
42
--- a/build/pkg-config/banshee-core.pc.in
 
43
+++ b/build/pkg-config/banshee-core.pc.in
 
44
@@ -6,5 +6,5 @@ bansheedir=${libdir}/@PACKAGE@
 
45
 Name: Banshee Core
 
46
 Description: Core APIs for the Banshee Media Framework
 
47
 Version: @VERSION@
 
48
-Requires: taglib-sharp dbus-sharp-1.0 dbus-sharp-glib-1.0 glib-sharp-2.0 mono-addins banshee-hyena banshee-hyena-data-sqlite banshee-musicbrainz
 
49
+Requires: taglib-sharp dbus-sharp-2.0 dbus-sharp-glib-1.0 glib-sharp-2.0 mono-addins banshee-hyena banshee-hyena-data-sqlite banshee-musicbrainz
 
50
 Libs: -r:${bansheedir}/Banshee.Core.dll
 
51
diff --git a/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs b/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs
 
52
index 698cf02..96e3996 100644
 
53
--- a/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs
 
54
+++ b/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs
 
55
@@ -135,10 +135,7 @@ namespace Banshee.ServiceStack
 
56
                 string bus_name = DBusConnection.MakeBusName (serviceName);
 
57
 
 
58
                 Log.DebugFormat ("Registering remote object {0} ({1}) on {2}", path, o.GetType (), bus_name);
 
59
-
 
60
-                #pragma warning disable 0618
 
61
-                Bus.Session.Register (bus_name, path, o);
 
62
-                #pragma warning restore 0618
 
63
+                Bus.Session.Register (path, o);
 
64
             }
 
65
 
 
66
             return path;