diff options
| author |   Maxim Koltsov <maksbotan@gentoo.org> | 2014-09-30 17:22:50 +0000 |
|---|---|---|
| committer | Maxim Koltsov <maksbotan@gentoo.org> | 2014-09-30 17:22:50 +0000 |
| commit | 3c75d00d3c28b384c988192de23146d2ec37ad05 (patch) | |
| tree | 2a6208c71a72adace35d1b8dad78a17a064ef435 /media-sound/clementine | |
| parent | Add missing linux-info call, reported by BT in #522976 (diff) | |
| download | gentoo-2-3c75d00d3c28b384c988192de23146d2ec37ad05.tar.gz gentoo-2-3c75d00d3c28b384c988192de23146d2ec37ad05.tar.bz2 gentoo-2-3c75d00d3c28b384c988192de23146d2ec37ad05.zip | |
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)
Diffstat (limited to 'media-sound/clementine')
| -rw-r--r-- | media-sound/clementine/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/clementine/clementine-1.2.3.ebuild | 6 | ||||
| -rw-r--r-- | media-sound/clementine/files/clementine-1.2.3-namespaces.patch | 36 |
3 files changed, 46 insertions, 2 deletions
diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog index 449ee88a4763..8f132e8d891e 100644 --- a/media-sound/clementine/ChangeLog +++ b/media-sound/clementine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/clementine # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.94 2014/08/03 12:18:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.95 2014/09/30 17:22:50 maksbotan Exp $ + + 30 Sep 2014; Maxim Koltsov <maksbotan@gentoo.org> + +files/clementine-1.2.3-namespaces.patch, clementine-1.2.3.ebuild: + Add upstream patch to fix bug #518312. Thanks to Nikoli. 03 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> -clementine-1.0.1-r1.ebuild, -clementine-1.1.1.ebuild, diff --git a/media-sound/clementine/clementine-1.2.3.ebuild b/media-sound/clementine/clementine-1.2.3.ebuild index 7c6c67bdd863..897e8d1c7e8c 100644 --- a/media-sound/clementine/clementine-1.2.3.ebuild +++ b/media-sound/clementine/clementine-1.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.2.3.ebuild,v 1.2 2014/07/24 11:52:54 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.2.3.ebuild,v 1.3 2014/09/30 17:22:50 maksbotan Exp $ EAPI=5 @@ -90,6 +90,10 @@ RESTRICT="test" [[ ${PV} == *9999* ]] || \ S="${WORKDIR}/${P^}" +PATCHES=( + "${FILESDIR}"/clementine-1.2.3-namespaces.patch +) + src_prepare() { cmake-utils_src_prepare diff --git a/media-sound/clementine/files/clementine-1.2.3-namespaces.patch b/media-sound/clementine/files/clementine-1.2.3-namespaces.patch new file mode 100644 index 000000000000..2240debd0e4a --- /dev/null +++ b/media-sound/clementine/files/clementine-1.2.3-namespaces.patch @@ -0,0 +1,36 @@ +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) |