diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2010-11-23 12:37:57 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2010-11-23 12:37:57 +0000 |
| commit | f7804e96891dcc4bc5d51ce8999359a583b666f4 (patch) | |
| tree | 1aeb51a7b3214b6ca5ffcd04096935441c63fabc /audio/mangler | |
| parent | af2ae32ee8e49969ebcadb31b6e8786dd4c39396 (diff) | |
Notes
Diffstat (limited to 'audio/mangler')
| -rw-r--r-- | audio/mangler/files/patch-src_manglerintegration.cpp | 11 | ||||
| -rw-r--r-- | audio/mangler/files/patch-src_manglerintegration.h | 18 |
2 files changed, 29 insertions, 0 deletions
diff --git a/audio/mangler/files/patch-src_manglerintegration.cpp b/audio/mangler/files/patch-src_manglerintegration.cpp new file mode 100644 index 000000000000..2a5a6150a88b --- /dev/null +++ b/audio/mangler/files/patch-src_manglerintegration.cpp @@ -0,0 +1,11 @@ +--- src/manglerintegration.cpp.orig 2010-11-22 21:27:26.000000000 +0100 ++++ src/manglerintegration.cpp 2010-11-22 21:41:17.000000000 +0100 +@@ -197,7 +197,7 @@ + return NULL; + } + +- if (dbus_message_get_type(reply) != DBUS_MESSAGE_TYPE_METHOD_RETURN) { ++ if (dbus_message_get_type(reply) != Gio::DBUS_MESSAGE_TYPE_METHOD_RETURN) { + dbus_message_unref (reply); + return NULL; + } diff --git a/audio/mangler/files/patch-src_manglerintegration.h b/audio/mangler/files/patch-src_manglerintegration.h new file mode 100644 index 000000000000..f2419ceb1cab --- /dev/null +++ b/audio/mangler/files/patch-src_manglerintegration.h @@ -0,0 +1,18 @@ +--- src/manglerintegration.h.orig 2010-08-05 02:56:16.000000000 +0200 ++++ src/manglerintegration.h 2010-11-22 21:53:01.000000000 +0100 +@@ -37,6 +37,15 @@ + # include <dbus/dbus-glib.h> + # include <dbus/dbus-glib-lowlevel.h> + #endif ++/* bad I know but dbus clashes with gdbus. ++ * These are defined in dbus and giomm with the same values. ++ */ ++#undef DBUS_MESSAGE_TYPE_INVALID ++#undef DBUS_MESSAGE_TYPE_METHOD_CALL ++#undef DBUS_MESSAGE_TYPE_METHOD_RETURN ++#undef DBUS_MESSAGE_TYPE_ERROR ++#undef DBUS_MESSAGE_TYPE_SIGNAL ++ + #include <glib.h> + #include <gtkmm.h> + #include <string.h> |