wok-6.x annotate clementine/stuff/udisks-namespace.patch @ rev 22232
updated xorg-libXxf86dga and xorg-libXxf86dga-dev (1.1.4 -> 1.1.5)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Tue Nov 12 08:30:43 2019 +0100 (2019-11-12) |
| parents | |
| children |
| rev | line source |
|---|---|
| al@18983 | 1 --- |
| al@18983 | 2 src/CMakeLists.txt | 9 ++++----- |
| al@18983 | 3 1 file changed, 4 insertions(+), 5 deletions(-) |
| al@18983 | 4 |
| al@18983 | 5 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| al@18983 | 6 index 650fa74..775b0a5 100644 |
| al@18983 | 7 --- a/src/CMakeLists.txt |
| al@18983 | 8 +++ b/src/CMakeLists.txt |
| al@18983 | 9 @@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp) |
| al@18983 | 10 if(HAVE_DBUS) |
| al@18983 | 11 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) |
| al@18983 | 12 |
| al@18983 | 13 - # Hack to get it to generate interfaces without namespaces - required |
| al@18983 | 14 - # because otherwise org::freedesktop::UDisks and |
| al@18983 | 15 - # org::freedesktop::UDisks::Device conflict. |
| al@18983 | 16 - list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) |
| al@18983 | 17 - |
| al@18983 | 18 # MPRIS DBUS interfaces |
| al@18983 | 19 qt4_add_dbus_adaptor(SOURCES |
| al@18983 | 20 dbus/org.freedesktop.MediaPlayer.player.xml |
| al@18983 | 21 @@ -964,6 +959,10 @@ if(HAVE_DBUS) |
| al@18983 | 22 |
| al@18983 | 23 # DeviceKit DBUS interfaces |
| al@18983 | 24 if(HAVE_DEVICEKIT) |
| al@18983 | 25 + set_source_files_properties(dbus/org.freedesktop.UDisks.xml |
| al@18983 | 26 + PROPERTIES NO_NAMESPACE dbus/udisks) |
| al@18983 | 27 + set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml |
| al@18983 | 28 + PROPERTIES NO_NAMESPACE dbus/udisksdevice) |
| al@18983 | 29 qt4_add_dbus_interface(SOURCES |
| al@18983 | 30 dbus/org.freedesktop.UDisks.xml |
| al@18983 | 31 dbus/udisks) |
| al@18983 | 32 -- |
| al@18983 | 33 2.0.3 |