GNOME.org
 

[f-spot] Stop embedding ndesk-dbus.

commit 247056a7f7be22ea78c940dd59a82d71808192f8
Author: Ruben Vermeersch <ruben savanne be>
Date:   Tue Aug 11 02:44:38 2009 +0200

    Stop embedding ndesk-dbus.
    
    Almost every distro ships it now. Those who want to ship the next
    version of F-Spot will have to package it. Reduces the codebase by 6000+
    lines.

 configure.ac                                     |   23 +-
 extensions/Exporters/CDExport/Makefile.am        |    1 -
 extensions/Exporters/FacebookExport/Makefile.am  |    1 -
 extensions/Exporters/FlickrExport/Makefile.am    |    1 -
 extensions/Exporters/FolderExport/Makefile.am    |    1 -
 extensions/Exporters/GalleryExport/Makefile.am   |    1 -
 extensions/Exporters/PicasaWebExport/Makefile.am |    1 -
 extensions/Exporters/SmugMugExport/Makefile.am   |    1 -
 extensions/Exporters/TabbloExport/Makefile.am    |    1 -
 extensions/Exporters/ZipExport/Makefile.am       |    1 -
 extensions/Services/BeagleService/Makefile.am    |    1 -
 extensions/Services/DBusService/Makefile.am      |    2 +-
 extensions/Tools/ChangePhotoPath/Makefile.am     |    1 -
 extensions/Tools/DevelopInUFraw/Makefile.am      |    1 -
 extensions/Tools/HashJob/Makefile.am             |    1 -
 extensions/Tools/MergeDb/Makefile.am             |    1 -
 extensions/Tools/RawPlusJpeg/Makefile.am         |    1 -
 lib/Makefile.am                                  |    6 +-
 lib/dbus-sharp-glib/.gitignore                   |    4 -
 lib/dbus-sharp-glib/AssemblyInfo.cs              |   12 -
 lib/dbus-sharp-glib/COPYING                      |   20 -
 lib/dbus-sharp-glib/GLib.IO.cs                   |  226 ---------
 lib/dbus-sharp-glib/GLib.cs                      |   55 ---
 lib/dbus-sharp-glib/Makefile.am                  |   34 --
 lib/dbus-sharp-glib/NDesk.DBus.GLib.dll.config   |    5 -
 lib/dbus-sharp-glib/README                       |    8 -
 lib/dbus-sharp/.gitignore                        |    4 -
 lib/dbus-sharp/Address.cs                        |  160 ------
 lib/dbus-sharp/AssemblyInfo.cs                   |   21 -
 lib/dbus-sharp/Authentication.cs                 |  136 ------
 lib/dbus-sharp/Bus.cs                            |  173 -------
 lib/dbus-sharp/BusObject.cs                      |  304 ------------
 lib/dbus-sharp/COPYING                           |   20 -
 lib/dbus-sharp/Connection.cs                     |  538 --------------------
 lib/dbus-sharp/DBus.cs                           |   93 ----
 lib/dbus-sharp/DProxy.cs                         |   79 ---
 lib/dbus-sharp/ExportObject.cs                   |  115 -----
 lib/dbus-sharp/Introspection.cs                  |  295 -----------
 lib/dbus-sharp/IntrospectionSchema.cs            |  118 -----
 lib/dbus-sharp/Makefile.am                       |   55 ---
 lib/dbus-sharp/Mapper.cs                         |  346 -------------
 lib/dbus-sharp/MatchRule.cs                      |  228 ---------
 lib/dbus-sharp/Message.cs                        |   90 ----
 lib/dbus-sharp/MessageFilter.cs                  |   58 ---
 lib/dbus-sharp/MessageReader.cs                  |  436 -----------------
 lib/dbus-sharp/MessageWriter.cs                  |  455 -----------------
 lib/dbus-sharp/PendingCall.cs                    |   63 ---
 lib/dbus-sharp/Protocol.cs                       |  319 ------------
 lib/dbus-sharp/README                            |   33 --
 lib/dbus-sharp/Signature.cs                      |  568 ----------------------
 lib/dbus-sharp/SocketTransport.cs                |   60 ---
 lib/dbus-sharp/Transport.cs                      |   55 ---
 lib/dbus-sharp/TypeImplementer.cs                |  352 --------------
 lib/dbus-sharp/UnixMonoTransport.cs              |   59 ---
 lib/dbus-sharp/UnixNativeTransport.cs            |  277 -----------
 lib/dbus-sharp/UnixTransport.cs                  |   37 --
 lib/dbus-sharp/Wrapper.cs                        |  149 ------
 lib/gnome-keyring-sharp/Makefile.am              |    2 +-
 src/Makefile.am                                  |    7 +-
 src/f-spot.in                                    |    2 +-
 tests/src/Makefile.am                            |    1 -
 61 files changed, 10 insertions(+), 6108 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 73eae22..f1410a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,24 +127,9 @@ AC_SUBST(LINK_BEAGLE)
 
 AC_SUBST(CSC_DEFINES)
 
