diff options
author | arcan1s | 2015-08-15 23:44:09 +0300 |
---|---|---|
committer | arcan1s | 2015-08-15 23:44:09 +0300 |
commit | 96bede7026ffa557c33908b032cdecb5d0735a5f (patch) | |
tree | 59a0e9b1c91702011bcfc924adb6c93b04c94472 | |
parent | 5fbdbb43577b13412df7fd0e80d88fb8e3bd0bee (diff) | |
download | aur-96bede7026ffa557c33908b032cdecb5d0735a5f.tar.gz |
update to 1.1.3
-rw-r--r-- | .SRCINFO | 13 | ||||
-rw-r--r-- | PKGBUILD | 27 | ||||
-rw-r--r-- | phonon.patch | 6 | ||||
-rw-r--r-- | qt-build.patch | 44 |
4 files changed, 75 insertions, 15 deletions
@@ -1,21 +1,24 @@ pkgbase = yarock-qt5 pkgdesc = Qt Modern Music Player with collection browse based on cover art - pkgver = 1.1.2 - pkgrel = 2 + pkgver = 1.1.3 + pkgrel = 1 url = https://launchpad.net/yarock arch = i686 arch = x86_64 license = GPL3 makedepends = cmake makedepends = mpv + depends = htmlcxx depends = qt5-x11extras depends = phonon-qt5 depends = taglib optdepends = mpv: alternative (working) engine - source = https://launchpad.net/yarock/1.x/1.1.2/+download/Yarock_1.1.2_source.tar.gz + source = https://launchpad.net/yarock/1.x/1.1.3/+download/Yarock_1.1.3_source.tar.gz + source = qt-build.patch source = phonon.patch - md5sums = 88733d9bed252c132a378dfecb158697 - md5sums = d6f84a05159c8b7035723cbdeb6fc611 + md5sums = 4131e469cbd0bc717b44a0145c7b637a + md5sums = 84e7160c3b4e055cdcc55551389ce08d + md5sums = 87802d76e0bf86c10ec9969a62a12203 pkgname = yarock-qt5 @@ -2,26 +2,33 @@ # Contributor: Košava <kosava at archlinux dot us> pkgname=yarock-qt5 -pkgver=1.1.2 -pkgrel=2 +pkgver=1.1.3 +pkgrel=1 pkgdesc="Qt Modern Music Player with collection browse based on cover art" arch=('i686' 'x86_64') url="https://launchpad.net/yarock" license=('GPL3') makedepends=('cmake' 'mpv') -depends=('qt5-x11extras' 'phonon-qt5' 'taglib') +depends=('htmlcxx' 'qt5-x11extras' 'phonon-qt5' 'taglib') optdepends=('mpv: alternative (working) engine') source=("https://launchpad.net/yarock/1.x/${pkgver}/+download/Yarock_${pkgver}_source.tar.gz" + "qt-build.patch" "phonon.patch") -md5sums=('88733d9bed252c132a378dfecb158697' - 'd6f84a05159c8b7035723cbdeb6fc611') +md5sums=('4131e469cbd0bc717b44a0145c7b637a' + 'ba9c30cd8dc4132da33e57255b40076a' + '87802d76e0bf86c10ec9969a62a12203') prepare() { - patch -p0 -i "${srcdir}/phonon.patch" + rm -rf "build" + mkdir "build" + + # phonon include patch + patch -p0 -i "phonon.patch" + # patch to fix build with recent qt5 + patch -p0 -i "qt-build.patch" } build() { - mkdir build cd build cmake "../Yarock_${pkgver}_source" \ -DCMAKE_BUILD_TYPE=Release \ @@ -36,3 +43,9 @@ package() { make DESTDIR="${pkgdir}" install } +md5sums=('4131e469cbd0bc717b44a0145c7b637a' + 'cd4475b787153c516e613d14cd60bef4' + '87802d76e0bf86c10ec9969a62a12203') +md5sums=('4131e469cbd0bc717b44a0145c7b637a' + '84e7160c3b4e055cdcc55551389ce08d' + '87802d76e0bf86c10ec9969a62a12203') diff --git a/phonon.patch b/phonon.patch index 15682b01f1e0..7de4b84dc355 100644 --- a/phonon.patch +++ b/phonon.patch @@ -1,6 +1,6 @@ -diff -ruN Yarock_1.1.2_source-orig/src/core/player/phonon/CMakeLists.txt Yarock_1.1.2_source/src/core/player/phonon/CMakeLists.txt ---- Yarock_1.1.2_source-orig/src/core/player/phonon/CMakeLists.txt 2015-05-21 00:42:46.627611703 +0300 -+++ Yarock_1.1.2_source/src/core/player/phonon/CMakeLists.txt 2015-05-21 00:43:25.852867232 +0300 +diff -ruN Yarock_1.1.3_source-orig/src/core/player/phonon/CMakeLists.txt Yarock_1.1.3_source/src/core/player/phonon/CMakeLists.txt +--- Yarock_1.1.3_source-orig/src/core/player/phonon/CMakeLists.txt 2015-05-21 00:42:46.627611703 +0300 ++++ Yarock_1.1.3_source/src/core/player/phonon/CMakeLists.txt 2015-05-21 00:43:25.852867232 +0300 @@ -34,7 +34,7 @@ diff --git a/qt-build.patch b/qt-build.patch new file mode 100644 index 000000000000..16ac70d41023 --- /dev/null +++ b/qt-build.patch @@ -0,0 +1,44 @@ +diff -ruN Yarock_1.1.3_source.orig/src/core/database/database.h Yarock_1.1.3_source/src/core/database/database.h +--- Yarock_1.1.3_source.orig/src/core/database/database.h 2015-08-15 23:39:47.583710906 +0300 ++++ Yarock_1.1.3_source/src/core/database/database.h 2015-08-15 23:40:19.349182503 +0300 +@@ -18,6 +18,7 @@ + #ifndef _DATABASE_H_ + #define _DATABASE_H_ + ++#include <QObject> + #include <QString> + #include <QStringList> + +diff -ruN Yarock_1.1.3_source.orig/src/core/mediasearch/media_search.cpp Yarock_1.1.3_source/src/core/mediasearch/media_search.cpp +--- Yarock_1.1.3_source.orig/src/core/mediasearch/media_search.cpp 2015-08-15 23:39:47.580377698 +0300 ++++ Yarock_1.1.3_source/src/core/mediasearch/media_search.cpp 2015-08-15 23:40:51.991287643 +0300 +@@ -16,6 +16,7 @@ + *****************************************************************************************/
+
+ #include "core/mediasearch/media_search.h"
++#include <QDataStream>
+ //#include "debug.h"
+ /*
+ ********************************************************************************
+diff -ruN Yarock_1.1.3_source.orig/src/core/mediasearch/search_query.cpp Yarock_1.1.3_source/src/core/mediasearch/search_query.cpp +--- Yarock_1.1.3_source.orig/src/core/mediasearch/search_query.cpp 2015-08-15 23:39:47.580377698 +0300 ++++ Yarock_1.1.3_source/src/core/mediasearch/search_query.cpp 2015-08-15 23:41:27.436620480 +0300 +@@ -17,6 +17,7 @@ +
+
+ #include "core/mediasearch/search_query.h"
++#include <QDataStream>
+ //#include "debug.h"
+
+
+diff -ruN Yarock_1.1.3_source.orig/src3party/qtsingleapplication/qtlocalpeer.cpp Yarock_1.1.3_source/src3party/qtsingleapplication/qtlocalpeer.cpp +--- Yarock_1.1.3_source.orig/src3party/qtsingleapplication/qtlocalpeer.cpp 2015-08-15 23:39:47.540379203 +0300 ++++ Yarock_1.1.3_source/src3party/qtsingleapplication/qtlocalpeer.cpp 2015-08-15 23:42:08.175087257 +0300 +@@ -39,6 +39,7 @@ + + + #include "qtlocalpeer.h" ++#include <QDataStream> + #include <QCoreApplication> + #include <QTime> + |