Cleaned up PKGBUILD

.SRCINFO

@@ -1,19 +1,19 @@
-pkgbase = newsflash-git
+pkgbase = jjr-newsflash-git
-	pkgdesc = The spiritual successor to FeedReader
+	pkgdesc = The spiritual successor to FeedReader (development version)
-	pkgver = 684.fea372a
+	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 = libhandy
+	depends = libadwaita
-	depends = webkit2gtk
+	depends = gtk4
+	depends = webkit2gtk-5.0
 	conflicts = newsflash
-	source = git+https://gitlab.com/news-flash/news_flash_gtk.git
+	conflicts = newsflash-git
-	sha512sums = SKIP
+	source = news_flash_gtk::git+https://gitlab.com/news-flash/news_flash_gtk.git
-
+	md5sums = SKIP
-pkgname = newsflash-git
 
+pkgname = jjr-newsflash-git

.gitignore

@@ -1,4 +1,5 @@
-PKGBUILD
-.SRCINFO
-.gitignore
 *
+
+!.gitignore
+!PKGBUILD
+!.SRCINFO

.woodpecker.yml

@@ -0,0 +1,34 @@
+platform: linux/amd64
+
+pipeline:
+  build:
+    image: 'archlinux:latest'
+    pull: true
+    environment:
+      - SCCACHE_BUCKET=bur
+      - SCCACHE_ENDPOINT=s3.rustybever.be
+      - SCCACHE_S3_USE_SSL=true
+      - SCCACHE_S3_KEY_PREFIX=jjr-newsflash
+      - RUSTC_WRAPPER=/usr/bin/sccache
+    secrets:
+      - aws_access_key_id
+      - aws_secret_access_key
+    commands:
+      # Update packages
+      - pacman -Syu --needed --noconfirm base-devel
+      # Create non-root user to perform build & switch to their home
+      - groupadd -g 1000 builder
+      - useradd -mg builder builder
+      - chown -R builder:builder "$PWD"
+      - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
+      - su builder
+      # Build the package
+      - MAKEFLAGS="-j$(nproc)" makepkg -s --noconfirm --needed
+
+  publish:
+    image: 'archlinux:latest'
+    commands:
+      # Publish the package
+      - 'curl -s -XPOST -H "X-API-KEY: $API_KEY" -T "$(ls *.pkg*)" https://arch.r8r.be/publish'
+    secrets:
+      - api_key

PKGBUILD

@@ -1,32 +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=newsflash-git
+_pkgname='news_flash_gtk'
-_pkgname=news_flash_gtk
+pkgname='jjr-newsflash-git'
-pkgver=684.fea372a
+pkgver=1141.40ff7cf
 pkgrel=1
-pkgdesc="The spiritual successor to FeedReader"
+pkgdesc='The spiritual successor to FeedReader (development version)'
-arch=(any)
+arch=('x86_64')
-url="https://gitlab.com/news-flash/news_flash_gtk"
+
-license=(GPL3)
+url='https://gitlab.com/news-flash/news_flash_gtk'
-depends=(libhandy webkit2gtk)
+license=('GPL3')
-makedepends=(git cargo meson rust)
+depends=(
-conflicts=(newsflash)
+    'libadwaita'
-source=("git+https://gitlab.com/news-flash/news_flash_gtk.git")
+    'gtk4'
-sha512sums=("SKIP")
+    '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
 }