-dnl -- dbus-sharp: link or bundle ?
-PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
-[
-	LINK_DBUS="-pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0"
-	DIR_DBUS=""
-	DIR_DBUS_GLIB=""
-	PATH_DBUS=""
-],
-[
-	LINK_DBUS='-r:$(top_builddir)/lib/dbus-sharp/NDesk.DBus.dll -r:$(top_builddir)/lib/dbus-sharp-glib/NDesk.DBus.GLib.dll'
-	DIR_DBUS="dbus-sharp"
-	DIR_DBUS_GLIB="dbus-sharp-glib"
-	PATH_DBUS='../lib/dbus-sharp:../lib/dbus-sharp-glib:'
-])
-AC_SUBST(DIR_DBUS)
-AC_SUBST(DIR_DBUS_GLIB)
-AC_SUBST(LINK_DBUS)
-AC_SUBST(PATH_DBUS)
+dnl -- dbus-sharp
+PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED)
+AC_SUBST(NDESK_DBUS_LIBS)
 
 dnl -- nunit
 PKG_CHECK_MODULES(NUNIT, nunit >= $NUNIT_REQUIRED, 
@@ -282,8 +267,6 @@ AC_SUBST(GNOME_ICON_THEME_PREFIX)
 
 AC_OUTPUT(
 Makefile
-lib/dbus-sharp/Makefile
-lib/dbus-sharp-glib/Makefile
 lib/dpap-sharp/Makefile
 lib/dpap-sharp/lib/Makefile
 lib/dpap-sharp/dpap-client/Makefile
diff --git a/extensions/Exporters/CDExport/Makefile.am b/extensions/Exporters/CDExport/Makefile.am
index 57b24b4..6bd4fb4 100644
--- a/extensions/Exporters/CDExport/Makefile.am
+++ b/extensions/Exporters/CDExport/Makefile.am
@@ -18,7 +18,6 @@ REFS =					\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GTKSHARPBEANS)			\	
 	$(LINK_GIOSHARP)			\
-	$(LINK_DBUS)				\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/FacebookExport/Makefile.am b/extensions/Exporters/FacebookExport/Makefile.am
index 1dceab8..2544555 100644
--- a/extensions/Exporters/FacebookExport/Makefile.am
+++ b/extensions/Exporters/FacebookExport/Makefile.am
@@ -42,7 +42,6 @@ REFS =					\
 	$(LINK_SEMWEB)						\
 	$(LINK_GPHOTO2)						\
 	$(LINK_GIOSHARP)						\
-	$(LINK_DBUS)						\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index 812904c..2535352 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -19,7 +19,6 @@ REFS =					\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GIOSHARP)				\
 	$(LINK_GTKSHARPBEANS)		\
