mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00
Code Issues Releases Activity

Fix the build with new glib-2.26 glibmm

Browse Source
This commit is contained in:
Koop Mast 2010-11-23 12:37:57 +00:00
parent af2ae32ee8
commit f7804e9689
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=264995
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
audio/mangler/files/patch-src_manglerintegration.cpp Normal file
View File

@ -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;
}

18
audio/mangler/files/patch-src_manglerintegration.h Normal file
View File

@ -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>