| 1 |
maksbotan 14/09/30 17:22:50 |
| 2 |
|
| 3 |
Added: clementine-1.2.3-namespaces.patch |
| 4 |
Log: |
| 5 |
Add upstream patch to fix bug #518312. Thanks to Nikoli. |
| 6 |
|
| 7 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-sound/clementine/files/clementine-1.2.3-namespaces.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/clementine/files/clementine-1.2.3-namespaces.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/clementine/files/clementine-1.2.3-namespaces.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: clementine-1.2.3-namespaces.patch |
| 16 |
=================================================================== |
| 17 |
From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Chocobozzz <florian.chocobo@×××××.com> |
| 19 |
Date: Wed, 16 Jul 2014 15:57:25 +0200 |
| 20 |
Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401 |
| 21 |
|
| 22 |
--- |
| 23 |
src/CMakeLists.txt | 9 ++++----- |
| 24 |
1 file changed, 4 insertions(+), 5 deletions(-) |
| 25 |
|
| 26 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 27 |
index 650fa74..775b0a5 100644 |
| 28 |
--- a/src/CMakeLists.txt |
| 29 |
+++ b/src/CMakeLists.txt |
| 30 |
@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp) |
| 31 |
if(HAVE_DBUS) |
| 32 |
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) |
| 33 |
|
| 34 |
- # Hack to get it to generate interfaces without namespaces - required |
| 35 |
- # because otherwise org::freedesktop::UDisks and |
| 36 |
- # org::freedesktop::UDisks::Device conflict. |
| 37 |
- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) |
| 38 |
- |
| 39 |
# MPRIS DBUS interfaces |
| 40 |
qt4_add_dbus_adaptor(SOURCES |
| 41 |
dbus/org.freedesktop.MediaPlayer.player.xml |
| 42 |
@@ -964,6 +959,10 @@ if(HAVE_DBUS) |
| 43 |
|
| 44 |
# DeviceKit DBUS interfaces |
| 45 |
if(HAVE_DEVICEKIT) |
| 46 |
+ set_source_files_properties(dbus/org.freedesktop.UDisks.xml |
| 47 |
+ PROPERTIES NO_NAMESPACE dbus/udisks) |
| 48 |
+ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml |
| 49 |
+ PROPERTIES NO_NAMESPACE dbus/udisksdevice) |
| 50 |
qt4_add_dbus_interface(SOURCES |
| 51 |
dbus/org.freedesktop.UDisks.xml |
| 52 |
dbus/udisks) |
Archives