wok-6.x view clementine/stuff/udisks-namespace.patch @ rev 19832

Up apulse (0.1.8+ae3ea44)
author Xander Ziiryanoff <psychomaniak@xakep.ru>
date Fri Mar 10 20:46:32 2017 +0100 (2017-03-10)
parents
children
line source
1 ---
2 src/CMakeLists.txt | 9 ++++-----
3 1 file changed, 4 insertions(+), 5 deletions(-)
4
5 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
6 index 650fa74..775b0a5 100644
7 --- a/src/CMakeLists.txt
8 +++ b/src/CMakeLists.txt
9 @@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
10 if(HAVE_DBUS)
11 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
12
13 - # Hack to get it to generate interfaces without namespaces - required
14 - # because otherwise org::freedesktop::UDisks and
15 - # org::freedesktop::UDisks::Device conflict.
16 - list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
17 -
18 # MPRIS DBUS interfaces
19 qt4_add_dbus_adaptor(SOURCES
20 dbus/org.freedesktop.MediaPlayer.player.xml
21 @@ -964,6 +959,10 @@ if(HAVE_DBUS)
22
23 # DeviceKit DBUS interfaces
24 if(HAVE_DEVICEKIT)
25 + set_source_files_properties(dbus/org.freedesktop.UDisks.xml
26 + PROPERTIES NO_NAMESPACE dbus/udisks)
27 + set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
28 + PROPERTIES NO_NAMESPACE dbus/udisksdevice)
29 qt4_add_dbus_interface(SOURCES
30 dbus/org.freedesktop.UDisks.xml
31 dbus/udisks)
32 --
33 2.0.3