Revert "clementine: update to 1.3."
This reverts commit eb0bdf546c
.
broken during clean database initialization.
This commit is contained in:
parent
ff363464f5
commit
a286233e70
|
@ -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)
|
|
@ -1,13 +1,14 @@
|
|||
# Template file for 'clementine'
|
||||
pkgname=clementine
|
||||
version=1.3
|
||||
revision=1
|
||||
reverts=1.3_1
|
||||
version=1.2.3
|
||||
revision=5
|
||||
build_style=cmake
|
||||
hostmakedepends="git cmake sparsehash pkg-config"
|
||||
makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-devel
|
||||
makedepends="chromaprint-devel boost-devel gst-plugins-base-devel liblastfm-devel
|
||||
qt-devel glew-devel qjson-devel sqlite-devel protobuf-devel libplist-devel
|
||||
libusbmuxd-devel libmtp-devel libcdio-devel qca-devel pulseaudio-devel glu-devel
|
||||
taglib-devel crypto++-devel libspotify-devel libechonest-devel"
|
||||
taglib-devel"
|
||||
depends="desktop-file-utils"
|
||||
short_desc="A modern music player and library organizer"
|
||||
maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
|
||||
|
@ -15,9 +16,6 @@ license="GPL-3"
|
|||
homepage="https://www.clementine-player.org/"
|
||||
wrksrc="Clementine-$version"
|
||||
distfiles="https://github.com/clementine-player/Clementine/archive/$version.tar.gz"
|
||||
checksum=55e8d283ed02e3f2376a88b012cd2003e00fef95a98b6a919d67cb57e96b8617
|
||||
checksum=7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf
|
||||
patch_args="-p1"
|
||||
nopie=yes
|
||||
|
||||
pre_configure() {
|
||||
sed -i 's|AMAZON_CLOUD_DRIVE OFF|AMAZON_CLOUD_DRIVE ON|g' CMakeLists.txt
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue