SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/clementine/stuff/udisks-namespace.patch	Wed Mar 16 20:46:18 2016 +0200
     1.3 @@ -0,0 +1,33 @@
     1.4 +---
     1.5 + src/CMakeLists.txt | 9 ++++-----
     1.6 + 1 file changed, 4 insertions(+), 5 deletions(-)
     1.7 +
     1.8 +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
     1.9 +index 650fa74..775b0a5 100644
    1.10 +--- a/src/CMakeLists.txt
    1.11 ++++ b/src/CMakeLists.txt
    1.12 +@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
    1.13 + if(HAVE_DBUS)
    1.14 +   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
    1.15 + 
    1.16 +-  # Hack to get it to generate interfaces without namespaces - required
    1.17 +-  # because otherwise org::freedesktop::UDisks and
    1.18 +-  # org::freedesktop::UDisks::Device conflict.
    1.19 +-  list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
    1.20 +-
    1.21 +   # MPRIS DBUS interfaces
    1.22 +   qt4_add_dbus_adaptor(SOURCES
    1.23 +       dbus/org.freedesktop.MediaPlayer.player.xml
    1.24 +@@ -964,6 +959,10 @@ if(HAVE_DBUS)
    1.25 + 
    1.26 +   # DeviceKit DBUS interfaces
    1.27 +   if(HAVE_DEVICEKIT)
    1.28 ++    set_source_files_properties(dbus/org.freedesktop.UDisks.xml
    1.29 ++        PROPERTIES NO_NAMESPACE dbus/udisks)
    1.30 ++    set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
    1.31 ++        PROPERTIES NO_NAMESPACE dbus/udisksdevice)
    1.32 +     qt4_add_dbus_interface(SOURCES
    1.33 +         dbus/org.freedesktop.UDisks.xml
    1.34 +         dbus/udisks)
    1.35 +-- 
    1.36 +2.0.3