-	$(LINK_DBUS)				\
 	-r:FlickrNet/FlickrNet.dll	\
 	-r:Mono.Posix
 
diff --git a/extensions/Exporters/FolderExport/Makefile.am b/extensions/Exporters/FolderExport/Makefile.am
index 8cacf9e..704a481 100644
--- a/extensions/Exporters/FolderExport/Makefile.am
+++ b/extensions/Exporters/FolderExport/Makefile.am
@@ -18,7 +18,6 @@ REFS =					\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GIOSHARP)				\
 	$(LINK_GTKSHARPBEANS)		\
-	$(LINK_DBUS)		\
 	-r:System.Web			\
 	-r:ICSharpCode.SharpZipLib	\
 	-r:Mono.Posix
diff --git a/extensions/Exporters/GalleryExport/Makefile.am b/extensions/Exporters/GalleryExport/Makefile.am
index 5cc9247..55bfdfa 100644
--- a/extensions/Exporters/GalleryExport/Makefile.am
+++ b/extensions/Exporters/GalleryExport/Makefile.am
@@ -19,7 +19,6 @@ REFS =					\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GIOSHARP)				\
 	$(LINK_GTKSHARPBEANS)		\
-	$(LINK_DBUS)				\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index 45e3bac..4b39ee2 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -19,7 +19,6 @@ REFS =					\
 	$(LINK_MONO_ADDINS)		\
 	$(LINK_GIOSHARP)			\
 	$(LINK_GPHOTO2)			\
-	$(LINK_DBUS)			\
 	-r:System.Web			\
 	-r:Mono.Posix
 
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 397461f..5e2d8b6 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -20,7 +20,6 @@ REFS =					\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GTKSHARPBEANS)		\
 	$(LINK_KEYRING)			\
-	$(LINK_DBUS)			\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index b7465d6..b4ffd33 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -29,7 +29,6 @@ REFS = \
 	$(LINK_GIOSHARP)						\
 	$(LINK_GTKSHARPBEANS)		\	
 	$(LINK_GPHOTO2)						\
-	$(LINK_DBUS)						\
 	-r:Mono.Posix.dll
 
 PKGS = \
diff --git a/extensions/Exporters/ZipExport/Makefile.am b/extensions/Exporters/ZipExport/Makefile.am
index 2038887..b7d3bd3 100644
--- a/extensions/Exporters/ZipExport/Makefile.am
+++ b/extensions/Exporters/ZipExport/Makefile.am
@@ -16,7 +16,6 @@ REFS =					\
 	$(LINK_SEMWEB)				\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_GPHOTO2)				\
-	$(LINK_DBUS)				\
 	-r:System.Web			\
 	-r:ICSharpCode.SharpZipLib	\
 	-r:Mono.Posix
diff --git a/extensions/Services/BeagleService/Makefile.am b/extensions/Services/BeagleService/Makefile.am
index ca96442..648c945 100644
--- a/extensions/Services/BeagleService/Makefile.am
+++ b/extensions/Services/BeagleService/Makefile.am
@@ -19,7 +19,6 @@ REFS =					\
 	$(LINK_SEMWEB)				\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GIOSHARP)			\
-	$(LINK_DBUS)				\
 	$(LINK_BEAGLE)
 
 PKGS =
diff --git a/extensions/Services/DBusService/Makefile.am b/extensions/Services/DBusService/Makefile.am
index ddd59c8..b1485ae 100644
--- a/extensions/Services/DBusService/Makefile.am
+++ b/extensions/Services/DBusService/Makefile.am
@@ -17,7 +17,7 @@ REFS =					\
 	-r:$(top_builddir)/src/FSpot.Core.dll	\
 	-r:$(top_builddir)/src/FSpot.Utils.dll	\
 	-r:$(top_builddir)/src/FSpot.Query.dll	\
