Upstream release 0.9.0 ; use qt5 instead of qt4

2 files changed, 19 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c23c08a49b27..9a9ed45bd686 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = qxmpp
 	pkgdesc = An XMPP client library based on Qt & C++
-	pkgver = 0.8.3
+	pkgver = 0.9.0
 	pkgrel = 1
 	url = https://github.com/qxmpp-project/qxmpp
 	arch = i686
 	arch = x86_64
 	license = LGPL2.1
-	depends = qt4
+	depends = qt5-base
+	optdepends = doxygen: required to build the HTML documentation
+	optdepends = opus: required to enable opus audio codec
 	optdepends = speex: required to enable speex audio codec
 	optdepends = libvpx: required to enable vpx video codec
 	optdepends = libtheora: required to enable theora video codec
-	conflicts = qxmpp-git
-	conflicts = qxmpp-leechcraft-git
 	conflicts = qxmpp-qt5
-	conflicts = qxmpp-qt5-git
-	source = https://github.com/qxmpp-project/qxmpp/archive/v0.8.3.tar.gz
-	sha1sums = 63828a91be14b68ec6f091b30a292d47eaf7a3c0
+	source = https://github.com/qxmpp-project/qxmpp/archive/v0.9.0.tar.gz
+	sha1sums = 8b73021378523c6d5134febc4db25985d11b0e68
 
 pkgname = qxmpp
 
diff --git a/PKGBUILD b/PKGBUILD
index e518e14d8d16..7ead2bbddda1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,33 @@
 # Contributor: Timothée Ravier <tim@siosm.fr>
 
 pkgname='qxmpp'
-pkgver='0.8.3'
+pkgver='0.9.0'
 pkgrel='1'
 pkgdesc='An XMPP client library based on Qt & C++'
 arch=('i686' 'x86_64')
 url='https://github.com/qxmpp-project/qxmpp'
 license=('LGPL2.1')
-depends=('qt4')
-optdepends=('speex: required to enable speex audio codec'
+depends=('qt5-base')
+optdepends=('doxygen: required to build the HTML documentation'
+	    'opus: required to enable opus audio codec'
+	    'speex: required to enable speex audio codec'
             'libvpx: required to enable vpx video codec'
 	    'libtheora: required to enable theora video codec') 
-conflicts=('qxmpp-git' 'qxmpp-leechcraft-git' 'qxmpp-qt5' 'qxmpp-qt5-git')
+conflicts=('qxmpp-qt5')
 source=("${url}/archive/v${pkgver}.tar.gz")
-sha1sums=('63828a91be14b68ec6f091b30a292d47eaf7a3c0')
+sha1sums=('8b73021378523c6d5134febc4db25985d11b0e68')
  
 build() {
 	cd "$srcdir/$pkgname-$pkgver/"
 	[ -d build ] || mkdir build && cd build
-	qmake-qt4 PREFIX=/usr ..
+	
+	#In order to build the HTML documentation,
+	# add QXMPP_USE_DOXYGEN=1 to qmake arguments
 
-	# In order to enable speex audio codec, vpx video codec or theora video codec,
-	# add QXMPP_USE_SPEEX=1, QXMPP_USE_VPX=1 and QXMPP_USE_THEORA=1 to qmake arguments.
+	# In order to enable opus & speex audio codecs, and vpx & theora video codecs,
+	# add QXMPP_USE_OPUS=1, QXMPP_USE_SPEEX=1, QXMPP_USE_VPX=1 and QXMPP_USE_THEORA=1 to qmake arguments
 
+	qmake-qt5 PREFIX=/usr ..
 	make
 }