* [gentoo-commits] gentoo-x86 commit in media-sound/clementine/files: clementine-1.2.3-namespaces.patch
@ 2014-09-30 17:22 Maxim Koltsov (maksbotan)
0 siblings, 0 replies; only message in thread
From: Maxim Koltsov (maksbotan) @ 2014-09-30 17:22 UTC (permalink / raw
To: gentoo-commits
maksbotan 14/09/30 17:22:50
Added: clementine-1.2.3-namespaces.patch
Log:
Add upstream patch to fix bug #518312. Thanks to Nikoli.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
Revision Changes Path
1.1 media-sound/clementine/files/clementine-1.2.3-namespaces.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/clementine/files/clementine-1.2.3-namespaces.patch?rev=1.1&view=markup
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
Index: clementine-1.2.3-namespaces.patch
===================================================================
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)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-30 17:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-30 17:22 [gentoo-commits] gentoo-x86 commit in media-sound/clementine/files: clementine-1.2.3-namespaces.patch Maxim Koltsov (maksbotan)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox