summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsolaraquarion2021-05-23 21:57:08 -0400
committersolaraquarion2021-05-23 21:57:08 -0400
commit6c6c683d542c61bb162e33e1d32eaa268a1414c9 (patch)
tree2542887caec4ce37ed12a792c015365a317ed5b3
parent0a2ffa6db6a08b24016b599d0ab8607777d47f14 (diff)
downloadaur-6c6c683d542c61bb162e33e1d32eaa268a1414c9.tar.gz
updating pkgver and ninja stuff
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD30
2 files changed, 14 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f295314e4b74..57555a452d3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
pkgbase = grumpy-irc-git
pkgdesc = Modern, yet oldschool IRC client with distributed core, written in C++
- pkgver = v1.0.0.alpha.r250.g2c98a36
+ pkgver = v1.0.0.alpha.r307.g5eb2392
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
provides = grump-irc
provides = libircclient
conflicts = grumpy-irc
@@ -18,4 +19,3 @@ pkgbase = grumpy-irc-git
sha256sums = SKIP
pkgname = grumpy-irc-git
-
diff --git a/PKGBUILD b/PKGBUILD
index e5c9bddcc86f..73b77ee1d131 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
pkgname=grumpy-irc-git
_pkgname=grumpy-irc
-pkgver=v1.0.0.alpha.r250.g2c98a36
+pkgver=v1.0.0.alpha.r307.g5eb2392
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')
+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
}