From a841d1b2030c55473cddd13af157aedf20ac7749 Mon Sep 17 00:00:00 2001 From: Manfred Usselmann Date: Mon, 28 Dec 2020 17:33:20 +0100 Subject: [PATCH 1/6] gnucash: update to 4.3 --- srcpkgs/gnucash/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index 622b0ee6e3e..fdef279dc6b 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,7 +1,7 @@ # Template file for 'gnucash' pkgname=gnucash -version=4.2 -revision=3 +version=4.3 +revision=1 wrksrc="${pkgname}-${version%b}" build_style=cmake configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1" @@ -14,9 +14,9 @@ short_desc="Financial-accounting software" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.gnucash.org" -#distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -distfiles="https://sources.voidlinux.org/gnucash-${version}/gnucash-${version}.tar.bz2" -checksum=56d8ab039ef7784303ca9eab14bfc20f593f7a3f9b682a8a7eac25906a0d1308 +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" +#distfiles="https://sources.voidlinux.org/gnucash-${version}/gnucash-${version}.tar.bz2" +checksum=117e307deaf8de20b09f3aaa0036f6059131d482eaafa8094a1f8f450b75bcc4 pycompile_dirs="usr/share/gnucash/python" conf_files="/etc/gnucash/environment" From d87e94bb917482727d0e1b34c745cd05a6e181af Mon Sep 17 00:00:00 2001 From: Manfred Usselmann Date: Tue, 29 Dec 2020 22:36:08 +0100 Subject: [PATCH 2/6] gnucash: update to 4.4 --- srcpkgs/gnucash/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index fdef279dc6b..400cd4c5f0b 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,6 +1,6 @@ # Template file for 'gnucash' pkgname=gnucash -version=4.3 +version=4.4 revision=1 wrksrc="${pkgname}-${version%b}" build_style=cmake @@ -16,7 +16,7 @@ license="GPL-2.0-or-later" homepage="http://www.gnucash.org" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" #distfiles="https://sources.voidlinux.org/gnucash-${version}/gnucash-${version}.tar.bz2" -checksum=117e307deaf8de20b09f3aaa0036f6059131d482eaafa8094a1f8f450b75bcc4 +checksum=d91e0d126b461d71de1bc1b20d9cf142704353dec07d3e6599d138422759e67a pycompile_dirs="usr/share/gnucash/python" conf_files="/etc/gnucash/environment" From b3b54bd0ae5439289d14776c06c7958b41a25bdb Mon Sep 17 00:00:00 2001 From: Manfred Usselmann Date: Sun, 3 Jan 2021 13:37:02 +0100 Subject: [PATCH 3/6] make_check_target=check --- srcpkgs/gnucash/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index 400cd4c5f0b..4bfa5eccfcc 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -4,6 +4,7 @@ version=4.4 revision=1 wrksrc="${pkgname}-${version%b}" build_style=cmake +make_check_target=check configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1" hostmakedepends="pkg-config guile python3 libxslt perl gettext swig" makedepends="aqbanking-devel boost-devel gc-devel glib-devel gtest-devel guile-devel From 1d31ce38623c1a2a384eb6dd58a26f73fbe1fd22 Mon Sep 17 00:00:00 2001 From: Manfred Usselmann Date: Sun, 3 Jan 2021 20:12:22 +0100 Subject: [PATCH 4/6] add tzdata as dependency --- srcpkgs/gnucash/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index 4bfa5eccfcc..ed1143d4817 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -9,7 +9,7 @@ configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1" hostmakedepends="pkg-config guile python3 libxslt perl gettext swig" makedepends="aqbanking-devel boost-devel gc-devel glib-devel gtest-devel guile-devel gwenhywfar-devel ktoblzcheck-devel libofx-devel libsecret-devel - libxslt-devel webkit2gtk-devel python3-devel gwenhywfar-gtk3" + libxslt-devel webkit2gtk-devel python3-devel gwenhywfar-gtk3 tzdata" depends="dconf guile perl" short_desc="Financial-accounting software" maintainer="Orphaned " From 7be72d5302512cafce84d69a6bf4466aa067eab5 Mon Sep 17 00:00:00 2001 From: Manfred Usselmann Date: Thu, 4 Feb 2021 23:07:12 +0100 Subject: [PATCH 5/6] Disable two tests which require having the fr_FR and de_DE locales installed. --- srcpkgs/gnucash/patches/disabletests.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/gnucash/patches/disabletests.patch diff --git a/srcpkgs/gnucash/patches/disabletests.patch b/srcpkgs/gnucash/patches/disabletests.patch new file mode 100644 index 00000000000..fe18e21f1f1 --- /dev/null +++ b/srcpkgs/gnucash/patches/disabletests.patch @@ -0,0 +1,14 @@ +--- libgnucash/engine/test/CMakeLists.txt 2020-07-11 01:39:03.000000000 +0200 ++++ libgnucash/engine/test/CMakeLists.txt 2021-01-31 22:22:19.782029671 +0100 +@@ -49,3 +49,3 @@ if (NOT WIN32) +- set(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c) +- add_engine_test(test-qof "${SOURCES}") +- target_compile_definitions(test-qof PRIVATE TESTPROG=test_qof) ++ # set(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c) ++ # add_engine_test(test-qof "${SOURCES}") ++ # target_compile_definitions(test-qof PRIVATE TESTPROG=test_qof) +@@ -167,2 +167,2 @@ set(test_gnc_numeric_SOURCES +-gnc_add_test(test-gnc-numeric "${test_gnc_numeric_SOURCES}" +- gtest_engine_INCLUDES gtest_qof_LIBS) ++# gnc_add_test(test-gnc-numeric "${test_gnc_numeric_SOURCES}" ++# gtest_engine_INCLUDES gtest_qof_LIBS) From dd100c07be7c5cb60399ea6cb8be13b499e1b56e Mon Sep 17 00:00:00 2001 From: Manfred Usselmann Date: Sat, 6 Feb 2021 20:03:01 +0100 Subject: [PATCH 6/6] Fix use-after-free in test_xaccTransEqual --- srcpkgs/gnucash/patches/fixtest.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/gnucash/patches/fixtest.patch diff --git a/srcpkgs/gnucash/patches/fixtest.patch b/srcpkgs/gnucash/patches/fixtest.patch new file mode 100644 index 00000000000..4404d99a534 --- /dev/null +++ b/srcpkgs/gnucash/patches/fixtest.patch @@ -0,0 +1,17 @@ +--- libgnucash/engine/test/utest-Transaction.cpp ++++ libgnucash/engine/test/utest-Transaction.cpp +@@ -901,7 +901,6 @@ test_xaccTransEqual (Fixture *fixture, gconstpointer pData) + g_assert_cmpint (check->hits, ==, 10); + g_assert_cmpint (check2->hits, ==, 1); + +- g_free (check->msg); + g_free (check2->msg); + check2->msg = g_strdup_printf ( + "[xaccTransEqual] splits %s and %s differ", split_guid0, split_guid0); +@@ -924,6 +923,7 @@ test_xaccTransEqual (Fixture *fixture, gconstpointer pData) + auto bal01 = gnc_numeric_to_string (split01->balance); + auto bal10 = gnc_numeric_to_string (split10->balance); + auto bal11 = gnc_numeric_to_string (split11->balance); ++ g_free (check->msg); + check->msg = g_strdup_printf("[xaccSplitEqualCheckBal] balances differ: %s vs %s", bal10, bal00); + check3->msg = g_strdup_printf("[xaccSplitEqualCheckBal] balances differ: %s vs %s", bal11, bal01); \ No newline at end of file