moving to ninja and other things

2 files changed, 18 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6074681b9254..16264695ecbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = kvirc-git
 	pkgdesc = Qt5 based IRC-Client, compiled with kde5 support - Git Version
-	pkgver = 5.0.0.r51.gd8a3ee002
+	pkgver = 5.0.0.r90.g6d6d54752
 	pkgrel = 1
 	url = http://www.kvirc.net
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = python2
+	makedepends = python
+	makedepends = ninja
 	makedepends = gettext
 	makedepends = doxygen
 	makedepends = extra-cmake-modules
@@ -31,6 +32,8 @@ pkgbase = kvirc-git
 	depends = kwindowsystem
 	depends = knotifications
 	depends = kservice
+	depends = audiofile
+	depends = libxss
 	provides = kvirc
 	conflicts = kvirc4
 	conflicts = kvirc
@@ -38,4 +41,3 @@ pkgbase = kvirc-git
 	sha256sums = SKIP
 
 pkgname = kvirc-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 732a7f3ed518..a9fc5cfc2abb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=kvirc-git
-pkgver=5.0.0.r51.gd8a3ee002
+pkgver=5.0.0.r90.g6d6d54752
 pkgrel=1
 pkgdesc="Qt5 based IRC-Client, compiled with kde5 support - Git Version"
 arch=('i686' 'x86_64')
 url="http://www.kvirc.net"
 license=('GPL')
-depends=('qt5-base' 'glibc' 'openssl' 'zlib' 'perl' 'qt5-multimedia' 'qt5-svg' 'qt5-x11extras' 'qt5-webkit' 'phonon-qt5' 'enchant' 'kcoreaddons' 'ki18n' 'kxmlgui' 'kwindowsystem' 'knotifications' 'kservice')
-makedepends=('python2' 'gettext' 'doxygen' 'extra-cmake-modules' 'zsh' 'cmake' 'git'  'gettext')
+depends=('qt5-base' 'glibc' 'openssl' 'zlib' 'perl' 'qt5-multimedia' 'qt5-svg' 'qt5-x11extras' 'qt5-webkit' 'phonon-qt5' 'enchant' 'kcoreaddons' 'ki18n' 'kxmlgui' 'kwindowsystem' 'knotifications' 'kservice' 'audiofile' 'libxss')
+makedepends=('python' 'ninja' 'gettext' 'doxygen' 'extra-cmake-modules' 'zsh' 'cmake' 'git'  'gettext')
 conflicts=('kvirc4' 'kvirc')
 provides=('kvirc')
 source=("$pkgname::git+https://github.com/kvirc/KVIrc.git")
@@ -17,25 +17,22 @@ pkgver() {
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "${pkgname}"
-}
-
 build() {
-  rm -rf build
-  mkdir -p build
-  cd build
-  cmake ../"${pkgname}" \
+
+  cmake -B _build \
+    -S "${pkgname}" \
+    -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE="Release" \
-    -DWANT_QT4=OFF \
     -DWANT_PERL=ON \
     -DWANT_AUDIOFILE=ON \
-    -DWANT_KDE=ON
-  make
+    -DWANT_KDE=ON \
+    -DWANT_OGG_THEORA=ON \
+    -DWANT_DCC_VIDEO=ON \
+    -DWANT_GTKSTYLE=ON
+  ninja -C _build
 }
 
 package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -C _build install
 }