1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
diff -Naur muine-0.8.11.orig/configure.in muine-0.8.11/configure.in
--- muine-0.8.11.orig/configure.in 2017-01-28 10:00:26.485408000 +0100
+++ muine-0.8.11/configure.in 2017-01-28 10:01:57.758024655 +0100
@@ -59,11 +59,11 @@
PKG_CHECK_MODULES(NOTIFYSHARP,
notify-sharp >= $NOTIFYSHARP_REQUIRED)
-dnl ndesk-dbus
-PKG_CHECK_MODULES(DBUS, ndesk-dbus-1.0 >= 0.4 \
- ndesk-dbus-glib-1.0 >= 0.3, have_dbus="yes", have_dbus="no")
+dnl dbus-sharp
+PKG_CHECK_MODULES(DBUS, dbus-sharp-2.0 >= 0.7 \
+ dbus-sharp-glib-2.0 >= 0.5, have_dbus="yes", have_dbus="no")
if test "x$have_dbus" != "xyes"; then
- AC_MSG_ERROR([You need NDESK-DBUS)])
+ AC_MSG_ERROR([You need DBUS-SHARP)])
fi
AM_CONDITIONAL(EXTERNAL_DBUS, test "x$have_dbus" = "xyes")
diff -Naur muine-0.8.11.orig/DBusLib/IPlayer.cs muine-0.8.11/DBusLib/IPlayer.cs
--- muine-0.8.11.orig/DBusLib/IPlayer.cs 2009-09-13 16:53:58.000000000 +0200
+++ muine-0.8.11/DBusLib/IPlayer.cs 2017-01-28 10:01:57.758024655 +0100
@@ -1,5 +1,5 @@
-using NDesk.DBus;
+using DBus;
namespace Muine.DBusLib
{
diff -Naur muine-0.8.11.orig/DBusLib/Makefile.am muine-0.8.11/DBusLib/Makefile.am
--- muine-0.8.11.orig/DBusLib/Makefile.am 2009-09-13 16:53:58.000000000 +0200
+++ muine-0.8.11/DBusLib/Makefile.am 2017-01-28 10:01:57.758024655 +0100
@@ -13,7 +13,7 @@
DBUS_ASSEMBLIES = $(DBUS_LIBS)
else
DBUS_ASSEMBLIES = \
- -r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll
+ -r:$(top_builddir)/deps/dbus-sharp/dbus-sharp.dll
endif
CLIENT_LIB_ASSEMBLIES = \
diff -Naur muine-0.8.11.orig/DBusLib/Player.cs muine-0.8.11/DBusLib/Player.cs
--- muine-0.8.11.orig/DBusLib/Player.cs 2009-09-13 16:53:58.000000000 +0200
+++ muine-0.8.11/DBusLib/Player.cs 2017-01-28 10:01:57.758024655 +0100
@@ -21,7 +21,7 @@
using System;
using System.Collections;
-using NDesk.DBus;
+using DBus;
using Muine.PluginLib;
diff -Naur muine-0.8.11.orig/src/DBusService.cs muine-0.8.11/src/DBusService.cs
--- muine-0.8.11.orig/src/DBusService.cs 2009-09-13 16:53:58.000000000 +0200
+++ muine-0.8.11/src/DBusService.cs 2017-01-28 10:02:42.099287974 +0100
@@ -21,7 +21,7 @@
using System;
-using NDesk.DBus;
+using DBus;
using org.freedesktop.DBus;
namespace Muine
@@ -93,7 +93,7 @@
/// </param>
public void RegisterObject (object obj, string path)
{
- Bus.Session.Register ("/org/gnome/Muine/", new ObjectPath (path), obj);
+ Bus.Session.Register (new ObjectPath (path), obj);
}
}
}
diff -Naur muine-0.8.11.orig/src/Global.cs muine-0.8.11/src/Global.cs
--- muine-0.8.11.orig/src/Global.cs 2009-09-13 16:53:58.000000000 +0200
+++ muine-0.8.11/src/Global.cs 2017-01-28 10:01:57.761358084 +0100
@@ -110,7 +110,7 @@
public static void Main (string [] args)
{
try {
- NDesk.DBus.BusG.Init ();
+ DBus.BusG.Init ();
} catch {}
try {
diff -Naur muine-0.8.11.orig/src/GnomeMMKeys.cs muine-0.8.11/src/GnomeMMKeys.cs
--- muine-0.8.11.orig/src/GnomeMMKeys.cs 2017-01-28 10:00:26.482075000 +0100
+++ muine-0.8.11/src/GnomeMMKeys.cs 2017-01-28 10:01:57.761358084 +0100
@@ -30,7 +30,7 @@
using System;
using Gtk;
-using NDesk.DBus;
+using DBus;
namespace Muine
{
diff -Naur muine-0.8.11.orig/src/Makefile.am muine-0.8.11/src/Makefile.am
--- muine-0.8.11.orig/src/Makefile.am 2017-01-28 10:00:26.482075000 +0100
+++ muine-0.8.11/src/Makefile.am 2017-01-28 10:01:57.761358084 +0100
@@ -58,8 +58,8 @@
DBUS_ASSEMBLIES = $(DBUS_LIBS)
else
DBUS_ASSEMBLIES = \
- -r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll \
- -r:$(top_builddir)/deps/dbus-sharp-glib/NDesk.DBus.GLib.dll
+ -r:$(top_builddir)/deps/dbus-sharp/dbus-sharp.dll \
+ -r:$(top_builddir)/deps/dbus-sharp-glib/dbus-sharp-glib.dll
endif
MUINE_ASSEMBLIES = \
|