Update to 1.5.4 and allow for Qt5 and Qt6 installs

2 files changed, 59 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cc5eebd5f1f5..4b2fc379c261 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = qxmpp
 	pkgdesc = Cross-platform C++ XMPP client and server library
-	pkgver = 1.5.2
+	pkgver = 1.5.4
 	pkgrel = 1
 	url = https://github.com/qxmpp-project/qxmpp
 	arch = i686
@@ -8,13 +8,31 @@ pkgbase = qxmpp
 	license = LGPL2.1
 	makedepends = cmake
 	makedepends = doxygen
-	depends = qt5-base
 	depends = gstreamer
-	source = https://github.com/qxmpp-project/qxmpp/archive/v1.5.2.tar.gz
-	sha256sums = cc26345428d816bb33e63f92290c52b9a417d9a836bf9fabf295e3477f71e66c
+	depends = glibc
+	depends = gcc-libs
+	depends = glib2
+	source = https://github.com/qxmpp-project/qxmpp/archive/v1.5.4.tar.gz
+	sha256sums = e437fdb91aa52c6fd8ca3f922354eb3221df98146ec99ee92e70e20a82c7ad2d
 
-pkgname = qxmpp
+pkgname = qxmpp-qt5
+	depends = gstreamer
+	depends = glibc
+	depends = gcc-libs
+	depends = glib2
+	depends = qt5-base
+	depends = qca-qt5
+	provides = qxmpp
+	conflicts = qxmpp
 
 pkgname = qxmpp-doc
 	pkgdesc = Cross-platform C++ XMPP client and server library (documentation)
 	arch = any
+
+pkgname = qxmpp-qt6
+	depends = gstreamer
+	depends = glibc
+	depends = gcc-libs
+	depends = glib2
+	depends = qt6-base
+	provides = qxmpp-qt6
diff --git a/PKGBUILD b/PKGBUILD
index 4ee1b33698f3..7efa6e18b451 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,48 +4,69 @@
 # Contributor: Timothée Ravier <tim@siosm.fr>
 
 pkgbase=qxmpp
-pkgname=('qxmpp' 'qxmpp-doc')
-pkgver=1.5.2
+pkgname=('qxmpp-qt5' 'qxmpp-doc' 'qxmpp-qt6')
+pkgver=1.5.4
 pkgrel=1
 pkgdesc='Cross-platform C++ XMPP client and server library'
 arch=('i686' 'x86_64')
 url='https://github.com/qxmpp-project/qxmpp'
 license=('LGPL2.1')
-depends=('qt5-base' 'gstreamer')
+depends=('gstreamer' 'glibc' 'gcc-libs' 'glib2')
 makedepends=('cmake' 'doxygen')
 source=("${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('cc26345428d816bb33e63f92290c52b9a417d9a836bf9fabf295e3477f71e66c')
-
-prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
-	sed -i "s|^.*find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Network Xml).*$|set(QT_VERSION_MAJOR 5)|" CMakeLists.txt
-}
+sha256sums=('e437fdb91aa52c6fd8ca3f922354eb3221df98146ec99ee92e70e20a82c7ad2d')
 
 build() {
 	cd "$srcdir"
 	
-	cmake -S $pkgname-$pkgver -B build \
+	cmake -S $pkgbase-$pkgver -B buildqt5 \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DBUILD_DOCUMENTATION=1 \
 	-DCMAKE_INSTALL_LIBDIR=lib \
 	-DBUILD_EXAMPLES=0 \
 	-DBUILD_TESTS=0 \
-	-DWITH_GSTREAMER=1
+	-DWITH_GSTREAMER=1 \
+	-DQT_VERSION_MAJOR=5
 
-	cmake --build build
+	cmake --build buildqt5
+
+	cmake -S $pkgbase-$pkgver -B buildqt6 \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DBUILD_DOCUMENTATION=1 \
+	-DCMAKE_INSTALL_LIBDIR=lib \
+	-DBUILD_EXAMPLES=0 \
+	-DBUILD_TESTS=0 \
+	-DWITH_GSTREAMER=1 \
+	-DQT_VERSION_MAJOR=6
+
+	cmake --build buildqt6
+}
+
+package_qxmpp-qt5() {
+	provides=("qxmpp")
+	#conflicts=("qxmpp-qt6" "qxmpp")
+	conflicts=("qxmpp")
+	depends+=("qt5-base" "qca-qt5")
+	cd "$srcdir"
+	DESTDIR="$pkgdir" cmake --install buildqt5
+	rm -rf "$pkgdir/usr/share"
 }
 
-package_qxmpp() {
+package_qxmpp-qt6() {
+	provides=("qxmpp-qt6")
+	#conflicts=("qxmpp-qt5")
+	depends+=("qt6-base")
 	cd "$srcdir"
-	DESTDIR="$pkgdir" cmake --install build
+	DESTDIR="$pkgdir" cmake --install buildqt6
 	rm -rf "$pkgdir/usr/share"
+	rm -rf "$pkgdir/usr/lib/cmake/QXmpp"
 }
 
 package_qxmpp-doc(){
 	pkgdesc='Cross-platform C++ XMPP client and server library (documentation)'
 	arch=('any')
 	cd "$srcdir"
-	DESTDIR="$pkgdir" cmake --install build
+	DESTDIR="$pkgdir" cmake --install buildqt5
 	rm -rf "$pkgdir/usr/include"
 	rm -rf "$pkgdir/usr/lib"
 }