extra/conky to 1.19.7-2

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 = 1
+	pkgrel = 2
 	url = https://github.com/brndnmtthws/conky
 	arch = x86_64
 	license = BSD-3-Clause

extra/conky/PKGBUILD

@@ -12,7 +12,7 @@
 pkgname=conky
 pkgver=1.19.7
 _gitcommit=70ef89411aa0a70c5b25318d0329e1d9e57838d2  # refs/tags/v1.19.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Light-weight system monitor for X, Wayland, and other things, too'
 url='https://github.com/brndnmtthws/conky'
 license=(
@@ -73,13 +73,17 @@ 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() {
   cd ${pkgname}
   cmake \
     -B build \
-    -D CMAKE_BUILD_TYPE=Release \
+    -D CMAKE_BUILD_TYPE=None \
     -D CMAKE_CXX_FLAGS="$CXXFLAGS -ffat-lto-objects" \
     -D MAINTAINER_MODE=OFF \
     -D BUILD_TESTS=ON \