From 569ec20494665bfd0da787d7c6b1688fc4b1145c Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Sat, 23 Dec 2023 16:22:25 -0500 Subject: [PATCH] gnucash: update to 5.5 --- srcpkgs/gnucash/patches/fix-engine-test.patch | 49 ------------------- srcpkgs/gnucash/template | 6 +-- 2 files changed, 3 insertions(+), 52 deletions(-) delete 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 deleted file mode 100644 index 5ff36fc5bfc01..0000000000000 --- a/srcpkgs/gnucash/patches/fix-engine-test.patch +++ /dev/null @@ -1,49 +0,0 @@ -# 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 2cf453e5612b4..6998c66bc6e86 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,6 +1,6 @@ # Template file for 'gnucash' pkgname=gnucash -version=5.4 +version=5.5 revision=1 build_style=cmake make_check_target=check @@ -16,8 +16,8 @@ maintainer="ManfredU " 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}-1.tar.gz" -checksum=7989c2fff67ff356e99c9a4b8d90a7759c7bde73844afb0595ee1322f4a19ced +distfiles="https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.gz" +checksum=73d2c367f7f1c2da045ce08cb7dfc619e43002ac1e17bb708e3287edff96ae47 pycompile_dirs="usr/share/gnucash/python" conf_files="/etc/gnucash/environment"