Date: Tuesday, August 19, 2014 @ 01:42:44 Author: alucryd Revision: 117584
glew rebuild: clementine 1.2.3-2 Added: clementine/trunk/udisks-namespace.patch Modified: clementine/trunk/PKGBUILD ------------------------+ PKGBUILD | 14 +++++++++++--- udisks-namespace.patch | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-18 23:21:03 UTC (rev 117583) +++ PKGBUILD 2014-08-18 23:42:44 UTC (rev 117584) @@ -6,7 +6,7 @@ pkgname=clementine pkgver=1.2.3 -pkgrel=1 +pkgrel=2 pkgdesc='A modern music player and library organizer' url='http://www.clementine-player.org/' license=('GPL') @@ -19,9 +19,17 @@ 'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries' 'gvfs: Various devices support') install="${pkgname}.install" -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz";) -sha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"; + 'udisks-namespace.patch') +sha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf' + 'a7c2764576cee303a57e4efe6a5dbd583a66de8a15aee738bd92d4bb21786008') +prepare() { + cd Clementine-${pkgver} + + patch -Np1 -i ../udisks-namespace.patch +} + build() { cd Clementine-${pkgver} Added: udisks-namespace.patch =================================================================== --- udisks-namespace.patch (rev 0) +++ udisks-namespace.patch 2014-08-18 23:42:44 UTC (rev 117584) @@ -0,0 +1,38 @@ +From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001 +From: Chocobozzz <[email protected]> +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 Property changes on: clementine/trunk/udisks-namespace.patch ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property
