[arch-commits] Commit in grafana-zabbix/trunk (PKGBUILD)

[Florian Pritz]

    Date: Sunday, May 1, 2022 @ 13:10:42
  Author: bluewind
Revision: 1192084

FS#72552 Remove python2 dep + update nodejs; FS#74574 Fix checksum after retag; go 1.18 rebuild

Modified:
  grafana-zabbix/trunk/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-01 12:31:19 UTC (rev 1192083)
+++ PKGBUILD	2022-05-01 13:10:42 UTC (rev 1192084)
@@ -1,25 +1,28 @@
 # Maintainer: Florian Pritz <bluewind at xinu.at>
 pkgname=grafana-zabbix
 pkgver=4.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Zabbix plugin for Grafana dashboard"
 arch=('any')
 url="https://github.com/alexanderzobnin/grafana-zabbix"
 license=('APACHE')
 depends=('grafana')
-makedepends=(yarn python2 libfaketime go git nodejs-lts-fermium) # node-sass depends on node-gyp 3.8.0 which is still python2 https://github.com/sass/node-sass/issues/2877
-source=("$pkgname-$pkgver.tar.gz::https://github.com/alexanderzobnin/grafana-zabbix/archive/v$pkgver.tar.gz")
-sha256sums=('03587d586be11e9e472e1001c949971c6b42053a000c9adc4e43fefac179be54')
+makedepends=(yarn libfaketime go git nodejs-lts-gallium)
+source=("$pkgname-$pkgver-retagged-1.tar.gz::https://github.com/alexanderzobnin/grafana-zabbix/archive/v$pkgver.tar.gz"
+        grafana-zabbix-sass-update-for-node-16.patch::https://github.com/alexanderzobnin/grafana-zabbix/commit/a09d8a983e051cbe4a959c40224426edc3468d10.patch)
+sha256sums=('913efd1d6bfb903eb7e40d79d58fc1d9cf5041d4764bc1f34f1c5997439de1ab'
+	        'ec1c6863ba97db0da505569b0992bc6a3158d54621db20235635e4fbd36eb15c')
 
+prepare() {
+	cd "$pkgname-$pkgver"
+	patch -Np1 -i ../grafana-zabbix-sass-update-for-node-16.patch
+}
+
 build() {
 	cd "$pkgname-$pkgver"
-	export CXXFLAGS+=' -std=c++14 '
 	make install
 	make build
 	make dist
-	# Rerun this part since otherwise the linux_amd64 file ist missing from the
-	# dist dir
-	make dist-backend
 }
 
 check() {