-	$(LINK_DBUS)				\
+	$(NDESK_DBUS_LIBS)				\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_SEMWEB)				\
 	$(LINK_GIOSHARP)				\
diff --git a/extensions/Tools/ChangePhotoPath/Makefile.am b/extensions/Tools/ChangePhotoPath/Makefile.am
index 25f84f9..51c6bea 100755
--- a/extensions/Tools/ChangePhotoPath/Makefile.am
+++ b/extensions/Tools/ChangePhotoPath/Makefile.am
@@ -20,7 +20,6 @@ REFS =					\
 	$(LINK_SEMWEB)				\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_GIOSHARP)			\
-	$(LINK_DBUS)			\
 	$(LINK_GPHOTO2)
 
 PKGS =					\
diff --git a/extensions/Tools/DevelopInUFraw/Makefile.am b/extensions/Tools/DevelopInUFraw/Makefile.am
index 0401059..b04e742 100644
--- a/extensions/Tools/DevelopInUFraw/Makefile.am
+++ b/extensions/Tools/DevelopInUFraw/Makefile.am
@@ -19,7 +19,6 @@ REFS =					\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_GTKSHARPBEANS)			\
 	$(LINK_GIOSHARP)			\
-	$(LINK_DBUS)			\
 	$(LINK_GPHOTO2)
 
 PKGS =					\
diff --git a/extensions/Tools/HashJob/Makefile.am b/extensions/Tools/HashJob/Makefile.am
index 7e65c49..733f100 100644
--- a/extensions/Tools/HashJob/Makefile.am
+++ b/extensions/Tools/HashJob/Makefile.am
@@ -19,7 +19,6 @@ REFS =					\
 	$(LINK_SEMWEB)				\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_GIOSHARP)			\
-	$(LINK_DBUS)			\
 	$(LINK_GPHOTO2)
 
 PKGS =					\
diff --git a/extensions/Tools/MergeDb/Makefile.am b/extensions/Tools/MergeDb/Makefile.am
index ae17a84..76220de 100644
--- a/extensions/Tools/MergeDb/Makefile.am
+++ b/extensions/Tools/MergeDb/Makefile.am
@@ -20,7 +20,6 @@ REFS =					\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_SEMWEB)				\
 	$(LINK_GIOSHARP)				\
-	$(LINK_DBUS)				\
 	$(LINK_GPHOTO2)
 
 PKGS =					\
diff --git a/extensions/Tools/RawPlusJpeg/Makefile.am b/extensions/Tools/RawPlusJpeg/Makefile.am
index ff38c46..c4cb3e9 100644
--- a/extensions/Tools/RawPlusJpeg/Makefile.am
+++ b/extensions/Tools/RawPlusJpeg/Makefile.am
@@ -17,7 +17,6 @@ REFS =					\
 	-r:$(top_builddir)/src/FSpot.Query.dll	\
 	$(LINK_SEMWEB)				\
 	$(LINK_MONO_ADDINS)			\
-	$(LINK_DBUS)			\
 	$(LINK_GPHOTO2)
 
 PKGS =					\
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c6d69f9..df62a91 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,13 +14,9 @@ UNCONDITIONAL_SUBDIRS = \
 	semweb				\
 	Tao
 
-# Depending on whether the packaged ndesk-dbus is used, we might not want to
-# build it, but we will always want to ship it. Also, dpap-sharp isn't built,
-# but it is shipped.
+# dpap-sharp isn't built, but it is shipped.
 
 SUBDIRS = 				\
-	$(DIR_DBUS)			\
-	$(DIR_DBUS_GLIB)	\
 	$(UNCONDITIONAL_SUBDIRS)
 
 DIST_SUBDIRS = 			\
