clementine-1.2.3-udisks-namespace.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
  2. From: Chocobozzz <florian.chocobo@gmail.com>
  3. Date: Wed, 16 Jul 2014 15:57:25 +0200
  4. Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
  5. ---
  6. src/CMakeLists.txt | 9 ++++-----
  7. 1 file changed, 4 insertions(+), 5 deletions(-)
  8. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
  9. index 650fa74..775b0a5 100644
  10. --- a/src/CMakeLists.txt
  11. +++ b/src/CMakeLists.txt
  12. @@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
  13. if(HAVE_DBUS)
  14. file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
  15. - # Hack to get it to generate interfaces without namespaces - required
  16. - # because otherwise org::freedesktop::UDisks and
  17. - # org::freedesktop::UDisks::Device conflict.
  18. - list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
  19. -
  20. # MPRIS DBUS interfaces
  21. qt4_add_dbus_adaptor(SOURCES
  22. dbus/org.freedesktop.MediaPlayer.player.xml
  23. @@ -964,6 +959,10 @@ if(HAVE_DBUS)
  24. # DeviceKit DBUS interfaces
  25. if(HAVE_DEVICEKIT)
  26. + set_source_files_properties(dbus/org.freedesktop.UDisks.xml
  27. + PROPERTIES NO_NAMESPACE dbus/udisks)
  28. + set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
  29. + PROPERTIES NO_NAMESPACE dbus/udisksdevice)
  30. qt4_add_dbus_interface(SOURCES
  31. dbus/org.freedesktop.UDisks.xml
  32. dbus/udisks)
  33. --
  34. 2.0.3