From 7e8fecf689f7eb8fd77fe1ec6bfeca33d952b252 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 24 Mar 2023 18:44:59 +0100
Subject: [PATCH] ghex: Update to 42.3

---
 mingw-w64-ghex/002-fread.patch | 18 +++++++++---------
 mingw-w64-ghex/PKGBUILD        | 16 +++++++++-------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/mingw-w64-ghex/002-fread.patch b/mingw-w64-ghex/002-fread.patch
index 0ded1a94c1..295bc32906 100644
--- a/mingw-w64-ghex/002-fread.patch
+++ b/mingw-w64-ghex/002-fread.patch
@@ -1,11 +1,11 @@
---- ghex-3.18.4.orig/src/hex-document.c	2019-07-13 12:32:37.104694200 -0400
-+++ ghex-3.18.4/src/hex-document.c	2019-07-13 12:36:29.883514700 -0400
-@@ -652,7 +652,7 @@
- 	if(!get_document_attributes(doc))
- 		return FALSE;
+--- ghex-42.3/src/hex-buffer-malloc.c.orig	2023-03-24 18:39:24.678199800 +0100
++++ ghex-42.3/src/hex-buffer-malloc.c	2023-03-24 18:39:32.055352700 +0100
+@@ -322,7 +322,7 @@
+ 	if (! update_payload_size_from_file (self))
+ 		goto out;
  
--	if((file = fopen(doc->file_name, "r")) == NULL)
-+	if((file = fopen(doc->file_name, "rb")) == NULL)
- 		return FALSE;
+-	if ((file = fopen(path, "r")) == NULL)
++	if ((file = fopen(path, "rb")) == NULL)
+ 		goto out;
  
- 	doc->gap_size = doc->buffer_size - doc->file_size;
+ 	self->buffer_size = self->payload_size + self->gap_size;
diff --git a/mingw-w64-ghex/PKGBUILD b/mingw-w64-ghex/PKGBUILD
index fe2699b7c8..5b4b917287 100644
--- a/mingw-w64-ghex/PKGBUILD
+++ b/mingw-w64-ghex/PKGBUILD
@@ -3,26 +3,27 @@
 _realname=ghex
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.41.1
+pkgver=42.3
 pkgrel=1
 pkgdesc="A simple binary editor for the Gnome desktop (mingw-w64)"
 url="https://wiki.gnome.org/Apps/Ghex"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
-license=("GPL2")
-options=(strip staticlibs)
+license=("spdx:GPL-2.0-or-later")
 depends=("${MINGW_PACKAGE_PREFIX}-gtk3"
          "${MINGW_PACKAGE_PREFIX}-gtk-update-icon-cache")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-meson"
-             "${MINGW_PACKAGE_PREFIX}-pkg-config")
+             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+             "${MINGW_PACKAGE_PREFIX}-desktop-file-utils"
+)
 source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz
         001-nohelp.patch
         002-fread.patch
         003-gui-app.patch)
-sha256sums=('8b79cf009eae5c47cad0ab53e2199c3a6fb2f3ab61877f359bed524770ee61f7'
+sha256sums=('add40f8ab24921db30d27be58f00273201977d87fdc8d79eceadfa8b0e354def'
             '30a351ef0c0b0bc319edec222de5222879b8eecfb58237e5b25c3c1dccf02788'
-            '670d0ac95803ea84e53d2d3ee27bd272599c4cab92501426644bfde9fef3d2ae'
+            'bd356348c1e017003e97f390f06297f99120f3640ab11874d5b37045a38726bb'
             'e48c7c487bc6a4917c91e3bb08f378916e131ee446b0f2f7bd7666a3478a4141')
 
 prepare() {
@@ -37,10 +38,11 @@ build() {
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  meson \
+  meson setup \
     --prefix="${MINGW_PREFIX}" \
     --buildtype=plain \
     -Ddefault_library=both \
+    -Dmmap-buffer-backend=false \
     "../${_realname}-${pkgver}"
 
   ninja