From a58a330fbcf015aba4c4acba49eb7ce2550aab6a Mon Sep 17 00:00:00 2001
From: gnastyle <BM-2cTv4XtvC9UQ8TdFCfPNySv2omc8T6m3sv@bitmessage.ch>
Date: Tue, 18 Aug 2015 11:46:01 +0200
Subject: [PATCH] yarock: update to 1.1.3

---
 yarock/PKGBUILD       | 42 +++++++++++++++++++++++++++--------------
 yarock/phonon.patch   | 12 ++++++++++++
 yarock/qt-build.patch | 44 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+), 14 deletions(-)
 create mode 100644 yarock/phonon.patch
 create mode 100644 yarock/qt-build.patch

diff --git a/yarock/PKGBUILD b/yarock/PKGBUILD
index 180b5f9f1..6ab93e591 100644
--- a/yarock/PKGBUILD
+++ b/yarock/PKGBUILD
@@ -1,31 +1,45 @@
 pkgname=yarock
 _pkgname=Yarock
-pkgver=1.1.2
+pkgver=1.1.3
 pkgrel=1
-pkgdesc="A Qt4 Modern Music Player with collection browser based on cover art."
+pkgdesc="A Modern Music Player with collection browser based on cover art."
 arch=('x86_64')
-url="http://qt-apps.org/content/show.php?content=129372"
+url="https://launchpad.net/yarock"
 screenshot="http://qt-apps.org/CONTENT/content-pre2/129372-2.png"
 license=('GPL3')
-depends=('qt' 'taglib' 'phonon' 'boost' 'qjson')
-makedepends=('cmake')
+depends=('qt5-x11extras' 'taglib' 'phonon-qt5' 'boost' 'qjson' 'htmlcxx')
+makedepends=('cmake' 'mpv')
+optdepends=('mpv: alternative (working) engine')
 categories=('multimedia')
-source=("http://launchpad.net/$pkgname/1.x/$pkgver/+download/${_pkgname}_${pkgver}_source.tar.gz")
-sha512sums=('66a08b203d408ab9c71b334722bae45c0bc6123110e2e26eac9f2c64410b75c4a120f674f9361a77425fb35b811b266d0f350352758b316ca495ac1fe888967b')
+source=("http://launchpad.net/$pkgname/1.x/$pkgver/+download/${_pkgname}_${pkgver}_source.tar.gz"
+	"qt-build.patch"
+        "phonon.patch")
+sha512sums=('daff56a49232eb22edee5f3588f1461f7ab9ed17affc7aec288d61d58ecf28d8ce773eb9a867271112538431debb380749d2fd72340716d7f7ecde41684351df'
+	    '59a0fe566e016f339b660a9773759708055493d1265652340c9b9a42121d4cc98d5e3777f9e2ab045e168df2f63fb9d37d3a2a7a0a2faf91bd217fb94c611300'
+	    '44d88dee63e056daf1d7176dcbff0b54d8c8b23cbe937ad68a712a7ce02bcb919067a47c201f793f3143ff2941ff7d3009868c7a3e603076cb8493651568ced6')
 
+prepare() {
+  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() {
   cd $srcdir/${_pkgname}_${pkgver}_source
 
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-  cmake \
+  cmake CMakeLists.txt \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    ..
-  make
+    -DENABLE_QT5=1 \
+    -DENABLE_MPV=ON
+    make
 }
 
 package() {
-  cd $srcdir/${_pkgname}_${pkgver}_source/build
+  cd $srcdir/${_pkgname}_${pkgver}_source
   make DESTDIR=$pkgdir install
 }
diff --git a/yarock/phonon.patch b/yarock/phonon.patch
new file mode 100644
index 000000000..7de4b84dc
--- /dev/null
+++ b/yarock/phonon.patch
@@ -0,0 +1,12 @@
+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 @@
+ 
+ 
+ if (ENABLE_QT5)
+-    INCLUDE_DIRECTORIES( ${PHONON_INCLUDE_DIR}/phonon4qt5 )
++    INCLUDE_DIRECTORIES( /usr/include/phonon4qt5 )
+ else (ENABLE_QT5)
+     INCLUDE_DIRECTORIES( ${PHONON_INCLUDES} )
+ endif (ENABLE_QT5)  
diff --git a/yarock/qt-build.patch b/yarock/qt-build.patch
new file mode 100644
index 000000000..16ac70d41
--- /dev/null
+++ b/yarock/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>
+