From dad33091eb6e53994849ff2042aba168e2739333 Mon Sep 17 00:00:00 2001 From: Manfred Usselmann Date: Sat, 12 Sep 2020 15:32:37 +0200 Subject: [PATCH] gnucash: update to 4.1 --- srcpkgs/gnucash/patches/gchar_ptr_cast.patch | 8 +++--- srcpkgs/gnucash/patches/runTests_py_in.patch | 29 -------------------- srcpkgs/gnucash/template | 8 +++--- 3 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/gnucash/patches/runTests_py_in.patch diff --git a/srcpkgs/gnucash/patches/gchar_ptr_cast.patch b/srcpkgs/gnucash/patches/gchar_ptr_cast.patch index bdbd3b2e3e3..1c232f13d75 100644 --- a/srcpkgs/gnucash/patches/gchar_ptr_cast.patch +++ b/srcpkgs/gnucash/patches/gchar_ptr_cast.patch @@ -121,12 +121,12 @@ for ( i = 0; gas_data[i].loc != NULL; i++ ) { @@ -637,7 +637,7 @@ - - gtk_widget_set_halign (GTK_WIDGET(gas), GTK_ALIGN_FILL); - gtk_widget_set_hexpand (GTK_WIDGET(gas), FALSE); + + gtk_widget_set_halign (GTK_WIDGET(gas), GTK_ALIGN_FILL); + gnc_account_sel_set_hexpand (GNC_ACCOUNT_SEL(gas), true); - g_object_set (GTK_WIDGET(gas), "margin", 2, NULL); + g_object_set (GTK_WIDGET(gas), "margin", 2, (gchar *)NULL); - *(gas_data[i].loc) = gas; + *(gas_data[i].loc) = gas; } } @@ -679,7 +679,7 @@ diff --git a/srcpkgs/gnucash/patches/runTests_py_in.patch b/srcpkgs/gnucash/patches/runTests_py_in.patch deleted file mode 100644 index d29ba404027..00000000000 --- a/srcpkgs/gnucash/patches/runTests_py_in.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- bindings/python/tests/CMakeLists.txt -+++ bindings/python/tests/CMakeLists.txt -@@ -5,7 +5,7 @@ if (WITH_PYTHON) - # Because it hasn't been built yet - set(test_core_dir ${CMAKE_BINARY_DIR}/common/test-core) - endif() -- add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py swig-app-utils-python) -+ add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py sw_app_utils) - add_dependencies(check test-python-bindings) - add_test(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in) - set_property(TEST python-bindings PROPERTY ENVIRONMENT -@@ -21,6 +21,7 @@ set(test_python_bindings_DATA - test_business.py - test_commodity.py - test_numeric.py -+ test_session.py - test_split.py - test_transaction.py - test_query.py) ---- bindings/python/tests/runTests.py.in -+++ bindings/python/tests/runTests.py.in -@@ -5,7 +5,6 @@ import os - - os.environ["GNC_UNINSTALLED"] = "1" - --from test_session import TestSession - from test_book import TestBook - from test_account import TestAccount - from test_split import TestSplit diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index 743e4b1b6c2..008578b9141 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,11 +1,11 @@ # Template file for 'gnucash' pkgname=gnucash -version=3.10 -revision=2 +version=4.1 +revision=1 wrksrc="${pkgname}-${version%b}" build_style=cmake configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1" -hostmakedepends="pkg-config guile python3 libxslt perl gettext" +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" @@ -15,7 +15,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.gnucash.org" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=b60772c276a63639964d1e24c795fbb9a7c0c6c45959168fe5cdfe08eb796f16 +checksum=a40fc37122e1466c8085ad2be914f0687a111065f15c5d952faede78802225aa pycompile_dirs="usr/share/gnucash/python" conf_files="/etc/gnucash/environment"