From 1a5d574df0baccd1b965fa242569d203d60b15dd Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 28 Oct 2023 10:37:57 -0400
Subject: [PATCH] gnucash: update to 5.4

---
 srcpkgs/gnucash/patches/fix-engine-test.patch | 49 +++++++++++++++++++
 srcpkgs/gnucash/template                      |  8 +--
 2 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnucash/patches/fix-engine-test.patch

diff --git a/srcpkgs/gnucash/patches/fix-engine-test.patch b/srcpkgs/gnucash/patches/fix-engine-test.patch
new file mode 100644
index 0000000000000..5ff36fc5bfc01
--- /dev/null
+++ b/srcpkgs/gnucash/patches/fix-engine-test.patch
@@ -0,0 +1,49 @@
+# Fixes engine test failure on i686
+# Upstream: https://github.com/Gnucash/gnucash/commit/8046eb2c0883b884052b241ec6bf331132194cd1
+diff --git a/libgnucash/engine/gnc-pricedb.cpp b/libgnucash/engine/gnc-pricedb.cpp
+index 47ddac57e73..7d335ebe102 100644
+--- a/libgnucash/engine/gnc-pricedb.cpp
++++ b/libgnucash/engine/gnc-pricedb.cpp
+@@ -2179,9 +2179,9 @@ gnc_pricedb_lookup_day_t64(GNCPriceDB *db,
+ }
+ 
+ // return 0 if price's time matches exactly
+-static int price_same_time (GNCPrice *p, time64 time)
++static int price_same_time (GNCPrice *p, time64 *time)
+ {
+-    return !(gnc_price_get_time64 (p) == time);
++    return !(gnc_price_get_time64 (p) == *time);
+ }
+ 
+ GNCPrice *
+@@ -2194,7 +2194,7 @@ gnc_pricedb_lookup_at_time64(GNCPriceDB *db,
+     if (!db || !c || !currency) return NULL;
+     ENTER ("db=%p commodity=%p currency=%p", db, c, currency);
+     auto price_list = pricedb_get_prices_internal (db, c, currency, TRUE);
+-    auto p = g_list_find_custom (price_list, GUINT_TO_POINTER(t), (GCompareFunc) price_same_time);
++    auto p = g_list_find_custom (price_list, &t, (GCompareFunc) price_same_time);
+     if (p)
+     {
+         rv = GNC_PRICE (p->data);
+@@ -2325,9 +2325,9 @@ gnc_pricedb_lookup_nearest_in_time64(GNCPriceDB *db,
+ }
+ 
+ // return 0 if price's time is less or equal to time
+-static int price_time64_less_or_equal (GNCPrice *p, time64 time)
++static int price_time64_less_or_equal (GNCPrice *p, time64 *time)
+ {
+-    return !(gnc_price_get_time64 (p) <= time);
++    return !(gnc_price_get_time64 (p) <= *time);
+ }
+ 
+ GNCPrice *
+@@ -2341,7 +2341,7 @@ gnc_pricedb_lookup_nearest_before_t64 (GNCPriceDB *db,
+     ENTER ("db=%p commodity=%p currency=%p", db, c, currency);
+     auto price_list = pricedb_get_prices_internal (db, c, currency, TRUE);
+     if (!price_list) return NULL;
+-    auto p = g_list_find_custom (price_list, GUINT_TO_POINTER(t), (GCompareFunc)price_time64_less_or_equal);
++    auto p = g_list_find_custom (price_list, &t, (GCompareFunc)price_time64_less_or_equal);
+     if (p)
+     {
+         current_price = GNC_PRICE (p->data);
+
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 672ce13e73fcb..2cf453e5612b4 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=5.3
-revision=3
+version=5.4
+revision=1
 build_style=cmake
 make_check_target=check
 configure_args="-DWITH_PYTHON=1 -DCOMPILE_GSCHEMAS=OFF"
@@ -16,8 +16,8 @@ maintainer="ManfredU <mu@usselmann.it>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnucash.org"
 changelog="https://raw.githubusercontent.com/Gnucash/gnucash/stable/NEWS"
-distfiles="https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.gz"
-checksum=e0d04e0fd5f03f39136e1f4d941ccd0202b64a6e92418f5382cb6a6772493529
+distfiles="https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}-1.tar.gz"
+checksum=7989c2fff67ff356e99c9a4b8d90a7759c7bde73844afb0595ee1322f4a19ced
 
 pycompile_dirs="usr/share/gnucash/python"
 conf_files="/etc/gnucash/environment"