parent
cd4d0c72a8
commit
0322f66307
@ -1,14 +0,0 @@ |
||||
diff -ur clementine-1.2.1-a/CMakeLists.txt clementine-1.2.1-b/CMakeLists.txt
|
||||
--- clementine-1.2.1-a/CMakeLists.txt 2013-11-25 15:16:24.000000000 -0600
|
||||
+++ clementine-1.2.1-b/CMakeLists.txt 2013-12-30 17:01:48.470011058 -0600
|
||||
@@ -158,6 +158,10 @@
|
||||
include_directories(${TAGLIB_INCLUDE_DIRS})
|
||||
include_directories(${QJSON_INCLUDE_DIRS})
|
||||
include_directories(${GSTREAMER_INCLUDE_DIRS})
|
||||
+include_directories(${GSTREAMER_APP_INCLUDE_DIRS})
|
||||
+include_directories(${GSTREAMER_BASE_INCLUDE_DIRS})
|
||||
+include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS})
|
||||
+include_directories(${GSTREAMER_TAG_INCLUDE_DIRS})
|
||||
include_directories(${GLIB_INCLUDE_DIRS})
|
||||
include_directories(${GLIBCONFIG_INCLUDE_DIRS})
|
||||
include_directories(${LIBXML_INCLUDE_DIRS})
|
@ -1,36 +0,0 @@ |
||||
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)
|
@ -0,0 +1,21 @@ |
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 23070d9..83b6772 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration"
|
||||
optional_component(VISUALISATIONS ON "Visualisations")
|
||||
|
||||
if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
|
||||
- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
|
||||
- "code must be compiled in")
|
||||
elseif(CRYPTOPP_FOUND)
|
||||
set(HAVE_CRYPTOPP ON)
|
||||
set(HAVE_SPOTIFY_DOWNLOADER ON)
|
||||
@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD)
|
||||
endif(HAVE_BREAKPAD)
|
||||
|
||||
if(HAVE_SPOTIFY_BLOB)
|
||||
- add_subdirectory(ext/clementine-spotifyblob)
|
||||
endif(HAVE_SPOTIFY_BLOB)
|
||||
|
||||
if(HAVE_MOODBAR)
|
Loading…
Reference in new issue