summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/clementine-libre/PKGBUILD16
-rw-r--r--libre/clementine-libre/udisks-namespace.patch38
2 files changed, 50 insertions, 4 deletions
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index a54b2b1ad..1f33f40c5 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110102 2014-04-24 07:51:18Z alucryd $
+# $Id: PKGBUILD 117584 2014-08-18 23:42:44Z alucryd $
# Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
# Contributor (Arch): Stéphane Gaudreault <stephane@archlinux.org>
# Contributor (Arch): BlackEagle <ike.devolder@gmail.com>
@@ -10,7 +10,7 @@
_pkgname=clementine
pkgname=clementine-libre
pkgver=1.2.3
-pkgrel=1
+pkgrel=2
pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support'
url='http://www.clementine-player.org/'
license=('GPL')
@@ -29,11 +29,13 @@ install="${_pkgname}.install"
mksource=("${_pkgname}-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"
'remove-nonfree-artwork-and-spotify.patch'
'moognu.png')
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'udisks-namespace.patch')
mksha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf'
'48bfbf42c84ac1891021638627c10780194fcc59eda1c69e157be3aebe8ee10b'
'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
-sha256sums=('c68275373b839b5b256b813b5bed85d501f94e12bef3dd8ed69e90094af3f769')
+sha256sums=('c68275373b839b5b256b813b5bed85d501f94e12bef3dd8ed69e90094af3f769'
+ 'a7c2764576cee303a57e4efe6a5dbd583a66de8a15aee738bd92d4bb21786008')
mksource() {
cd Clementine-${pkgver}
@@ -61,6 +63,12 @@ mksource() {
touch data/schema/schema-30.sql
}
+prepare() {
+ cd Clementine-${pkgver}
+
+ patch -Np1 -i ../udisks-namespace.patch
+}
+
build() {
cd Clementine-${pkgver}
diff --git a/libre/clementine-libre/udisks-namespace.patch b/libre/clementine-libre/udisks-namespace.patch
new file mode 100644
index 000000000..e74889e78
--- /dev/null
+++ b/libre/clementine-libre/udisks-namespace.patch
@@ -0,0 +1,38 @@
+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)
+--
+2.0.3