4.13.r35

3 files changed, 63 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54d73e97705f..fc3f9c4a8e89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,23 @@
 pkgbase = nchat-git
-	pkgdesc = nchat is a console-based chat client for Linux and macOS with support for Telegram.
-	pkgver = 3.67.r29.g7cbe848
+	pkgdesc = console-based chat client with support for Telegram
+	pkgver = 4.13.r35.g317652b6
 	pkgrel = 1
 	url = https://github.com/d99kris/nchat
-	arch = any
+	arch = x86_64
 	license = MIT
+	makedepends = cmake
 	makedepends = git
+	makedepends = go
+	makedepends = gperf
+	makedepends = ninja
+	depends = file
 	depends = ncurses
-	depends = ccache
-	depends = cmake
-	depends = gperf
-	depends = help2man
-	depends = readline
 	depends = openssl
-	depends = zlib
 	depends = sqlite
-	depends = go
-	depends = file
-	provides = nchat-git
-	conflicts = nchat-git
+	depends = zlib
+	provides = nchat=4.13
 	conflicts = nchat
-	source = git+https://github.com/d99kris/nchat
-	md5sums = SKIP
+	source = nchat::git+https://github.com/d99kris/nchat.git
+	sha256sums = SKIP
 
 pkgname = nchat-git
diff --git a/.gitignore b/.gitignore
index 5610264afecf..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-push.sh
-*.sw[po]
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index fb4de00f36f4..51d320d83f60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,64 @@
 # Maintainer: Your Name <johnjahi55@gmail.com>
-_pkgname=nchat
-pkgname=${_pkgname}-git
-pkgver=3.67.r29.g7cbe848
+
+_pkgname="nchat"
+pkgname="${_pkgname}-git"
+pkgver=4.13.r35.g317652b6
 pkgrel=1
-pkgdesc="nchat is a console-based chat client for Linux and macOS with support for Telegram."
-arch=('any')
+pkgdesc="console-based chat client with support for Telegram"
 url="https://github.com/d99kris/nchat"
 license=('MIT')
-depends=('ncurses' 'ccache' 'cmake' 'gperf' 'help2man' 'readline' 'openssl' 'zlib'  'sqlite' 'go' 'file')
+arch=('x86_64')
+
+depends=(
+  'file'
+  'ncurses'
+  'openssl'
+  'sqlite'
+  'zlib'
+)
+
+makedepends=(
+  'cmake'
+  'git'
+  'go'
+  'gperf'
+  'ninja'
+)
 
-makedepends=('git')
-provides=('nchat-git')
-conflicts=('nchat-git' 'nchat')
-source=("git+$url")
-md5sums=('SKIP')
+provides=("$_pkgname=${pkgver%%.r*}")
+conflicts=("$_pkgname")
+
+_pkgsrc="$_pkgname"
+source=("$_pkgsrc"::"git+$url.git")
+sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${_pkgname}"
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "$_pkgsrc"
+  git describe --long --tags --abbrev=8 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-    cd "${srcdir}/${_pkgname}"
-    sed -i 's|ncursesw/ncurses.h|ncurses.h|' src/ui*
+  cd "$_pkgsrc"
+  sed -i 's|ncursesw/ncurses.h|ncurses.h|' src/ui*
 }
 
 build() {
-    cd "${srcdir}/${_pkgname}"
-    # Perform a debug build
-    bash ./make.sh debug
+  local _cmake_options=(
+    -B build
+    -S "$_pkgsrc"
+    -G Ninja
+    -DCMAKE_BUILD_TYPE=None
+    -DCMAKE_INSTALL_PREFIX='/usr'
+    -DCMAKE_INSTALL_MANDIR='/usr/share/man'
+    -Wno-dev
+  )
 
+  cmake "${_cmake_options[@]}"
+  cmake --build build
 }
+
 package() {
-    cd "${srcdir}/${_pkgname}"
-    install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-    cd dbgbuild
-    make DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" cmake --install build
+
+  install -D -m644 "$_pkgsrc/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
 }