From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F3D4113838B for ; Tue, 30 Sep 2014 17:22:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C149AE098F; Tue, 30 Sep 2014 17:22:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F39CE098F for ; Tue, 30 Sep 2014 17:22:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4722C3402AB for ; Tue, 30 Sep 2014 17:22:51 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2294) id 09975699F; Tue, 30 Sep 2014 17:22:50 +0000 (UTC) From: "Maxim Koltsov (maksbotan)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, maksbotan@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-sound/clementine/files: clementine-1.2.3-namespaces.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: clementine-1.2.3-namespaces.patch X-VCS-Directories: media-sound/clementine/files X-VCS-Committer: maksbotan X-VCS-Committer-Name: Maxim Koltsov Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140930172250.09975699F@oystercatcher.gentoo.org> Date: Tue, 30 Sep 2014 17:22:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1ff58d0d-4dbb-4dfc-b138-86c72308fd66 X-Archives-Hash: a98ae3b2de263a47b26128d90fa743b5 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 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)