Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (06975d89d79cfa393159c9a9c70b6b9b12c6f69c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (06975d89d79cfa393159c9a9c70b6b9b12c6f69c)
  • Date: Thu, 11 Jan 2007 10:03:09 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

utils/avahi/HISTORY | 5 +++++
utils/avahi/PRE_BUILD | 2 +-
utils/avahi/dbus.patch | 45 ---------------------------------------------
3 files changed, 6 insertions(+), 46 deletions(-)

New commits:
commit ff1799db1eedd39c6523bc065294a23397357e55
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

avahi- fix bug #13390

diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index 74592cb..e07a830 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,8 @@
+2007-01-11 Treeve Jelbert <treeve AT pi.be>
+ * PRE_BUILD: remove only dbus.patch
+ * dbus.patch: delete
+ fixes bug #13390
+
2006-12-30 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 0.6.16
SECURITY_PATCH++
diff --git a/utils/avahi/PRE_BUILD b/utils/avahi/PRE_BUILD
index 13aede8..e41287f 100755
--- a/utils/avahi/PRE_BUILD
+++ b/utils/avahi/PRE_BUILD
@@ -2,5 +2,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -p1 < $SPELL_DIRECTORY/qt.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/dbus.patch &&
+#patch -p0 < $SCRIPT_DIRECTORY/dbus.patch &&
autoreconf
diff --git a/utils/avahi/dbus.patch b/utils/avahi/dbus.patch
deleted file mode 100644
index 5fa0626..0000000
--- a/utils/avahi/dbus.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- avahi-daemon/dbus-protocol.c (revision 1299)
-+++ avahi-daemon/dbus-protocol.c (revision 1333)
-@@ -1068,8 +1068,8 @@
- server->bus,
- AVAHI_DBUS_NAME,
--#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
-+#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
-+ DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
-+#else
- DBUS_NAME_FLAG_DO_NOT_QUEUE,
--#else
-- DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
- #endif
- &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-@@ -1107,9 +1107,4 @@
-
- if (server->bus) {
--#ifdef HAVE_DBUS_CONNECTION_CLOSE
-- dbus_connection_close(server->bus);
--#else
-- dbus_connection_disconnect(server->bus);
--#endif
- dbus_connection_unref(server->bus);
- server->bus = NULL;
-@@ -1128,9 +1123,4 @@
-
- if (server->bus) {
--#ifdef HAVE_DBUS_CONNECTION_CLOSE
-- dbus_connection_close(server->bus);
--#else
-- dbus_connection_disconnect(server->bus);
--#endif
- dbus_connection_unref(server->bus);
- server->bus = NULL;
-@@ -1167,9 +1157,4 @@
- fail:
- if (server->bus) {
--#ifdef HAVE_DBUS_CONNECTION_CLOSE
-- dbus_connection_close(server->bus);
--#else
-- dbus_connection_disconnect(server->bus);
--#endif
- dbus_connection_unref(server->bus);
- }
-



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (06975d89d79cfa393159c9a9c70b6b9b12c6f69c), Treeve Jelbert, 01/11/2007

Archive powered by MHonArc 2.6.24.

Top of Page