From 070f50f641fb49a15e8e0c79b4ddc9e332389e03 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 11 May 2024 00:13:50 +0000
Subject: [PATCH] extra/conky to 1.20.2-1

---
 extra/conky/.SRCINFO        | 10 +++++-----
 extra/conky/.nvchecker.toml |  5 +++++
 extra/conky/PKGBUILD        | 15 +++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 extra/conky/.nvchecker.toml

diff --git a/extra/conky/.SRCINFO b/extra/conky/.SRCINFO
index 6f07e8bcc..807dff26a 100644
--- a/extra/conky/.SRCINFO
+++ b/extra/conky/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = conky
 	pkgdesc = Light-weight system monitor for X, Wayland, and other things, too
-	pkgver = 1.19.7
-	pkgrel = 2
+	pkgver = 1.20.2
+	pkgrel = 1
 	url = https://github.com/brndnmtthws/conky
 	arch = x86_64
 	license = BSD-3-Clause
@@ -45,9 +45,9 @@ pkgbase = conky
 	depends = libsystemd.so
 	depends = wayland
 	depends = wireless_tools
-	source = git+https://github.com/brndnmtthws/conky.git#tag=70ef89411aa0a70c5b25318d0329e1d9e57838d2?signed
+	source = git+https://github.com/brndnmtthws/conky.git#tag=v1.20.2?signed
 	validpgpkeys = AF310802C8EFA20499CF3556137B7AC2BDFD8DF0
-	sha512sums = SKIP
-	b2sums = SKIP
+	sha512sums = 3819df8b1f2da0d7b89cd0097b3f72c5248df089fc990c695ee79c56679cf7e45d6b24f7295a5eb99ed6bd16896c56b32ae306ab5e2d79204a794f541a824565
+	b2sums = 25f60e912e1c3bb641e05999a982854701d8480284f7d84cdfb89bd13f055463fe96b0789886505a5d238f9e4842362fbfeebf0a1c2f4454c557939025c89cef
 
 pkgname = conky
diff --git a/extra/conky/.nvchecker.toml b/extra/conky/.nvchecker.toml
new file mode 100644
index 000000000..b918e3c15
--- /dev/null
+++ b/extra/conky/.nvchecker.toml
@@ -0,0 +1,5 @@
+[conky]
+source = "git"
+git = "https://github.com/brndnmtthws/conky.git"
+prefix = "v"
+exclude_regex = "1.999"
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index c2cf11c50..689f14571 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -10,9 +10,8 @@
 #  - remove makedepends on pandoc, set -D BUILD_DOCS=OFF
 
 pkgname=conky
-pkgver=1.19.7
-_gitcommit=70ef89411aa0a70c5b25318d0329e1d9e57838d2  # refs/tags/v1.19.7
-pkgrel=2
+pkgver=1.20.2
+pkgrel=1
 pkgdesc='Light-weight system monitor for X, Wayland, and other things, too'
 url='https://github.com/brndnmtthws/conky'
 license=(
@@ -56,9 +55,9 @@ depends=(
   'wayland'
   'wireless_tools'
 )
-source=("git+$url.git#tag=${_gitcommit}?signed")
-sha512sums=('SKIP')
-b2sums=('SKIP')
+source=("git+$url.git#tag=v${pkgver}?signed")
+sha512sums=('3819df8b1f2da0d7b89cd0097b3f72c5248df089fc990c695ee79c56679cf7e45d6b24f7295a5eb99ed6bd16896c56b32ae306ab5e2d79204a794f541a824565')
+b2sums=('25f60e912e1c3bb641e05999a982854701d8480284f7d84cdfb89bd13f055463fe96b0789886505a5d238f9e4842362fbfeebf0a1c2f4454c557939025c89cef')
 validpgpkeys=(
   'AF310802C8EFA20499CF3556137B7AC2BDFD8DF0' # Brenden Matthews <github@brenden.brndn.io>
 )
@@ -73,10 +72,6 @@ prepare() {
 # Unbundle catch2 to fix build with glibc 2.35
   rm -r tests/catch2
   ln -s /usr/include/catch2 tests
-
-# Fix buffer overflow
-  git cherry-pick -n 8dae420bc8d29ef8b77b1c60c6456233d952f98a
-  git cherry-pick -n 27d64fe834589815a4067ca13f2214b7119037e1
 }
 
 build() {