milislinux
/
milis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clementine

This commit is contained in:
milisbir 2018-05-07 11:54:03 +03:00
parent efff9c8194
commit d3f4e67311
6 changed files with 1 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
talimatname/genel/c/clementine/add-missing-functional-includes-5630.patch
View File

@ -1,51 +0,0 @@
From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001
From: Morris Hafner <mmha@users.noreply.github.com>
Date: Mon, 13 Feb 2017 17:46:46 +0100
Subject: [PATCH] Add missing <functional> includes (#5630)
---
src/core/mergedproxymodel.cpp | 1 +
src/devices/giolister.cpp | 1 +
src/library/groupbydialog.cpp | 2 ++
3 files changed, 4 insertions(+)
diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
index 56217f6fd..8c210d391 100644
--- a/src/core/mergedproxymodel.cpp
+++ b/src/core/mergedproxymodel.cpp
@@ -23,6 +23,7 @@
#include <QStringList>
+#include <functional>
#include <limits>
// boost::multi_index still relies on these being in the global namespace.
diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp
index aa3bddb34..5f63ef248 100644
--- a/src/devices/giolister.cpp
+++ b/src/devices/giolister.cpp
@@ -17,6 +17,7 @@
#include "config.h"
+#include <functional>
#include <memory>
#include <QFile>
diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp
index 5efdc9f36..e5f711b34 100644
--- a/src/library/groupbydialog.cpp
+++ b/src/library/groupbydialog.cpp
@@ -20,6 +20,8 @@
#include <QPushButton>
+#include <functional>
+
// boost::multi_index still relies on these being in the global namespace.
using std::placeholders::_1;
using std::placeholders::_2;
--
2.13.4

23
talimatname/genel/c/clementine/clementine-1.2.3-gcc5.1-1.patch
View File

@ -1,23 +0,0 @@
diff -rupN Clementine-1.2.3.orig/src/CMakeLists.txt Clementine-1.2.3/src/CMakeLists.txt
--- Clementine-1.2.3.orig/src/CMakeLists.txt 2015-05-30 11:15:10.903093300 +0200
+++ Clementine-1.2.3/src/CMakeLists.txt 2015-05-30 11:15:34.801955100 +0200
@@ -1,6 +1,6 @@
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs --std=c++0x -U__STRICT_ANSI__")
option(BUILD_WERROR "Build with -Werror" ON)
diff -rupN Clementine-1.2.3.orig/src/ui/mainwindow.cpp Clementine-1.2.3/src/ui/mainwindow.cpp
--- Clementine-1.2.3.orig/src/ui/mainwindow.cpp 2015-05-30 11:15:10.867894300 +0200
+++ Clementine-1.2.3/src/ui/mainwindow.cpp 2015-05-30 11:15:54.578517000 +0200
@@ -911,7 +911,7 @@ void MainWindow::ScrobblingEnabledChange
if (ui_->action_toggle_scrobbling->isVisible())
SetToggleScrobblingIcon(value);
- if (!app_->player()->GetState() == Engine::Idle) {
+ if (app_->player()->GetState() != Engine::Idle) {
return;
}
else {

38
talimatname/genel/c/clementine/clementine-1.2.3-udisks-namespace.patch
View File

@ -1,38 +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)
--
2.0.3

41
talimatname/genel/c/clementine/clementine-1.3.1-chromaprint-1.4.0.patch
View File

@ -1,41 +0,0 @@
From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Thu, 8 Dec 2016 23:12:17 +0100
Subject: [PATCH] Add compatibility with chromaprint >= 1.4
---
src/musicbrainz/chromaprinter.cpp | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
index 9579b62ae..c7ad99e2e 100644
--- a/src/musicbrainz/chromaprinter.cpp
+++ b/src/musicbrainz/chromaprinter.cpp
@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
ChromaprintContext* chromaprint =
chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
- chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()),
+ chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()),
data.size() / 2);
chromaprint_finish(chromaprint);
- void* fprint = nullptr;
int size = 0;
+
+#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
+ u_int32_t *fprint = nullptr;
+ char *encoded = nullptr;
+#else
+ void *fprint = nullptr;
+ void *encoded = nullptr;
+#endif
+
int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
+
QByteArray fingerprint;
if (ret == 1) {
- void* encoded = nullptr;
int encoded_size = 0;
chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT,
&encoded, &encoded_size, 1);

25
talimatname/genel/c/clementine/clementine-cryptopp6.patch
View File

@ -1,25 +0,0 @@
diff --git a/src/internet/spotify/spotifyblobdownloader.cpp b/src/internet/spotify/spotifyblobdownloader.cpp
index e34577f5d..045aeeb8a 100644
--- a/src/internet/spotify/spotifyblobdownloader.cpp
+++ b/src/internet/spotify/spotifyblobdownloader.cpp
@@ -189,7 +189,7 @@ bool SpotifyBlobDownloader::CheckSignature(
try {
CryptoPP::ByteQueue bytes;
- bytes.Put(reinterpret_cast<const byte*>(public_key_data.constData()),
+ bytes.Put(reinterpret_cast<const CryptoPP::byte*>(public_key_data.constData()),
public_key_data.size());
bytes.MessageEnd();
@@ -204,9 +204,9 @@ bool SpotifyBlobDownloader::CheckSignature(
actual_filename.remove(kSignatureSuffix);
const bool result = verifier.VerifyMessage(
- reinterpret_cast<const byte*>(file_data[actual_filename].constData()),
+ reinterpret_cast<const CryptoPP::byte*>(file_data[actual_filename].constData()),
file_data[actual_filename].size(),
- reinterpret_cast<const byte*>(
+ reinterpret_cast<const CryptoPP::byte*>(
file_data[signature_filename].constData()),
file_data[signature_filename].size());
qLog(Debug) << "Verifying" << actual_filename << "against"

2
talimatname/genel/c/clementine/talimat
View File

@ -1,7 +1,7 @@
# Tanım: Bir müzik çalar ve kütüphane organizatörü. (qt5 ile derlendi)
# URL: http://www.clementine-player.org/
# Paketçi: milisarge cihan_alkan
# Gerekler: cmake boost qt5 xorg-mesa libcdio protobuf taglib chromaprint glew gstreamer gstreamer-plugins-base gstreamer-plugins-good gstreamer-plugins-ugly gstreamer-plugins-ffmpeg gstreamer-plugins-bad sqlite
# Gerekler: cmake boost qt5 xorg-mesa libcdio protobuf taglib chromaprint crypto++ glew gstreamer gstreamer-plugins-base gstreamer-plugins-good gstreamer-plugins-ugly gstreamer-plugins-ffmpeg gstreamer-plugins-bad sqlite
# Grup: medya
isim=clementine