Update clementine-player to 1.2.3

- Move distfile location to GitHub
- Remove three uneeded patches accepted upstream
- Add one new patch for <functional> support
- Add new dependency on libechonest

From Changelog:
Version 1.2.3:
  Bugfixes:
    * Fix compilation with GCC 4.9.
    * (Linux) Fix poor search performance with sqlite 3.8.
    * (Ubuntu) Fix dependency issues on Ubuntu 14.04.
    * (Windows) Upgrade to OpenSSL 1.0.1g to fix CVE-2014-0160.

Version 1.2.2:
  Major features:
    * (Android Remote) Add kittens support.

  Bugfixes:
    * Rename SkyDrive to OneDrive.
    * Don't include the user's IP address in the log (from the network remote
      settings dialog).
    * (Debian) Fix a bug with HTTPS logins to all cloud storage providers.
    * (Mac OS X) Fix a bug in the workaround for a weird font issue on 10.9.
    * (Mac OS X) Fix rendering of source icons on retina displays.
    * (Android Remote) Don't advertise songs that aren't available.
    * (Android Remote) Fix playing songs with special characters in filenames.

Reviewed by:	mat@
This commit is contained in:
Sean Bruno 2014-05-26 18:18:09 +00:00
parent a4a8a9377b
commit d38b3d1db0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=355424
6 changed files with 22 additions and 79 deletions

View file

@ -2,12 +2,16 @@
# $FreeBSD$
PORTNAME= clementine
PORTVERSION= 1.2.1
PORTREVISION= 7
PORTVERSION= 1.2.3
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -player
USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME}${PKGNAMESUFFIX}
GH_PROJECT= Clementine
GH_TAGNAME= ${PORTVERSION}
GH_COMMIT= c189ee5
MAINTAINER= sbruno@FreeBSD.org
COMMENT= Cross-platform music player based on Amarok 1.4
@ -19,7 +23,8 @@ LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libprotobuf.so:${PORTSDIR}/devel/protobuf \
libqca.so:${PORTSDIR}/devel/qca \
libqjson.so:${PORTSDIR}/devel/qjson \
libfftw3.so:${PORTSDIR}/math/fftw3
libfftw3.so:${PORTSDIR}/math/fftw3 \
libechonest.so:${PORTSDIR}/audio/libechonest
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs

View file

@ -1,2 +1,2 @@
SHA256 (clementine-1.2.1.tar.gz) = db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e
SIZE (clementine-1.2.1.tar.gz) = 9274351
SHA256 (clementine-1.2.3.tar.gz) = b7e4813b54f2cb586e80c27945240c11d884082459248e87b7359689a0f0dffb
SIZE (clementine-1.2.3.tar.gz) = 9075813

View file

@ -1,20 +0,0 @@
--- ./ext/libclementine-common/core/closure.cpp.orig 2013-11-24 15:58:51.321696435 -0800
+++ ./ext/libclementine-common/core/closure.cpp 2013-11-24 15:59:00.552695416 -0800
@@ -33,7 +33,7 @@
CallbackClosure::CallbackClosure(
QObject* sender,
const char* signal,
- std::tr1::function<void()> callback)
+ std::function<void()> callback)
: ClosureBase(new ObjectHelper(sender, signal, this)),
callback_(callback) {
}
@@ -67,7 +67,7 @@
_detail::ClosureBase* NewClosure(
QObject* sender,
const char* signal,
- std::tr1::function<void()> callback) {
+ std::function<void()> callback) {
return new _detail::CallbackClosure(
sender, signal, callback);
}

View file

@ -1,42 +0,0 @@
--- ./ext/libclementine-common/core/closure.h.orig 2013-11-24 15:58:19.241698287 -0800
+++ ./ext/libclementine-common/core/closure.h 2013-11-24 15:58:38.634697259 -0800
@@ -18,7 +18,7 @@
#ifndef CLOSURE_H
#define CLOSURE_H
-#include <tr1/functional>
+#include <functional>
#include <QMetaMethod>
#include <QObject>
@@ -158,12 +158,12 @@
CallbackClosure(
QObject* sender,
const char* signal,
- std::tr1::function<void()> callback);
+ std::function<void()> callback);
virtual void Invoke();
private:
- std::tr1::function<void()> callback_;
+ std::function<void()> callback_;
};
} // namespace _detail
@@ -194,13 +194,13 @@
_detail::ClosureBase* NewClosure(
QObject* sender,
const char* signal,
- std::tr1::function<void()> callback);
+ std::function<void()> callback);
template <typename... Args>
_detail::ClosureBase* NewClosure(
QObject* sender,
const char* signal,
- std::tr1::function<void(Args...)> callback,
+ std::function<void(Args...)> callback,
const Args&... args) {
return NewClosure(sender, signal, boost::bind(callback, args...));
}

View file

@ -0,0 +1,11 @@
--- ./src/library/groupbydialog.h.orig 2014-05-25 10:38:37.378768447 -0700
+++ ./src/library/groupbydialog.h 2014-05-25 10:39:12.641759778 -0700
@@ -22,6 +22,8 @@
#include <memory>
+#include <functional>
+
using std::placeholders::_1;
using std::placeholders::_2;

View file

@ -1,11 +0,0 @@
--- ./src/playlistparsers/plsparser.cpp.orig 2013-11-24 16:01:13.247686715 -0800
+++ ./src/playlistparsers/plsparser.cpp 2013-11-24 16:03:24.812677689 -0800
@@ -46,7 +46,7 @@
// Use the title and length we've already loaded if any
if (!songs[n].title().isEmpty())
song.set_title(songs[n].title());
- if (!songs[n].length_nanosec() != -1)
+ if (songs[n].length_nanosec() != -1)
song.set_length_nanosec(songs[n].length_nanosec());
songs[n] = song;