update to 1.4.1 [release 1.4.1-1mamba;Tue Oct 15 2024]
This commit is contained in:
parent
497d983c80
commit
19407827d8
@ -1,283 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 34f6951..b5b38e9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -9,7 +9,18 @@ include(cmake/Rpm.cmake)
|
||||
|
||||
find_package(Qt4 4.5.0 REQUIRED QtCore QtGui QtOpenGL QtSql QtNetwork QtXml)
|
||||
if(UNIX AND NOT APPLE)
|
||||
- find_package(Qt4 REQUIRED QtDbus)
|
||||
+ option(ENABLE_DBUS "Enable D-Bus, MPRIS and native notifications. Required for DeviceKit and Wii remote support" ON)
|
||||
+ if(ENABLE_DBUS)
|
||||
+ find_package(Qt4 REQUIRED QtDbus)
|
||||
+ set(HAVE_DBUS ON)
|
||||
+
|
||||
+ option(ENABLE_DEVICEKIT "DeviceKit backend" ON)
|
||||
+ if(ENABLE_DEVICEKIT)
|
||||
+ set(HAVE_DEVICEKIT ON)
|
||||
+ endif(ENABLE_DEVICEKIT)
|
||||
+
|
||||
+ option(ENABLE_WIIMOTEDEV "Enable Wii remote support in Clementine" ON)
|
||||
+ endif(ENABLE_DBUS)
|
||||
endif(UNIX AND NOT APPLE)
|
||||
find_package(Qt4 COMPONENTS Phonon QtWebKit)
|
||||
|
||||
@@ -127,10 +138,6 @@ option(BUNDLE_PROJECTM_PRESETS "Install Clementine's own copies of libprojectm p
|
||||
option(ENABLE_SOUNDMENU "Add Clementine to the Gnome sound menu" ON)
|
||||
option(ENABLE_LIBLASTFM "Use liblastfm for fetching song info, scrobbling and radio streams" ON)
|
||||
|
||||
-if(NOT APPLE AND NOT WIN32)
|
||||
- option(ENABLE_WIIMOTEDEV "Enable Wii remote support in Clementine" ON)
|
||||
-endif(NOT APPLE AND NOT WIN32)
|
||||
-
|
||||
if(ENABLE_LIBGPOD AND LIBGPOD_FOUND)
|
||||
set(HAVE_LIBGPOD ON)
|
||||
endif(ENABLE_LIBGPOD AND LIBGPOD_FOUND)
|
||||
@@ -252,10 +259,12 @@ add_custom_target(uninstall
|
||||
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
|
||||
|
||||
# Show a summary of what we have enabled
|
||||
+summary_add("devices: DeviceKit backend" HAVE_DEVICEKIT)
|
||||
summary_add("devices: iPod classic support" HAVE_LIBGPOD)
|
||||
summary_add("devices: iPod Touch, iPhone, iPad support" HAVE_IMOBILEDEVICE)
|
||||
summary_add("devices: MTP support" HAVE_LIBMTP)
|
||||
summary_add("devices: GIO backend" HAVE_GIO)
|
||||
+summary_add("D-Bus support" HAVE_DBUS)
|
||||
summary_add("Gnome sound menu integration" HAVE_LIBINDICATE)
|
||||
summary_add("Wiimote support" ENABLE_WIIMOTEDEV)
|
||||
summary_add("Visualisations" ENABLE_VISUALISATIONS)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 530ff23..e327701 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -557,7 +557,7 @@ else(APPLE)
|
||||
endif(APPLE)
|
||||
|
||||
# DBUS and MPRIS - Linux specific
|
||||
-if(NOT APPLE AND NOT WIN32)
|
||||
+if(HAVE_DBUS)
|
||||
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
|
||||
|
||||
# Hack to get it to generate interfaces without namespaces - required
|
||||
@@ -593,12 +593,14 @@ if(NOT APPLE AND NOT WIN32)
|
||||
dbus/notification)
|
||||
|
||||
# DeviceKit DBUS interfaces
|
||||
+ if(HAVE_DEVICEKIT)
|
||||
qt4_add_dbus_interface(SOURCES
|
||||
dbus/org.freedesktop.UDisks.xml
|
||||
dbus/udisks)
|
||||
qt4_add_dbus_interface(SOURCES
|
||||
dbus/org.freedesktop.UDisks.Device.xml
|
||||
dbus/udisksdevice)
|
||||
+ endif(HAVE_DEVICEKIT)
|
||||
|
||||
# MPRIS source
|
||||
list(APPEND SOURCES core/mpris.cpp core/mpris2.cpp)
|
||||
@@ -622,12 +624,14 @@ if(NOT APPLE AND NOT WIN32)
|
||||
endif(ENABLE_WIIMOTEDEV)
|
||||
|
||||
# DeviceKit lister source
|
||||
+ if(HAVE_DEVICEKIT)
|
||||
list(APPEND SOURCES devices/devicekitlister.cpp)
|
||||
list(APPEND HEADERS devices/devicekitlister.h)
|
||||
+ endif(HAVE_DEVICEKIT)
|
||||
|
||||
# Gnome Screensaver DBus interface
|
||||
list(APPEND SOURCES ui/dbusscreensaver.cpp)
|
||||
-endif(NOT APPLE AND NOT WIN32)
|
||||
+endif(HAVE_DBUS)
|
||||
|
||||
# Libgpod device backend
|
||||
if(HAVE_LIBGPOD)
|
||||
diff --git a/src/core/player.cpp b/src/core/player.cpp
|
||||
index 2c0ba2d..3b26e95 100644
|
||||
--- a/src/core/player.cpp
|
||||
+++ b/src/core/player.cpp
|
||||
@@ -39,7 +39,7 @@
|
||||
# include "radio/lastfmservice.h"
|
||||
#endif
|
||||
|
||||
-#ifdef Q_WS_X11
|
||||
+#ifdef HAVE_DBUS
|
||||
# include "mpris.h"
|
||||
# include "mpris2.h"
|
||||
# include <QDBusConnection>
|
||||
@@ -77,7 +77,7 @@ Player::Player(MainWindow* main_window, PlaylistManager* playlists,
|
||||
connect(playlists, SIGNAL(CurrentSongChanged(Song)),
|
||||
art_loader_, SLOT(LoadArt(Song)));
|
||||
|
||||
-#ifdef Q_WS_X11
|
||||
+#ifdef HAVE_DBUS
|
||||
// MPRIS DBus interface.
|
||||
qDBusRegisterMetaType<QImage>();
|
||||
qDBusRegisterMetaType<TrackMetadata>();
|
||||
diff --git a/src/core/player.h b/src/core/player.h
|
||||
index ef6999b..94b247b 100644
|
||||
--- a/src/core/player.h
|
||||
+++ b/src/core/player.h
|
||||
@@ -42,7 +42,7 @@ namespace mpris {
|
||||
class ArtLoader;
|
||||
}
|
||||
|
||||
-#ifdef Q_WS_X11
|
||||
+#ifdef HAVE_DBUS
|
||||
# include <QDBusArgument>
|
||||
QDBusArgument& operator<< (QDBusArgument& arg, const QImage& image);
|
||||
const QDBusArgument& operator>> (const QDBusArgument& arg, QImage& image);
|
||||
diff --git a/src/devices/devicemanager.cpp b/src/devices/devicemanager.cpp
|
||||
index a4fe94a..cc12c21 100644
|
||||
--- a/src/devices/devicemanager.cpp
|
||||
+++ b/src/devices/devicemanager.cpp
|
||||
@@ -182,7 +182,7 @@ DeviceManager::DeviceManager(BackgroundThread<Database>* database,
|
||||
connected_devices_model_ = new DeviceStateFilterModel(this);
|
||||
connected_devices_model_->setSourceModel(this);
|
||||
|
||||
-#ifdef Q_WS_X11
|
||||
+#ifdef HAVE_DEVICEKIT
|
||||
AddLister(new DeviceKitLister);
|
||||
#endif
|
||||
#ifdef HAVE_GIO
|
||||
diff --git a/src/ui/screensaver.cpp b/src/ui/screensaver.cpp
|
||||
index a8353b1..b548ce1 100644
|
||||
--- a/src/ui/screensaver.cpp
|
||||
+++ b/src/ui/screensaver.cpp
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
-#ifdef Q_WS_X11
|
||||
+#ifdef HAVE_DBUS
|
||||
#include "dbusscreensaver.h"
|
||||
#include <QDBusConnection>
|
||||
#include <QDBusConnectionInterface>
|
||||
@@ -42,7 +42,7 @@ Screensaver* Screensaver::screensaver_ = 0;
|
||||
|
||||
Screensaver* Screensaver::GetScreensaver() {
|
||||
if (!screensaver_) {
|
||||
- #if defined(Q_WS_X11)
|
||||
+ #if defined(HAVE_DBUS)
|
||||
if (QDBusConnection::sessionBus().interface()->isServiceRegistered(kGnomeService)) {
|
||||
screensaver_ = new DBusScreensaver(kGnomeService, kGnomePath, kGnomeInterface);
|
||||
} else if (QDBusConnection::sessionBus().interface()->isServiceRegistered(kKdeService)) {
|
||||
diff --git a/src/widgets/osd.cpp b/src/widgets/osd.cpp
|
||||
index 29dc2ff..f38379f 100644
|
||||
--- a/src/widgets/osd.cpp
|
||||
+++ b/src/widgets/osd.cpp
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "osdpretty.h"
|
||||
#include "ui/systemtrayicon.h"
|
||||
|
||||
-#ifdef Q_WS_X11
|
||||
+#ifdef HAVE_DBUS
|
||||
# include "dbus/notification.h"
|
||||
#endif
|
||||
|
||||
@@ -193,7 +193,7 @@ void OSD::ShowMessage(const QString& summary,
|
||||
}
|
||||
}
|
||||
|
||||
-#ifndef Q_WS_X11
|
||||
+#ifndef HAVE_DBUS
|
||||
void OSD::CallFinished(QDBusPendingCallWatcher*) {}
|
||||
#endif
|
||||
|
||||
diff --git a/src/widgets/osd.h b/src/widgets/osd.h
|
||||
index 7e25d1a..e899c63 100644
|
||||
--- a/src/widgets/osd.h
|
||||
+++ b/src/widgets/osd.h
|
||||
@@ -33,7 +33,7 @@ class SystemTrayIcon;
|
||||
|
||||
class QDBusPendingCallWatcher;
|
||||
|
||||
-#ifdef Q_WS_X11
|
||||
+#ifdef HAVE_DBUS
|
||||
# include <QDBusArgument>
|
||||
# include <boost/scoped_ptr.hpp>
|
||||
|
||||
@@ -127,7 +127,7 @@ class OSD : public QObject {
|
||||
GrowlNotificationWrapper* wrapper_;
|
||||
#endif // Q_OS_DARWIN
|
||||
|
||||
-#ifdef Q_WS_X11
|
||||
+#ifdef HAVE_DBUS
|
||||
boost::scoped_ptr<OrgFreedesktopNotificationsInterface> interface_;
|
||||
uint notification_id_;
|
||||
QDateTime last_notification_time_;
|
||||
diff --git a/src/widgets/osd_x11.cpp b/src/widgets/osd_x11.cpp
|
||||
index b87e0ad..d1d26d6 100644
|
||||
--- a/src/widgets/osd_x11.cpp
|
||||
+++ b/src/widgets/osd_x11.cpp
|
||||
@@ -16,11 +16,13 @@
|
||||
*/
|
||||
|
||||
#include "osd.h"
|
||||
-#include "dbus/notification.h"
|
||||
|
||||
-#include <QCoreApplication>
|
||||
#include <QtDebug>
|
||||
-#include <QTextDocument>
|
||||
+
|
||||
+#ifdef HAVE_DBUS
|
||||
+ #include "dbus/notification.h"
|
||||
+ #include <QCoreApplication>
|
||||
+ #include <QTextDocument>
|
||||
|
||||
using boost::scoped_ptr;
|
||||
|
||||
@@ -52,8 +54,10 @@ const QDBusArgument& operator>> (const QDBusArgument& arg, QImage& image) {
|
||||
Q_ASSERT(0);
|
||||
return arg;
|
||||
}
|
||||
+#endif
|
||||
|
||||
void OSD::Init() {
|
||||
+ #ifdef HAVE_DBUS
|
||||
interface_.reset(new OrgFreedesktopNotificationsInterface(
|
||||
OrgFreedesktopNotificationsInterface::staticInterfaceName(),
|
||||
"/org/freedesktop/Notifications",
|
||||
@@ -63,10 +67,15 @@ void OSD::Init() {
|
||||
}
|
||||
|
||||
notification_id_ = 0;
|
||||
+ #endif
|
||||
}
|
||||
|
||||
bool OSD::SupportsNativeNotifications() {
|
||||
+ #ifdef HAVE_DBUS
|
||||
return true;
|
||||
+ #else
|
||||
+ return false;
|
||||
+ #endif
|
||||
}
|
||||
|
||||
bool OSD::SupportsTrayPopups() {
|
||||
@@ -75,6 +84,7 @@ bool OSD::SupportsTrayPopups() {
|
||||
|
||||
void OSD::ShowMessageNative(const QString& summary, const QString& message,
|
||||
const QString& icon, const QImage& image) {
|
||||
+ #ifdef HAVE_DBUS
|
||||
QVariantMap hints;
|
||||
if (!image.isNull()) {
|
||||
hints["image_data"] = QVariant(image);
|
||||
@@ -101,8 +111,12 @@ void OSD::ShowMessageNative(const QString& summary, const QString& message,
|
||||
QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(reply, this);
|
||||
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
|
||||
SLOT(CallFinished(QDBusPendingCallWatcher*)));
|
||||
+ #else
|
||||
+ qWarning() << __PRETTY_FUNCTION__ << ": NOT IMPLEMENTED";
|
||||
+ #endif
|
||||
}
|
||||
|
||||
+#ifdef HAVE_DBUS
|
||||
void OSD::CallFinished(QDBusPendingCallWatcher* watcher) {
|
||||
scoped_ptr<QDBusPendingCallWatcher> w(watcher);
|
||||
|
||||
@@ -118,3 +132,4 @@ void OSD::CallFinished(QDBusPendingCallWatcher* watcher) {
|
||||
last_notification_time_ = QDateTime::currentDateTime();
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
-
|
||||
1.6.1
|
||||
|
@ -1,55 +0,0 @@
|
||||
diff -Nru clementine-0.7.1.orig/src/devices/giolister.cpp clementine-0.7.1/src/devices/giolister.cpp
|
||||
--- clementine-0.7.1.orig/src/devices/giolister.cpp 2011-03-29 21:23:34.000000000 +0200
|
||||
+++ clementine-0.7.1/src/devices/giolister.cpp 2011-11-10 06:00:35.671356613 +0100
|
||||
@@ -458,19 +458,34 @@
|
||||
|
||||
if (info.volume) {
|
||||
if (g_volume_can_eject(info.volume)) {
|
||||
- g_volume_eject(info.volume, G_MOUNT_UNMOUNT_NONE, NULL,
|
||||
- (GAsyncReadyCallback) VolumeEjectFinished, NULL);
|
||||
+ g_volume_eject_with_operation(
|
||||
+ info.volume,
|
||||
+ G_MOUNT_UNMOUNT_NONE,
|
||||
+ NULL,
|
||||
+ NULL,
|
||||
+ (GAsyncReadyCallback) VolumeEjectFinished,
|
||||
+ NULL);
|
||||
g_object_unref(info.volume);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (g_mount_can_eject(info.mount)) {
|
||||
- g_mount_eject(info.mount, G_MOUNT_UNMOUNT_NONE, NULL,
|
||||
- (GAsyncReadyCallback) MountEjectFinished, NULL);
|
||||
+ g_mount_eject_with_operation(
|
||||
+ info.mount,
|
||||
+ G_MOUNT_UNMOUNT_NONE,
|
||||
+ NULL,
|
||||
+ NULL,
|
||||
+ (GAsyncReadyCallback) MountEjectFinished,
|
||||
+ NULL);
|
||||
} else if (g_mount_can_unmount(info.mount)) {
|
||||
- g_mount_unmount(info.mount, G_MOUNT_UNMOUNT_NONE, NULL,
|
||||
- (GAsyncReadyCallback) MountUnmountFinished, NULL);
|
||||
+ g_mount_unmount_with_operation(
|
||||
+ info.mount,
|
||||
+ G_MOUNT_UNMOUNT_NONE,
|
||||
+ NULL,
|
||||
+ NULL,
|
||||
+ (GAsyncReadyCallback) MountUnmountFinished,
|
||||
+ NULL);
|
||||
}
|
||||
}
|
||||
|
||||
--- clementine-0.7.1.orig/src/main.cpp 2011-03-29 21:16:24.000000000 +0200
|
||||
+++ clementine-0.7.1/src/main.cpp 2011-11-10 06:16:27.777883663 +0100
|
||||
@@ -61,7 +61,7 @@
|
||||
#include <QtDebug>
|
||||
|
||||
#include <glib-object.h>
|
||||
-#include <glib/gutils.h>
|
||||
+#include <glib.h>
|
||||
#include <gst/gst.h>
|
||||
|
||||
#include <boost/scoped_ptr.hpp>
|
@ -1,63 +0,0 @@
|
||||
commit 119c9c27ac74d4e0f2941a66143afde2b3c64870
|
||||
Author: David Sansome <m...@davidsansome.com>
|
||||
Date: Tue Mar 27 21:24:38 2012 +0100
|
||||
|
||||
Detect libimobiledevice 1.1.2 and use its new "udid" field instead of "uuid".
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index c250704..3339ba1 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -25,6 +25,10 @@ if (QT_VERSION_MINOR GREATER 5)
|
||||
endif(QT_VERSION_MINOR GREATER 7)
|
||||
endif(QT_VERSION_MINOR GREATER 5)
|
||||
|
||||
+if(ENABLE_IMOBILEDEVICE AND IMOBILEDEVICE_VERSION VERSION_GREATER 1.1.1)
|
||||
+ set(IMOBILEDEVICE_USES_UDIDS ON)
|
||||
+endif()
|
||||
+
|
||||
include_directories(${CMAKE_BINARY_DIR})
|
||||
include_directories(${GLIB_INCLUDE_DIRS})
|
||||
include_directories(${LIBXML_INCLUDE_DIRS})
|
||||
@@ -1079,6 +1083,7 @@ if(HAVE_IMOBILEDEVICE)
|
||||
${USBMUXD_LIBRARIES}
|
||||
gstafcsrc
|
||||
)
|
||||
+ link_directories(${IMOBILEDEVICE_LIBRARY_DIRS})
|
||||
link_directories(${USBMUXD_LIBRARY_DIRS})
|
||||
endif(HAVE_IMOBILEDEVICE)
|
||||
|
||||
diff --git a/src/config.h.in b/src/config.h.in
|
||||
index aae8b77..e2b1ce5 100644
|
||||
--- a/src/config.h.in
|
||||
+++ b/src/config.h.in
|
||||
@@ -39,6 +39,7 @@
|
||||
#cmakedefine HAVE_SPOTIFY
|
||||
#cmakedefine HAVE_STATIC_SQLITE
|
||||
#cmakedefine HAVE_WIIMOTEDEV
|
||||
+#cmakedefine IMOBILEDEVICE_USES_UDIDS
|
||||
#cmakedefine LEOPARD
|
||||
#cmakedefine SNOW_LEOPARD
|
||||
#cmakedefine USE_INSTALL_PREFIX
|
||||
diff --git a/src/devices/ilister.cpp b/src/devices/ilister.cpp
|
||||
index c0140d9..a27f37b 100644
|
||||
--- a/src/devices/ilister.cpp
|
||||
+++ b/src/devices/ilister.cpp
|
||||
@@ -1,3 +1,4 @@
|
||||
+#include "config.h"
|
||||
#include "ilister.h"
|
||||
#include "imobiledeviceconnection.h"
|
||||
|
||||
@@ -17,7 +18,11 @@ void iLister::Init() {
|
||||
void iLister::EventCallback(const idevice_event_t* event, void* context) {
|
||||
iLister* me = reinterpret_cast<iLister*>(context);
|
||||
|
||||
+#ifdef IMOBILEDEVICE_USES_UDIDS
|
||||
+ const char* uuid = event->udid;
|
||||
+#else
|
||||
const char* uuid = event->uuid;
|
||||
+#endif
|
||||
|
||||
switch (event->event) {
|
||||
case IDEVICE_DEVICE_ADD:
|
||||
|
@ -1,22 +0,0 @@
|
||||
diff -ru Clementine-1.2.2/src/core/utilities.cpp Clementine-1.2.2.orig/src/core/utilities.cpp
|
||||
--- Clementine-1.2.2/src/core/utilities.cpp 2014-03-07 15:44:34.000000000 +0100
|
||||
+++ Clementine-1.2.2.orig/src/core/utilities.cpp 2014-03-22 12:21:28.919223867 +0100
|
||||
@@ -50,6 +50,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_LINUX
|
||||
+# include <unistd.h>
|
||||
# include <sys/syscall.h>
|
||||
#endif
|
||||
#ifdef Q_OS_DARWIN
|
||||
diff -ru Clementine-1.2.2/src/internet/spotifyblobdownloader.cpp Clementine-1.2.2.orig/src/internet/spotifyblobdownloader.cpp
|
||||
--- Clementine-1.2.2/src/internet/spotifyblobdownloader.cpp 2014-03-07 15:44:34.000000000 +0100
|
||||
+++ Clementine-1.2.2.orig/src/internet/spotifyblobdownloader.cpp 2014-03-22 16:07:52.461080157 +0100
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "core/logging.h"
|
||||
#include "core/network.h"
|
||||
#include "core/utilities.h"
|
||||
+#include "unistd.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QDir>
|
@ -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)
|
@ -1,59 +0,0 @@
|
||||
diff -x '*orig' -rup a/MilkdropPresetFactory/Parser.cpp b/MilkdropPresetFactory/Parser.cpp
|
||||
--- a/MilkdropPresetFactory/Parser.cpp 2012-05-20 04:43:26.000000000 +0100
|
||||
+++ b/MilkdropPresetFactory/Parser.cpp 2016-03-17 05:00:14.177905556 +0000
|
||||
@@ -1406,7 +1406,7 @@ PerFrameEqn * Parser::parse_implicit_per
|
||||
PerFrameEqn * per_frame_eqn;
|
||||
GenExpr * gen_expr;
|
||||
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return NULL;
|
||||
if (param_string == NULL)
|
||||
return NULL;
|
||||
@@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_
|
||||
|
||||
if (preset == NULL)
|
||||
return NULL;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return NULL;
|
||||
|
||||
if ((token = parseToken(fs, name)) != tEq)
|
||||
@@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token
|
||||
/* Null argument checks */
|
||||
if (preset == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return PROJECTM_FAILURE;
|
||||
if (token == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
@@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std
|
||||
|
||||
if (token == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return PROJECTM_FAILURE;
|
||||
if (preset == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
@@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, st
|
||||
if (token == NULL)
|
||||
|
||||
return PROJECTM_FAILURE;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return PROJECTM_FAILURE;
|
||||
if (preset == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
--- libprojectm/Common.hpp.orig 2016-07-10 00:26:11.375640433 +0200
|
||||
+++ libprojectm/Common.hpp 2016-07-10 00:28:52.537623402 +0200
|
||||
@@ -64,7 +64,7 @@
|
||||
#ifdef LINUX
|
||||
#include <cstdlib>
|
||||
#include <cmath>
|
||||
-#define projectM_isnan isnan
|
||||
+#define projectM_isnan std::isnan
|
||||
|
||||
#endif
|
||||
|
13
clementine-1.4.1-cmake-fix-version.patch
Normal file
13
clementine-1.4.1-cmake-fix-version.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- Clementine-1.4.1/cmake/Version.cmake.orig 2024-10-15 09:57:42.930405035 +0200
|
||||
+++ Clementine-1.4.1/cmake/Version.cmake 2024-10-15 09:57:56.698436681 +0200
|
||||
@@ -3,8 +3,8 @@
|
||||
# Version numbers.
|
||||
set(CLEMENTINE_VERSION_MAJOR 1)
|
||||
set(CLEMENTINE_VERSION_MINOR 4)
|
||||
-set(CLEMENTINE_VERSION_PATCH 0)
|
||||
-set(CLEMENTINE_VERSION_PRERELEASE rc2)
|
||||
+set(CLEMENTINE_VERSION_PATCH 1)
|
||||
+set(CLEMENTINE_VERSION_PRERELEASE 0)
|
||||
|
||||
# This should be set to OFF in a release branch
|
||||
set(INCLUDE_GIT_REVISION ON)
|
36
clementine-1.4.1-libcryptopp-8.9.0.patch
Normal file
36
clementine-1.4.1-libcryptopp-8.9.0.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From 5c61371f8f93ba93e1dde31d8aafd8ad34b33608 Mon Sep 17 00:00:00 2001
|
||||
From: John Maguire <hatstand@apple.com>
|
||||
Date: Mon, 14 Oct 2024 15:04:21 +0100
|
||||
Subject: [PATCH] Update pkgconfig name for FC cryptopp
|
||||
|
||||
---
|
||||
dist/clementine.spec.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dist/clementine.spec.in b/dist/clementine.spec.in
|
||||
index caf45b1213..0eb6a2320f 100644
|
||||
--- a/dist/clementine.spec.in
|
||||
+++ b/dist/clementine.spec.in
|
||||
@@ -30,7 +30,6 @@ BuildRequires: pkgconfig(protobuf)
|
||||
BuildRequires: pkgconfig(sqlite3) >= 3.7
|
||||
BuildRequires: pkgconfig(taglib) >= 1.11
|
||||
BuildRequires: pkgconfig(glew)
|
||||
-BuildRequires: pkgconfig(cryptopp)
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(Qt5Gui)
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
@@ -47,12 +46,13 @@ BuildRequires: pkgconfig(gstreamer-app-1.0)
|
||||
BuildRequires: pkgconfig(gstreamer-audio-1.0)
|
||||
BuildRequires: pkgconfig(gstreamer-base-1.0)
|
||||
BuildRequires: pkgconfig(gstreamer-tag-1.0)
|
||||
-BuildRequires: pkgconfig(libpulse)
|
||||
BuildRequires: pkgconfig(libcdio)
|
||||
BuildRequires: pkgconfig(libchromaprint)
|
||||
+BuildRequires: pkgconfig(libcryptopp)
|
||||
BuildRequires: pkgconfig(libgpod-1.0)
|
||||
BuildRequires: pkgconfig(libmtp)
|
||||
BuildRequires: pkgconfig(libnotify)
|
||||
+BuildRequires: pkgconfig(libpulse)
|
||||
BuildRequires: pkgconfig(libudf)
|
||||
|
||||
# GStreamer codec dependencies
|
@ -1,6 +1,6 @@
|
||||
%define gitver %(echo %version | tr _ -)
|
||||
Name: clementine
|
||||
Version: 1.4.0rc1_814_g2b340da79
|
||||
Version: 1.4.1
|
||||
Release: 1mamba
|
||||
Summary: A modern music player and library organiser
|
||||
Group: Graphical Desktop/Applications/Multimedia
|
||||
@ -9,18 +9,23 @@ Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: https://github.com/clementine-player/clementine
|
||||
Source: https://github.com/clementine-player/Clementine.git/%{gitver}/Clementine-%{version}.tar.bz2
|
||||
#Source: http://clementine-player.googlecode.com/files/clementine-%{version}.tar.gz
|
||||
Patch0: %{name}-0.6-optional-dbus-devicekit.patch
|
||||
Patch1: %{name}-0.7.1-glibc-2.31.patch
|
||||
Patch2: %{name}-1.0.1-libimobiledevice-1.1.2.patch
|
||||
Patch3: clementine-1.2.2-glibc-2.19.patch
|
||||
Patch4: clementine-1.2.3-udisks-1.0.5.patch
|
||||
Patch5: clementine-1.3.1-libprojectm-gcc-6.1.0.patch
|
||||
Patch0: clementine-1.4.1-cmake-fix-version.patch
|
||||
Patch1: clementine-1.4.1-libcryptopp-8.9.0.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libQt5Concurrent
|
||||
BuildRequires: libQt5Core
|
||||
BuildRequires: libQt5DBus
|
||||
BuildRequires: libQt5Gui
|
||||
BuildRequires: libQt5Network
|
||||
BuildRequires: libQt5OpenGL
|
||||
BuildRequires: libQt5Sql
|
||||
BuildRequires: libQt5Widgets
|
||||
BuildRequires: libQt5X11Extras-devel
|
||||
BuildRequires: libQt5Xml
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libabseil-cpp-devel
|
||||
BuildRequires: libalsa-devel
|
||||
BuildRequires: libcdio-devel
|
||||
BuildRequires: libchromaprint-devel
|
||||
@ -33,17 +38,16 @@ BuildRequires: libgstreamer-devel
|
||||
BuildRequires: liblastfm5-devel
|
||||
BuildRequires: libmtp-devel
|
||||
BuildRequires: libmygpo-qt-devel
|
||||
BuildRequires: libprojectM-devel
|
||||
BuildRequires: libprojectm3-devel
|
||||
BuildRequires: libprotobuf-devel
|
||||
BuildRequires: libpulseaudio-devel
|
||||
BuildRequires: libsqlite-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: libtag-devel
|
||||
BuildRequires: libz-devel
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: cmake
|
||||
BuildRequires: libprotobuf-devel >= 3.20.1
|
||||
BuildRequires: libprotobuf-devel >= 28.2
|
||||
|
||||
%description
|
||||
Clementine is a modern music player and library organiser. Clementine is a port of Amarok 1.4, with some features rewritten to take advantage of Qt4.
|
||||
@ -54,17 +58,16 @@ Clementine is a modern music player and library organiser. Clementine is a port
|
||||
%setup -q -n Clementine-%{version}
|
||||
#-D -T
|
||||
#:<< _EOF
|
||||
#%patch0 -p1
|
||||
#%patch1 -p1
|
||||
#%patch2 -p1
|
||||
#%patch3 -p1
|
||||
#%patch4 -p1
|
||||
#cd 3rdparty/libprojectm
|
||||
#%patch5 -p1
|
||||
%patch 0 -p1
|
||||
%patch 1 -p1 -b .libcryptopp-8.9.0
|
||||
|
||||
%build
|
||||
#:<< _EOF
|
||||
%cmake -d build \
|
||||
-DCMAKE_CXX_FLAGS="-fpermissive" \
|
||||
-DCMAKE_CXX_STANDARD=17 \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="`pkgconf --libs protobuf`" \
|
||||
-DFORCE_GIT_REVISION=%{version} \
|
||||
-DBUILD_WERROR=OFF \
|
||||
-DUSE_SYSTEM_PROJECTM=ON \
|
||||
-DUSE_SYSTEM_TAGLIB=ON
|
||||
@ -105,6 +108,9 @@ fi
|
||||
%doc COPYING
|
||||
|
||||
%changelog
|
||||
* Tue Oct 15 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.4.1-1mamba
|
||||
- update to 1.4.1
|
||||
|
||||
* Sat May 07 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.4.0rc1_814_g2b340da79-1mamba
|
||||
- update to 1.4.0rc1_814_g2b340da79
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user