diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 27 | ||||
| -rw-r--r-- | fix-qt5-dependencies.patch | 18 |
3 files changed, 12 insertions, 43 deletions
@@ -1,6 +1,6 @@ pkgbase = tomahawk-git pkgdesc = A Music Player App written in C++/Qt - development version - pkgver = 0.8.0rc1.1304.g119a7ebdb + pkgver = 0.8.0rc1.1337.g777b31219 pkgrel = 1 epoch = 1 url = http://tomahawk-player.org/ @@ -16,26 +16,24 @@ pkgbase = tomahawk-git depends = qt5-tools depends = qt5-xmlpatterns depends = qt5-x11extras - depends = qca-qt5 + depends = qca depends = taglib depends = lucene++ depends = libechonest depends = jreen depends = quazip - depends = attica-qt5 + depends = attica depends = qt5-webkit depends = liblastfm-qt5 depends = qtkeychain depends = vlc optdepends = kdelibs: integration with Plasma Desktop - optdepends = telepathy-qt5: integration with Telepathy + optdepends = telepathy-qt: integration with Telepathy provides = tomahawk conflicts = tomahawk conflicts = tomahawk-qt5 source = tomahawk-git::git://github.com/tomahawk-player/tomahawk.git - source = fix-qt5-dependencies.patch sha256sums = SKIP - sha256sums = 7dba918658edcec661760ac7d33d18bf8fbbdd507b60139e858d027492bec4cb pkgname = tomahawk-git @@ -14,25 +14,23 @@ _buildtype='Release' ############################################################## pkgname=tomahawk-git -pkgver=0.8.0rc1.1304.g119a7ebdb +pkgver=0.8.0rc1.1337.g777b31219 pkgrel=1 epoch=1 pkgdesc='A Music Player App written in C++/Qt - development version' 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' 'jreen' - 'quazip' 'attica-qt5' 'qt5-webkit' 'liblastfm-qt5' - 'qtkeychain' 'vlc') +depends=('qt5-svg' 'qt5-tools' 'qt5-xmlpatterns' 'qt5-x11extras' 'qca' + 'taglib' 'lucene++' 'libechonest' 'jreen' 'quazip' 'attica' + 'qt5-webkit' 'liblastfm-qt5' 'qtkeychain' 'vlc') makedepends=('git' 'cmake' 'extra-cmake-modules' 'sparsehash' 'boost') -optdepends=('kdelibs: integration with Plasma Desktop' 'telepathy-qt5: integration with Telepathy') +optdepends=('kdelibs: integration with Plasma Desktop' + 'telepathy-qt: integration with Telepathy') provides=('tomahawk') conflicts=('tomahawk' 'tomahawk-qt5') -source=("${pkgname}::git://github.com/tomahawk-player/tomahawk.git" - "fix-qt5-dependencies.patch") -sha256sums=('SKIP' - '7dba918658edcec661760ac7d33d18bf8fbbdd507b60139e858d027492bec4cb') +source=("${pkgname}::git://github.com/tomahawk-player/tomahawk.git") +sha256sums=('SKIP') if [[ ! ${_buildtype} == 'Release' ]] && [[ ! ${_buildtype} == 'release' ]]; then options=('debug') @@ -43,21 +41,12 @@ pkgver() { git describe --always --tags | sed 's|-|.|g' } -prepare() { - cd "${srcdir}/${pkgname}" - patch -p0 -i ../fix-qt5-dependencies.patch -} - build() { 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 } diff --git a/fix-qt5-dependencies.patch b/fix-qt5-dependencies.patch deleted file mode 100644 index 395716df4ea1..000000000000 --- a/fix-qt5-dependencies.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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() |