[Pkg-cli-apps-commits] [gshare] 02/04: Update 02_external-ndesk-dbus.patch to use dbus# 2.0
Chow Loong Jin
hyperair at debian.org
Fri Nov 6 06:12:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
hyperair pushed a commit to branch master
in repository gshare.
commit 24cfe662b5f31bf2c3addc6cadbb70d3ed85deb5
Author: Chow Loong Jin <hyperair at debian.org>
Date: Thu Nov 5 19:31:05 2015 +0800
Update 02_external-ndesk-dbus.patch to use dbus# 2.0
---
debian/patches/02_external-dbus-sharp.patch | 184 ++++++++++++++++++++++++++++
debian/patches/02_external-ndesk-dbus.patch | 135 --------------------
debian/patches/series | 2 +-
3 files changed, 185 insertions(+), 136 deletions(-)
diff --git a/debian/patches/02_external-dbus-sharp.patch b/debian/patches/02_external-dbus-sharp.patch
new file mode 100644
index 0000000..8460f0f
--- /dev/null
+++ b/debian/patches/02_external-dbus-sharp.patch
@@ -0,0 +1,184 @@
+Index: gshare/configure.ac
+===================================================================
+--- gshare.orig/configure.ac 2015-11-06 11:52:20.183464890 +0800
++++ gshare/configure.ac 2015-11-06 11:52:20.158464906 +0800
+@@ -87,6 +87,17 @@
+ PKG_CHECK_MODULES(AVAHISHARP, avahi-sharp >= 0.6.5)
+
+ dnl
++dnl Check for external DBus#, fallback to internal
++dnl
++
++PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-2.0 \
++ dbus-sharp-glib-2.0 >= 0.3, have_external_dbus="yes", have_external_dbus="no")
++if test "x$have_external_dbus" != "xyes"; then
++ AC_MSG_RESULT([using internal copy])
++fi
++AM_CONDITIONAL(EXTERNAL_DBUS, test "x$have_external_dbus" = "xyes")
++
++dnl
+ dnl Check which of our own compilation flags are used
+ dnl
+
+Index: gshare/src/gshared/Makefile.am
+===================================================================
+--- gshare.orig/src/gshared/Makefile.am 2015-11-06 11:52:20.183464890 +0800
++++ gshare/src/gshared/Makefile.am 2015-11-06 11:52:20.179464893 +0800
+@@ -7,6 +7,13 @@
+ DISTCLEANFILES = AssemblyInfo.cs
+ MAINTAINERCLEANFILES = Makefile.in
+
++if EXTERNAL_DBUS
++DBUS_SHARP_ASSEMBLIES = $(DBUS_SHARP_LIBS)
++else
++DBUS_SHARP_ASSEMBLIES = \
++ -r:../ndesk/NDesk.DBus.dll \
++ -r:../ndesk/NDesk.DBus.GLib.dll
++endif
+
+ gsharedaemon_sources = \
+ daemon.cs \
+@@ -24,8 +31,7 @@
+ -pkg:avahi-sharp,gconf-sharp-2.0,gtk-sharp-2.0 \
+ -r:Mono.Posix \
+ -r:../gsharelib/gsharelib.dll \
+- -r:../ndesk/NDesk.DBus.dll \
+- -r:../ndesk/NDesk.DBus.GLib.dll \
++ $(DBUS_SHARP_ASSEMBLIES) \
+ -target:exe \
+ -out:$@ $(gsharedaemon_build_sources)
+
+Index: gshare/src/gsharelib/Makefile.am
+===================================================================
+--- gshare.orig/src/gsharelib/Makefile.am 2015-11-06 11:52:20.183464890 +0800
++++ gshare/src/gsharelib/Makefile.am 2015-11-06 11:52:20.180464893 +0800
+@@ -6,6 +6,14 @@
+ DISTCLEANFILES = AssemblyInfo.cs
+ MAINTAINERCLEANFILES = Makefile.in
+
++if EXTERNAL_DBUS
++DBUS_SHARP_ASSEMBLIES = $(DBUS_SHARP_LIBS)
++else
++DBUS_SHARP_ASSEMBLIES = \
++ -r:../ndesk/NDesk.DBus.dll \
++ -r:../ndesk/NDesk.DBus.GLib.dll
++endif
++
+ gsharelib_sources_in = AssemblyInfo.cs.in consts.cs.in
+ gsharelib_sources = \
+ interfaces.cs \
+@@ -28,8 +36,7 @@
+ $(MCS) $(MCS_OPTIONS) $(CS_DEFINES) \
+ -pkg:glib-sharp-2.0,gnome-sharp-2.0 \
+ -r:Mono.Posix \
+- -r:../ndesk/NDesk.DBus.dll \
+- -r:../ndesk/NDesk.DBus.GLib.dll \
++ $(DBUS_SHARP_ASSEMBLIES) \
+ -target:library \
+ -out:$@ $(gsharelib_build_sources)
+
+Index: gshare/src/gshare-manager/Makefile.am
+===================================================================
+--- gshare.orig/src/gshare-manager/Makefile.am 2015-11-06 11:52:20.183464890 +0800
++++ gshare/src/gshare-manager/Makefile.am 2015-11-06 11:52:20.180464893 +0800
+@@ -5,6 +5,14 @@
+ CLEANFILES = gshare-manager.exe
+ MAINTAINERCLEANFILES = Makefile.in
+
++if EXTERNAL_DBUS
++DBUS_SHARP_ASSEMBLIES = $(DBUS_SHARP_LIBS)
++else
++DBUS_SHARP_ASSEMBLIES = \
++ -r:../ndesk/NDesk.DBus.dll \
++ -r:../ndesk/NDesk.DBus.GLib.dll
++endif
++
+ gsharemanager_sources = \
+ manager.cs
+
+@@ -15,8 +23,7 @@
+ -pkg:glade-sharp-2.0,gnome-sharp-2.0 \
+ -r:../gsharelib/gsharelib.dll \
+ -r:Mono.Posix \
+- -r:../ndesk/NDesk.DBus.dll \
+- -r:../ndesk/NDesk.DBus.GLib.dll \
++ $(DBUS_SHARP_ASSEMBLIES) \
+ -resource:../resources/gshare-manager.glade \
+ -target:exe \
+ -out:$@ $(gsharemanager_build_sources)
+Index: gshare/src/ndesk/Makefile.am
+===================================================================
+--- gshare.orig/src/ndesk/Makefile.am 2015-11-06 11:52:20.183464890 +0800
++++ gshare/src/ndesk/Makefile.am 2015-11-06 11:52:20.180464893 +0800
+@@ -1,15 +1,16 @@
+ DBUS_ASSEMBLY = NDesk.DBus.dll
+ DBUS_GLIB_ASSEMBLY = NDesk.DBus.GLib.dll
+
++DBUS_SRC = $(srcdir)/dbus/*.cs
++DBUS_GLIB_SRC = $(srcdir)/glib/*.cs
++
++if !EXTERNAL_DBUS
+ dbusdir = $(pkglibdir)
+ dbus_SCRIPTS = \
+ $(DBUS_ASSEMBLY) \
+ $(DBUS_GLIB_ASSEMBLY) \
+ $(DBUS_GLIB_ASSEMBLY).config
+
+-DBUS_SRC = $(srcdir)/dbus/*.cs
+-DBUS_GLIB_SRC = $(srcdir)/glib/*.cs
+-
+ all: $(DBUS_ASSEMBLY) $(DBUS_GLIB_ASSEMBLY)
+
+ $(DBUS_ASSEMBLY): $(DBUS_SRC)
+@@ -17,6 +18,7 @@
+
+ $(DBUS_GLIB_ASSEMBLY): $(DBUS_GLIB_SRC)
+ $(MCS) $(MCS_OPTIONS) -target:library -out:$@ -r:$(DBUS_ASSEMBLY) $(DBUS_GLIB_SRC)
++endif
+
+ EXTRA_DIST = $(DBUS_SRC) $(DBUS_GLIB_SRC) $(DBUS_GLIB_ASSEMBLY).config
+ DISTCLEANFILES = $(DBUS_ASSEMBLY) $(DBUS_ASSEMBLY).mdb $(DBUS_GLIB_ASSEMBLY) $(DBUS_GLIB_ASSEMBLY).mdb
+Index: gshare/src/gshared/daemon.cs
+===================================================================
+--- gshare.orig/src/gshared/daemon.cs 2015-11-06 11:52:20.183464890 +0800
++++ gshare/src/gshared/daemon.cs 2015-11-06 11:52:20.180464893 +0800
+@@ -31,7 +31,7 @@
+ using GConf;
+ using Mono.Unix;
+ using Avahi;
+-using NDesk.DBus;
++using DBus;
+
+ using GShare.FTP;
+
+Index: gshare/src/gsharelib/dbus.cs
+===================================================================
+--- gshare.orig/src/gsharelib/dbus.cs 2015-11-06 11:52:20.183464890 +0800
++++ gshare/src/gsharelib/dbus.cs 2015-11-06 12:10:52.323726322 +0800
+@@ -25,7 +25,7 @@
+
+ using System;
+
+-using NDesk.DBus;
++using DBus;
+ using org.freedesktop.DBus;
+
+ namespace GShare
+@@ -117,7 +117,7 @@
+ if (ServiceRunning())
+ return;
+
+- Bus.Session.Register(BUS_NAME,new ObjectPath(DBUS_OBJ_PATH),self);
++ Bus.Session.Register(new ObjectPath(DBUS_OBJ_PATH),self);
+ Bus.Session.RequestName(BUS_NAME);
+ }
+
+@@ -127,7 +127,7 @@
+ return;
+
+ Bus.Session.ReleaseName(BUS_NAME);
+- Bus.Session.Unregister(BUS_NAME,new ObjectPath(DBUS_OBJ_PATH));
++ Bus.Session.Unregister(new ObjectPath(DBUS_OBJ_PATH));
+ }
+
+ public void SetAllowAnonymousLogin(bool allowAnonymous)
diff --git a/debian/patches/02_external-ndesk-dbus.patch b/debian/patches/02_external-ndesk-dbus.patch
deleted file mode 100644
index ae2a9b1..0000000
--- a/debian/patches/02_external-ndesk-dbus.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff -Naur gshare-0.94-old/configure.ac gshare-0.94-automake/configure.ac
---- gshare-0.94-old/configure.ac 2007-02-25 04:33:44.000000000 +0100
-+++ gshare-0.94-automake/configure.ac 2007-02-25 23:23:21.943671000 +0100
-@@ -87,6 +87,17 @@
- PKG_CHECK_MODULES(AVAHISHARP, avahi-sharp >= 0.6.5)
-
- dnl
-+dnl Check for external NDesk.DBus, fallback to internal
-+dnl
-+
-+PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= 0.4 \
-+ ndesk-dbus-glib-1.0 >= 0.3, have_external_dbus="yes", have_external_dbus="no")
-+if test "x$have_external_dbus" != "xyes"; then
-+ AC_MSG_RESULT([using internal copy])
-+fi
-+AM_CONDITIONAL(EXTERNAL_DBUS, test "x$have_external_dbus" = "xyes")
-+
-+dnl
- dnl Check which of our own compilation flags are used
- dnl
-
-diff -Naur gshare-0.94-old/src/gshared/Makefile.am gshare-0.94-automake/src/gshared/Makefile.am
---- gshare-0.94-old/src/gshared/Makefile.am 2007-01-28 15:42:07.000000000 +0100
-+++ gshare-0.94-automake/src/gshared/Makefile.am 2007-02-25 23:23:54.769541000 +0100
-@@ -7,6 +7,13 @@
- DISTCLEANFILES = AssemblyInfo.cs
- MAINTAINERCLEANFILES = Makefile.in
-
-+if EXTERNAL_DBUS
-+NDESK_DBUS_ASSEMBLIES = $(NDESK_DBUS_LIBS)
-+else
-+NDESK_DBUS_ASSEMBLIES = \
-+ -r:../ndesk/NDesk.DBus.dll \
-+ -r:../ndesk/NDesk.DBus.GLib.dll
-+endif
-
- gsharedaemon_sources = \
- daemon.cs \
-@@ -24,8 +31,7 @@
- -pkg:avahi-sharp,gconf-sharp-2.0,gtk-sharp-2.0 \
- -r:Mono.Posix \
- -r:../gsharelib/gsharelib.dll \
-- -r:../ndesk/NDesk.DBus.dll \
-- -r:../ndesk/NDesk.DBus.GLib.dll \
-+ $(NDESK_DBUS_ASSEMBLIES) \
- -target:exe \
- -out:$@ $(gsharedaemon_build_sources)
-
-diff -Naur gshare-0.94-old/src/gsharelib/Makefile.am gshare-0.94-automake/src/gsharelib/Makefile.am
---- gshare-0.94-old/src/gsharelib/Makefile.am 2007-01-18 02:16:12.000000000 +0100
-+++ gshare-0.94-automake/src/gsharelib/Makefile.am 2007-02-25 23:26:04.064910000 +0100
-@@ -6,6 +6,14 @@
- DISTCLEANFILES = AssemblyInfo.cs
- MAINTAINERCLEANFILES = Makefile.in
-
-+if EXTERNAL_DBUS
-+NDESK_DBUS_ASSEMBLIES = $(NDESK_DBUS_LIBS)
-+else
-+NDESK_DBUS_ASSEMBLIES = \
-+ -r:../ndesk/NDesk.DBus.dll \
-+ -r:../ndesk/NDesk.DBus.GLib.dll
-+endif
-+
- gsharelib_sources_in = AssemblyInfo.cs.in consts.cs.in
- gsharelib_sources = \
- interfaces.cs \
-@@ -28,8 +36,7 @@
- $(MCS) $(MCS_OPTIONS) $(CS_DEFINES) \
- -pkg:glib-sharp-2.0,gnome-sharp-2.0 \
- -r:Mono.Posix \
-- -r:../ndesk/NDesk.DBus.dll \
-- -r:../ndesk/NDesk.DBus.GLib.dll \
-+ $(NDESK_DBUS_ASSEMBLIES) \
- -target:library \
- -out:$@ $(gsharelib_build_sources)
-
-diff -Naur gshare-0.94-old/src/gshare-manager/Makefile.am gshare-0.94-automake/src/gshare-manager/Makefile.am
---- gshare-0.94-old/src/gshare-manager/Makefile.am 2007-01-28 15:44:05.000000000 +0100
-+++ gshare-0.94-automake/src/gshare-manager/Makefile.am 2007-02-25 23:26:22.481959000 +0100
-@@ -5,6 +5,14 @@
- CLEANFILES = gshare-manager.exe
- MAINTAINERCLEANFILES = Makefile.in
-
-+if EXTERNAL_DBUS
-+NDESK_DBUS_ASSEMBLIES = $(NDESK_DBUS_LIBS)
-+else
-+NDESK_DBUS_ASSEMBLIES = \
-+ -r:../ndesk/NDesk.DBus.dll \
-+ -r:../ndesk/NDesk.DBus.GLib.dll
-+endif
-+
- gsharemanager_sources = \
- manager.cs
-
-@@ -15,8 +23,7 @@
- -pkg:glade-sharp-2.0,gnome-sharp-2.0 \
- -r:../gsharelib/gsharelib.dll \
- -r:Mono.Posix \
-- -r:../ndesk/NDesk.DBus.dll \
-- -r:../ndesk/NDesk.DBus.GLib.dll \
-+ $(NDESK_DBUS_ASSEMBLIES) \
- -resource:../resources/gshare-manager.glade \
- -target:exe \
- -out:$@ $(gsharemanager_build_sources)
-diff -Naur gshare-0.94-old/src/ndesk/Makefile.am gshare-0.94-automake/src/ndesk/Makefile.am
---- gshare-0.94-old/src/ndesk/Makefile.am 2007-01-18 00:50:05.000000000 +0100
-+++ gshare-0.94-automake/src/ndesk/Makefile.am 2007-02-25 23:21:43.874082000 +0100
-@@ -1,15 +1,16 @@
- DBUS_ASSEMBLY = NDesk.DBus.dll
- DBUS_GLIB_ASSEMBLY = NDesk.DBus.GLib.dll
-
-+DBUS_SRC = $(srcdir)/dbus/*.cs
-+DBUS_GLIB_SRC = $(srcdir)/glib/*.cs
-+
-+if !EXTERNAL_DBUS
- dbusdir = $(pkglibdir)
- dbus_SCRIPTS = \
- $(DBUS_ASSEMBLY) \
- $(DBUS_GLIB_ASSEMBLY) \
- $(DBUS_GLIB_ASSEMBLY).config
-
--DBUS_SRC = $(srcdir)/dbus/*.cs
--DBUS_GLIB_SRC = $(srcdir)/glib/*.cs
--
- all: $(DBUS_ASSEMBLY) $(DBUS_GLIB_ASSEMBLY)
-
- $(DBUS_ASSEMBLY): $(DBUS_SRC)
-@@ -17,6 +18,7 @@
-
- $(DBUS_GLIB_ASSEMBLY): $(DBUS_GLIB_SRC)
- $(MCS) $(MCS_OPTIONS) -target:library -out:$@ -r:$(DBUS_ASSEMBLY) $(DBUS_GLIB_SRC)
-+endif
-
- EXTRA_DIST = $(DBUS_SRC) $(DBUS_GLIB_SRC) $(DBUS_GLIB_ASSEMBLY).config
- DISTCLEANFILES = $(DBUS_ASSEMBLY) $(DBUS_ASSEMBLY).mdb $(DBUS_GLIB_ASSEMBLY) $(DBUS_GLIB_ASSEMBLY).mdb
diff --git a/debian/patches/series b/debian/patches/series
index b2af27a..4b20362 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
01_missing-file.patch
-02_external-ndesk-dbus.patch
+02_external-dbus-sharp.patch
03_invalid-cast.patch
04_firefox-permission-denied-crash.patch
10_mono-posix-20.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/gshare.git
More information about the Pkg-cli-apps-commits
mailing list