fix build and add back the package

3 files changed, 47 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6e1e0206644..cdfb12acad5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun Apr 23 01:07:42 UTC 2017
 pkgbase = tomahawk-git
 	pkgdesc = A Music Player App written in C++/Qt - development version
-	pkgver = 0.8.0rc1.1299.g97a407f83
+	pkgver = 0.8.0rc1.1304.g119a7ebdb
 	pkgrel = 1
 	epoch = 1
 	url = http://tomahawk-player.org/
@@ -12,10 +10,8 @@ pkgbase = tomahawk-git
 	makedepends = git
 	makedepends = cmake
 	makedepends = extra-cmake-modules
-	makedepends = automoc4
 	makedepends = sparsehash
 	makedepends = boost
-	makedepends = websocketpp
 	depends = qt5-svg
 	depends = qt5-tools
 	depends = qt5-xmlpatterns
@@ -23,7 +19,7 @@ pkgbase = tomahawk-git
 	depends = qca-qt5
 	depends = taglib
 	depends = lucene++
-	depends = libechonest-qt5
+	depends = libechonest
 	depends = jreen
 	depends = quazip
 	depends = attica-qt5
@@ -35,9 +31,11 @@ pkgbase = tomahawk-git
 	optdepends = telepathy-qt5: integration with Telepathy
 	provides = tomahawk
 	conflicts = tomahawk
-	options = debug
+	conflicts = tomahawk-qt5
 	source = tomahawk-git::git://github.com/tomahawk-player/tomahawk.git
-	md5sums = SKIP
+	source = fix-qt5-dependencies.patch
+	sha256sums = SKIP
+	sha256sums = 7dba918658edcec661760ac7d33d18bf8fbbdd507b60139e858d027492bec4cb
 
 pkgname = tomahawk-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 755b0470f728..4830e10f2002 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,12 +9,12 @@
 # What type of build do you want?
 # See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported.
 
-_buildtype='RelWithDebInfo'
+_buildtype='Release'
 
 ##############################################################
 
 pkgname=tomahawk-git
-pkgver=0.8.0rc1.1299.g97a407f83
+pkgver=0.8.0rc1.1304.g119a7ebdb
 pkgrel=1
 epoch=1
 pkgdesc='A Music Player App written in C++/Qt - development version'
@@ -22,35 +22,47 @@ arch=('i686' 'x86_64')
 url='http://tomahawk-player.org/'
 license=('GPL3')
 depends=('qt5-svg' 'qt5-tools' 'qt5-xmlpatterns' 'qt5-x11extras' 'qca-qt5'
-          'taglib' 'lucene++' 'libechonest-qt5' 'jreen'
+          'taglib' 'lucene++' 'libechonest' 'jreen'
           'quazip' 'attica-qt5' 'qt5-webkit' 'liblastfm-qt5'
           'qtkeychain' 'vlc')
-makedepends=('git' 'cmake' 'extra-cmake-modules' 'automoc4' 'sparsehash' 'boost' 'websocketpp')
+makedepends=('git' 'cmake' 'extra-cmake-modules' 'sparsehash' 'boost')
 optdepends=('kdelibs: integration with Plasma Desktop' 'telepathy-qt5: integration with Telepathy')
 provides=('tomahawk')
-conflicts=('tomahawk')
-source=("${pkgname}::git://github.com/tomahawk-player/tomahawk.git")
-md5sums=('SKIP')
+conflicts=('tomahawk' 'tomahawk-qt5')
+source=("${pkgname}::git://github.com/tomahawk-player/tomahawk.git"
+        "fix-qt5-dependencies.patch")
+sha256sums=('SKIP'
+            '7dba918658edcec661760ac7d33d18bf8fbbdd507b60139e858d027492bec4cb')
 
 if [[ ! ${_buildtype} == 'Release' ]] && [[ ! ${_buildtype} == 'release' ]]; then
   options=('debug')
 fi
 
 pkgver() {
-  cd ${srcdir}/${pkgname}
+  cd "${srcdir}/${pkgname}"
   git describe --always --tags | sed 's|-|.|g'
 }
 
+prepare() {
+  cd "${srcdir}/${pkgname}"
+  patch -p0 -i ../fix-qt5-dependencies.patch
+}
+
 build() {
-  cd ${srcdir}/${pkgname}
+  cd "${srcdir}/${pkgname}"
+
+  # Hatchet is dead and causes build error with newer versions of websocketpp,
+  # so disable it. See <https://github.com/tomahawk-player/tomahawk/issues/654>
+
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_INSTALL_LIBEXECDIR=lib/tomahawk \
+        -DBUILD_HATCHET=OFF \
         -DCMAKE_BUILD_TYPE=${_buildtype}
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/fix-qt5-dependencies.patch b/fix-qt5-dependencies.patch
new file mode 100644
index 000000000000..395716df4ea1
--- /dev/null
+++ b/fix-qt5-dependencies.patch
@@ -0,0 +1,18 @@
+--- CMakeLists.txt	2018-10-27 19:39:01.063516056 +0200
++++ CMakeLists.txt	2018-10-27 19:36:39.682005075 +0200
+@@ -166,6 +166,7 @@
+     if( Qt5Core_DIR )
+         # CMAKE 2.8.13+/3.0.0+ requires these for IMPORTed targets
+         find_package(Qt5Concurrent REQUIRED)
++        find_package(Qt5Sql REQUIRED)
+         find_package(Qt5Svg REQUIRED)
+         find_package(Qt5UiTools REQUIRED)
+         find_package(Qt5WebKitWidgets REQUIRED)
+@@ -491,6 +492,7 @@
+ ADD_SUBDIRECTORY( admin )
+ 
+ IF(BUILD_TESTS)
++  find_package(Qt5Test REQUIRED)
+   enable_testing()
+   ADD_SUBDIRECTORY( src/tests )
+ ENDIF()