Re: [PR PATCH] [Updated] goaccess: update to 1.9.3

[MIvanchev <MIvanchev@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 394 bytes --]

There is an updated pull request by MIvanchev against master on the void-packages repository

https://github.com/MIvanchev/void-packages goaccess
https://github.com/void-linux/void-packages/pull/50716

goaccess: update to 1.9.3
#### Testing the changes
- I tested the changes in this PR: **briefly**


A patch file from https://github.com/void-linux/void-packages/pull/50716.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-goaccess-50716.patch --]
[-- Type: text/x-diff, Size: 3874 bytes --]

From 07aff573ac00b1a1781ea258ce811c2c3deb30dd Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 6 Jun 2024 10:42:10 +0200
Subject: [PATCH 1/2] libmaxminddb: update to 1.9.1

---
 srcpkgs/libmaxminddb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libmaxminddb/template b/srcpkgs/libmaxminddb/template
index 1bf9f18a1f173a..3305fee4a9308b 100644
--- a/srcpkgs/libmaxminddb/template
+++ b/srcpkgs/libmaxminddb/template
@@ -1,14 +1,14 @@
 # Template file for 'libmaxminddb'
 pkgname=libmaxminddb
-version=1.3.2
+version=1.9.1
 revision=1
 build_style=gnu-configure
-short_desc="A library for working with MaxMind DB files"
+short_desc="C library for the MaxMind DB file format"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="Apache-2.0"
-homepage="https://maxmind.github.io/${pkgname}/"
+homepage="https://maxmind.github.io/libmaxminddb/"
 distfiles="https://github.com/maxmind/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=e6f881aa6bd8cfa154a44d965450620df1f714c6dc9dd9971ad98f6e04f6c0f0
+checksum=a80682a89d915fdf60b35d316232fb04ebf36fff27fda9bd39fe8a38d3cd3f12
 
 libmaxminddb-devel_package() {
 	short_desc+=" - development files"

From 9b8f242fd0d9faa2427fa3c38a67c0d73b33c139 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 6 Jun 2024 10:20:46 +0200
Subject: [PATCH 2/2] goaccess: update to 1.9.3

---
 srcpkgs/goaccess/patches/cross.patch | 15 ---------------
 srcpkgs/goaccess/template            | 13 +++++++++----
 srcpkgs/libmaxminddb/template        |  1 +
 3 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/goaccess/patches/cross.patch

diff --git a/srcpkgs/goaccess/patches/cross.patch b/srcpkgs/goaccess/patches/cross.patch
deleted file mode 100644
index f4a85fc50dba1e..00000000000000
--- a/srcpkgs/goaccess/patches/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -107,6 +107,10 @@ if HAS_SEDTR
- else
- 	./bin2c resources/js/app.js src/appjs.h app_js
- endif
-+ 
-+bin2c$(EXEEXT): src/bin2c.c
-+	gcc $< -o $@
-+
- 
- confdir = $(sysconfdir)/goaccess
- dist_conf_DATA = config/goaccess.conf
-
-
diff --git a/srcpkgs/goaccess/template b/srcpkgs/goaccess/template
index ce6231cc025331..af6db9a3107b1c 100644
--- a/srcpkgs/goaccess/template
+++ b/srcpkgs/goaccess/template
@@ -1,21 +1,26 @@
 # Template file for 'goaccess'
 pkgname=goaccess
-version=1.4.5
+version=1.9.3
 revision=1
+build_helper=qemu
 build_style=gnu-configure
-configure_args="--enable-utf8 --enable-geoip=legacy"
+configure_args="--enable-utf8 --enable-geoip=mmdb"
 hostmakedepends="automake gettext gettext-devel tar"
-makedepends="gettext-devel ncurses-devel geoip-devel"
+makedepends="gettext-devel ncurses-devel libmaxminddb-devel geoip-devel"
 short_desc="Open source real-time web log analyzer and interactive viewer"
 maintainer="Bart Kerkvliet <bart@bannarte.nl>"
 license="MIT"
 homepage="https://goaccess.io"
 distfiles="http://tar.goaccess.io/goaccess-${version}.tar.gz"
-checksum=c4820e781f75d9446f6b1be5fc8d11c6ec94a47fa8dd523001698c589f46c1ba
+checksum=49f0ee49e3c4a95f5f75f6806b0406746fcbf2f9ad971cae23e2ea95d3ec7837
 
 pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "s|\t\./bin2c |\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./bin2c |" Makefile.am
+	fi
 	autoreconf -fi
 }
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/libmaxminddb/template b/srcpkgs/libmaxminddb/template
index 3305fee4a9308b..7f5de9d8461b38 100644
--- a/srcpkgs/libmaxminddb/template
+++ b/srcpkgs/libmaxminddb/template
@@ -3,6 +3,7 @@ pkgname=libmaxminddb
 version=1.9.1
 revision=1
 build_style=gnu-configure
+checkdepends="perl"
 short_desc="C library for the MaxMind DB file format"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="Apache-2.0"