git » liblastfm.git » commit dd0e431

Suffix Qt5 include dir

author Antonio Rojas
2018-05-26 15:08:30 UTC
committer Antonio Rojas
2018-05-26 15:08:30 UTC
parent 6f30dc561cfcae05fa969a34f0552410f7935db4

Suffix Qt5 include dir

PKGBUILD +6 -4

diff --git a/PKGBUILD b/PKGBUILD
index 2fbb48b..5ce5f5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,19 +5,22 @@
 pkgbase=liblastfm
 pkgname=(liblastfm-qt4 liblastfm-qt5)
 pkgver=1.0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A Qt C++ library for the Last.fm webservices"
 arch=('x86_64')
 url='https://github.com/lastfm/liblastfm/'
 license=('GPL3')
 makedepends=('cmake' 'qt4' 'qt5-base' 'fftw' 'libsamplerate')
-source=(${pkgbase}-${pkgver}.tar.gz::"https://github.com/lastfm/${pkgbase}/tarball/${pkgver}" liblastfm-qt5.11.patch)
+source=(${pkgbase}-${pkgver}.tar.gz::"https://github.com/lastfm/${pkgbase}/tarball/${pkgver}" liblastfm-qt5.11.patch
+        liblastfm-include-suffix.patch::"https://github.com/lastfm/liblastfm/commit/480e2ec6.patch")
 sha1sums=('cd8c6f160529dbf9e0566973a8f37130c83a78c0'
-          '40d84032eaeae32072715732b9fe67295483ffad')
+          '40d84032eaeae32072715732b9fe67295483ffad'
+          '8c36936b2259771db4cf6ac55cd2201800a4623e')
 
 prepare() {
   cd lastfm-${pkgbase}-*
   patch -p1 -i ../liblastfm-qt5.11.patch # Fix build with Qt 5.11
+  patch -p1 -i ../liblastfm-include-suffix.patch # add suffix to Qt5 include dir
 }
 
 build() {
@@ -52,7 +55,6 @@ package_liblastfm-qt4() {
 
 package_liblastfm-qt5() {
   depends=('qt5-base' 'fftw' 'libsamplerate')
-  conflicts=('liblastfm')
 
   cd build5
   make DESTDIR="${pkgdir}" install