diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-04 02:04:13 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-04 02:04:13 -0300 |
commit | 0a088f3c285e53ee377271f42c16071e3ee5bafd (patch) | |
tree | ee094061e4ec6cd7808201f3c75c7f343ef3ba3a /libre/clementine/udisks-namespace.patch | |
parent | 0be822175bb3cef0534b9a0597e84ae1ee6374ec (diff) | |
parent | 035f2fd609cd247ac0430f15cad3af94ce79f5f8 (diff) | |
download | abslibre-0a088f3c285e53ee377271f42c16071e3ee5bafd.tar.gz abslibre-0a088f3c285e53ee377271f42c16071e3ee5bafd.tar.bz2 abslibre-0a088f3c285e53ee377271f42c16071e3ee5bafd.zip |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
Diffstat (limited to 'libre/clementine/udisks-namespace.patch')
-rw-r--r-- | libre/clementine/udisks-namespace.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/libre/clementine/udisks-namespace.patch b/libre/clementine/udisks-namespace.patch new file mode 100644 index 000000000..e74889e78 --- /dev/null +++ b/libre/clementine/udisks-namespace.patch @@ -0,0 +1,38 @@ +From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001 +From: Chocobozzz <florian.chocobo@gmail.com> +Date: Wed, 16 Jul 2014 15:57:25 +0200 +Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401 + +--- + src/CMakeLists.txt | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 650fa74..775b0a5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp) + if(HAVE_DBUS) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) + +- # Hack to get it to generate interfaces without namespaces - required +- # because otherwise org::freedesktop::UDisks and +- # org::freedesktop::UDisks::Device conflict. +- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) +- + # MPRIS DBUS interfaces + qt4_add_dbus_adaptor(SOURCES + dbus/org.freedesktop.MediaPlayer.player.xml +@@ -964,6 +959,10 @@ if(HAVE_DBUS) + + # DeviceKit DBUS interfaces + if(HAVE_DEVICEKIT) ++ set_source_files_properties(dbus/org.freedesktop.UDisks.xml ++ PROPERTIES NO_NAMESPACE dbus/udisks) ++ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml ++ PROPERTIES NO_NAMESPACE dbus/udisksdevice) + qt4_add_dbus_interface(SOURCES + dbus/org.freedesktop.UDisks.xml + dbus/udisks) +-- +2.0.3 |