diff --git a/lib/gnome-keyring-sharp/Makefile.am b/lib/gnome-keyring-sharp/Makefile.am
index 4469d5b..309fd2f 100644
--- a/lib/gnome-keyring-sharp/Makefile.am
+++ b/lib/gnome-keyring-sharp/Makefile.am
@@ -20,7 +20,7 @@ ASSEMBLY_SOURCES =			\
 	$(srcdir)/ResultCode.cs  	\
 	$(srcdir)/Ring.cs  
 
-REFS = -r:Mono.Posix $(LINK_DBUS)
+REFS = -r:Mono.Posix $(NDESK_DBUS_LIBS)
 
 PKGS =
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5bafde7..547ac69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -337,8 +337,7 @@ UTILS_ASSEMBLIES =				\
 	-r:Mono.Posix				\
 	-r:Mono.Cairo				\
 	$(LINK_GLITZ)				\
-	$(GCONF_PKG)				\
-	$(LINK_DBUS)
+	$(GCONF_PKG)
 
 JOBSCHEDULER_ASSEMBLIES =			\
 	-r:FSpot.Utils.dll
@@ -364,7 +363,7 @@ GNOME_PLATFORM_ASSEMBLIES =			\
 	-pkg:gnome-sharp-2.0			\
 	-pkg:gtk-sharp-2.0			\
 	-pkg:gconf-sharp-2.0			\
-	$(LINK_DBUS)				\
+	$(NDESK_DBUS_LIBS)				\
 	-r:Mono.Posix				\
 	-r:FSpot.Utils.dll
 
@@ -372,7 +371,6 @@ NULL_PLATFORM_ASSEMBLIES =			\
 	-r:FSpot.Utils.dll
 
 F_SPOT_ASSEMBLIES = 				\
-	$(LINK_DBUS)				\
 	$(LINK_GPHOTO2)				\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_FLICKR)				\
@@ -398,6 +396,7 @@ F_SPOT_ASSEMBLIES = 				\
 	-r:FSpot.Platform.dll			\
 	-r:Cms.dll				\
 	$(NUNIT_LIBS)				\
+	$(NDESK_DBUS_LIBS)				\
 	$(GCONF_PKG)				\
 	$(GTKHTML_SHARP_PKG)			\
 	-pkg:glade-sharp-2.0			\
diff --git a/src/f-spot.in b/src/f-spot.in
index 8fa79c5..b552766 100644
--- a/src/f-spot.in
+++ b/src/f-spot.in
@@ -60,7 +60,7 @@ for arg in "$@"; do
 	x--uninstalled)
 	    echo "*** Running uninstalled f-spot ***"
 	    EXE_TO_RUN="./f-spot.exe"
-	    export MONO_PATH= PATH_DBUS@../lib/Tao/Tao.OpenGl:../lib/Tao/Tao.OpenGl.Glu:../lib/Tao/Tao.OpenGl.ExtensionLoader:../lib/gnome-keyring-sharp:../lib/libgphoto2-sharp:../lib/semweb:../lib/glitz-sharp/src/:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../lib/gio-sharp/gio:../lib/gtk-sharp-beans:$MONO_PATH
+	    export MONO_PATH=../lib/Tao/Tao.OpenGl:../lib/Tao/Tao.OpenGl.Glu:../lib/Tao/Tao.OpenGl.ExtensionLoader:../lib/gnome-keyring-sharp:../lib/libgphoto2-sharp:../lib/semweb:../lib/glitz-sharp/src/:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../lib/gio-sharp/gio:../lib/gtk-sharp-beans:$MONO_PATH
 	    ;;
     esac
 done
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index 6ee60de..0cb9272 100644
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -25,7 +25,6 @@ REFS =										\
 	$(LINK_GPHOTO2)							\
 	$(LINK_MONO_ADDINS)						\
 	$(LINK_GIOSHARP)						\
-	$(LINK_DBUS)						\
 	-r:$(top_builddir)/src/f-spot.exe			\
 	-r:$(top_builddir)/src/FSpot.Core.dll		\
 	-r:$(top_builddir)/src/FSpot.Query.dll	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]