SliTaz Repositories

1 diff -rupN cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt cairo-dock-plug-ins-3.4.1/CMakeLists.txt

2 --- cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt 2015-03-12 09:43:57.171067365 +0100

3 +++ cairo-dock-plug-ins-3.4.1/CMakeLists.txt 2015-03-12 09:46:20.717120675 +0100

4 @@ -573,11 +573,11 @@ if (enable-mono-interface)

5 if (NOT GMCS_EXECUTABLE OR NOT EXISTS ${GMCS_EXECUTABLE})

6 message (STATUS "Could not find Mono compiler gmcs, won't build Mono interface.")

7 else()

8 - pkg_check_modules (MONO_PACKAGE glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0)

9 + pkg_check_modules (MONO_PACKAGE dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0)

10 if (NOT MONO_PACKAGE_FOUND)

11 - message (STATUS "Could not find glib-sharp-2.0, ndesk-dbus-1.0 or ndesk-dbus-glib-1.0; won't be built Mono interface.")

12 - message (WARNING "These modules are required to compile DBus applet with Mono interface: glib-sharp-2.0, ndesk-dbus-1.0 and ndesk-dbus-glib-1.0")

13 - set (MODULES_MISSING "${MODULES_MISSING} glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0")

14 + message (STATUS "Could not find dbus-sharp-2.0, dbus-sharp-glib-2.0 or glib-sharp-3.0; won't be built Mono interface.")

15 + message (WARNING "These modules are required to compile DBus applet with Mono interface: dbus-sharp-2.0, dbus-sharp-glib-2.0 and glib-sharp-3.0")

16 + set (MODULES_MISSING "${MODULES_MISSING} dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0")

17 else()

18 set (MONO_FOUND TRUE)

19 set (with_mono yes)

20 diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CDApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CDApplet.cs

21 --- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CDApplet.cs 2015-03-12 09:52:56.491934965 +0100

22 +++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CDApplet.cs 2015-03-12 09:56:50.191652099 +0100

23 @@ -21,7 +21,7 @@

24 // Make your own class derive from a CDApplet, and override the functions you need (the ones which don't start with an underscore).

25

26 // Compile it with the following command, then rename 'demo_mono.exe' to 'demo_mono'.

27 -// gmcs /target:library CDApplet.cs ISubApplet.cs IApplet.cs -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0

28 +// gmcs /target:library CDApplet.cs ISubApplet.cs IApplet.cs -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0 -pkg:glib-sharp-3.0

29 //////////////////////////

30 ////// dependancies //////

31 //////////////////////////

32 @@ -29,7 +29,7 @@ using System; // Environment

33 using System.IO; // Path, Directory

34 using System.Reflection;

35 using GLib;

36 -using NDesk.DBus;

37 +using DBus;

38 using CairoDock.Applet;

39

40 //namespace CairoDock.Applet

41 @@ -258,8 +258,8 @@ public class CDApplet

42

43 private void _connect_to_dock ()

44 {

45 - NDesk.DBus.BusG.Init();

46 - NDesk.DBus.Bus bus = NDesk.DBus.Bus.Session;

47 + DBus.BusG.Init();

48 + DBus.Bus bus = DBus.Bus.Session;

49 this.icon = bus.GetObject<IApplet> ("org.cairodock.CairoDock", new ObjectPath (this.cBusPath));

50 this.icon.on_click += new OnClickEvent (on_click);

51 this.icon.on_middle_click += new OnMiddleClickEvent (on_middle_click);

52 diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt

53 --- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:52:56.491934965 +0100

54 +++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:54:07.418777441 +0100

55 @@ -3,7 +3,7 @@

56

57 execute_process(COMMAND ${GMCS_EXECUTABLE}

58 -target:library

59 - -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0

60 + -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0 -pkg:glib-sharp-3.0

61 -out:${CMAKE_CURRENT_BINARY_DIR}/CDApplet.dll

62 ${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/ISubApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/IApplet.cs)

63 ### find how to register to GAC ...

64 diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/demos/demo_mono/demo_mono.cs cairo-dock-plug-ins-3.4.1/Dbus/demos/demo_mono/demo_mono.cs

65 --- cairo-dock-plug-ins-3.4.1.orig/Dbus/demos/demo_mono/demo_mono.cs 2015-03-12 09:59:41.064312097 +0100

66 +++ cairo-dock-plug-ins-3.4.1/Dbus/demos/demo_mono/demo_mono.cs 2015-03-12 10:02:39.473424651 +0100

67 @@ -138,7 +138,7 @@ public class Applet : CDApplet

68 public override void on_build_menu ()

69 {

70 Console.WriteLine("*** build menu");

71 - /// Warning : teh AddMenuItems fails with NDesk-DBus 0.6.0; until this is fixed, use the PopulateMenu method.

72 + /// Warning : the AddMenuItems fails with DBus Sharp 0.6.0; until this is fixed, use the PopulateMenu method.

73 /**Dictionary<string, object>[] pItems = new Dictionary<string, object>[] {

74 new Dictionary<string, object>()

75 {

76 diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/IApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/IApplet.cs

77 --- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/IApplet.cs 2015-03-12 09:59:41.067645289 +0100

78 +++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/IApplet.cs 2015-03-12 10:00:35.395334804 +0100

79 @@ -1,6 +1,6 @@

80 using System;

81 using System.Collections.Generic; // Dictionnary

82 -using NDesk.DBus;

83 +using DBus;

84

85 namespace CairoDock.Applet

86 {

87 @@ -27,7 +27,7 @@ namespace CairoDock.Applet

88 Left

89 }

90

91 - [NDesk.DBus.Interface("org.cairodock.CairoDock.applet")]

92 + [DBus.Interface("org.cairodock.CairoDock.applet")]

93 public interface IApplet

94 {

95 object Get(string cProperty);

96 diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/ISubApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/ISubApplet.cs

97 --- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/ISubApplet.cs 2015-03-12 09:59:41.067645289 +0100

98 +++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/ISubApplet.cs 2015-03-12 10:00:16.522802989 +0100

99 @@ -1,6 +1,6 @@

100 using System;

101 using System.Collections.Generic; // Dictionnary

102 -using NDesk.DBus;

103 +using DBus;

104

105 namespace CairoDock.Applet

106 {