From 25eb4c6166ba400ba3961effb8d9dd21acc929c1 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 24 May 2022 11:49:25 +0200
Subject: [PATCH] Cleaned up PKGBUILD

---
 .SRCINFO   | 18 +++++++++---------
 .gitignore |  8 +++++---
 PKGBUILD   | 43 +++++++++++++++++++++++++++++--------------
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 8d4ffd0..dc97e10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
-pkgbase = newsflash-git
-	pkgdesc = The spiritual successor to FeedReader
-	pkgver = 1070.0d9f8d9
+pkgbase = jjr-newsflash-git
+	pkgdesc = The spiritual successor to FeedReader (development version)
+	pkgver = 1141.40ff7cf
 	pkgrel = 1
 	url = https://gitlab.com/news-flash/news_flash_gtk
-	arch = any
+	arch = x86_64
 	license = GPL3
 	makedepends = git
-	makedepends = cargo
 	makedepends = meson
 	makedepends = rust
 	depends = libadwaita
-	depends = libhandy
+	depends = gtk4
 	depends = webkit2gtk-5.0
 	conflicts = newsflash
-	source = git+https://gitlab.com/news-flash/news_flash_gtk.git
-	sha512sums = SKIP
+	conflicts = newsflash-git
+	source = news_flash_gtk::git+https://gitlab.com/news-flash/news_flash_gtk.git
+	md5sums = SKIP
 
-pkgname = newsflash-git
+pkgname = jjr-newsflash-git
diff --git a/.gitignore b/.gitignore
index 39cf456..c6a9b95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
-PKGBUILD
-.SRCINFO
-.gitignore
+*
+
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index 163c864..26f2295 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,53 @@
-# Maintainer: Felix Bühler <account at buehler dot rocks>
+# vim: ft=bash
+# Maintainer: Jef Roosens
+# Contributor: Felix Bühler <account at buehler dot rocks>
 
-pkgname=jjr-newsflash
-_pkgname=news_flash_gtk
-pkgver=1070.0d9f8d9
+_pkgname='news_flash_gtk'
+pkgname='jjr-newsflash-git'
+pkgver=1141.40ff7cf
 pkgrel=1
-pkgdesc="The spiritual successor to FeedReader"
+pkgdesc='The spiritual successor to FeedReader (development version)'
 arch=('x86_64')
-url="https://gitlab.com/news-flash/news_flash_gtk"
-license=(GPL3)
-depends=(libadwaita gtk4 webkit2gtk-5.0)
-makedepends=(git cargo meson rust sccache)
-conflicts=(newsflash)
-source=("git+https://gitlab.com/news-flash/news_flash_gtk.git")
-sha512sums=("SKIP")
+
+url='https://gitlab.com/news-flash/news_flash_gtk'
+license=('GPL3')
+depends=(
+    'libadwaita'
+    'gtk4'
+    'webkit2gtk-5.0'
+)
+makedepends=(
+    'git'
+    'meson'
+    'rust'
+)
+
+conflicts=('newsflash' 'newsflash-git')
+source=("${_pkgname}::git+https://gitlab.com/news-flash/news_flash_gtk.git")
+md5sums=("SKIP")
 
 pkgver() {
 	cd "${_pkgname}"
+
 	echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
 prepare() {
     cd "${_pkgname}"
+
     # Trustdns likes to bug out when not on a stable network
     sed -i 's/\.trust_dns(true)/\.trust_dns(false)/' src/util/mod.rs
 }
 
 build() {
 	cd "${_pkgname}"
-	#rm -rf _build
+
 	arch-meson _build
 	ninja -C _build
 }
 
 package() {
 	cd "${_pkgname}"
-	env DESTDIR="$pkgdir" ninja -C _build install
+
+	env DESTDIR="${pkgdir}" ninja -C _build install
 }