summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD30
2 files changed, 15 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9eb6f55958a4..9a054aa86618 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
pkgbase = grumpy-irc-git
pkgdesc = Modern, yet oldschool IRC client with distributed core, written in C++
- pkgver = v1.0.0.alpha.r206.gd0fca9e
+ pkgver = v1.0.0.alpha.r324.g8b486350
pkgrel = 1
url = https://github.com/grumpy-irc/grumpy
arch = i686
arch = x86_64
license = LGPL3
- makedepends = unzip
+ makedepends = ninja
makedepends = cmake
makedepends = git
depends = qt5-base
+ depends = qt5-declarative
+ depends = qt5-multimedia
provides = grump-irc
provides = libircclient
conflicts = grumpy-irc
@@ -18,4 +20,3 @@ pkgbase = grumpy-irc-git
sha256sums = SKIP
pkgname = grumpy-irc-git
-
diff --git a/PKGBUILD b/PKGBUILD
index ee45fe7c3ebd..9ede31758cb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
pkgname=grumpy-irc-git
_pkgname=grumpy-irc
-pkgver=v1.0.0.alpha.r206.gd0fca9e
+pkgver=v1.0.0.alpha.r324.g8b486350
pkgrel=1
pkgdesc="Modern, yet oldschool IRC client with distributed core, written in C++"
arch=('i686' 'x86_64')
url="https://github.com/grumpy-irc/grumpy"
license=('LGPL3')
-depends=('qt5-base')
-makedepends=('unzip' 'cmake' 'git')
+depends=('qt5-base' 'qt5-declarative' 'qt5-multimedia')
+makedepends=('ninja' 'cmake' 'git')
conflicts=('grumpy-irc' 'libircclient')
provides=('grump-irc' 'libircclient')
source=("$_pkgname::git+$url")
@@ -18,29 +18,21 @@ pkgver() {
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
-prepare(){
- cd "$srcdir/$_pkgname"
- git submodule update --init --recursive
- rm -rf build
- mkdir build
- cd src/sqlite
- unzip sqlite-amalgamation-3220000.zip
- mv sqlite-amalgamation-3220000/* .
-
+prepare () {
+ cd "$srcdir/$_pkgname"
+ git submodule update --init --recursive
}
-
build() {
- cd "$srcdir/$_pkgname"
- cd build
- cmake ../src \
+ cmake -B _build \
+ -S "$_pkgname/src" \
+ -G Ninja \
-DCMAKE_BUILD_TYPE='Release' \
-DCMAKE_INSTALL_PREFIX='/usr' \
-DCMAKE_INSTALL_LIBDIR='/usr/lib'
- make
+ ninja -C _build
}
package() {
- cd "$srcdir/$_pkgname"
- make -C build DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -C _build install
}