diff --git a/06033c19cdff0abf4849ecc96e3ce0b0690fcd13.diff b/06033c19cdff0abf4849ecc96e3ce0b0690fcd13.diff deleted file mode 100644 index fd140d8..0000000 --- a/06033c19cdff0abf4849ecc96e3ce0b0690fcd13.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libgnucash/core-utils/binreloc.c b/libgnucash/core-utils/binreloc.c -index 6eab8907c5..2e2067e383 100644 ---- a/libgnucash/core-utils/binreloc.c -+++ b/libgnucash/core-utils/binreloc.c -@@ -475,7 +475,7 @@ find_component_directory (const gchar *default_dir, const gchar* compiled_dir) - prefix = gnc_gbr_find_prefix (NULL); - if (prefix == NULL) - return g_strdup (default_dir ? default_dir : compiled_dir); -- if (!g_getenv("GNC_UNINSTALLE")) -+ if (!g_getenv("GNC_UNINSTALLED")) - { - if (!g_strcmp0 (prefix, PREFIX)) - return g_strdup (compiled_dir); diff --git a/e1b014035753beb111388c8468460b0c61d816bc.diff b/e1b014035753beb111388c8468460b0c61d816bc.diff deleted file mode 100644 index 550bd5e..0000000 --- a/e1b014035753beb111388c8468460b0c61d816bc.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/bindings/python/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt -index 4e68d6d211..dca317de43 100644 ---- a/bindings/python/tests/CMakeLists.txt -+++ b/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) diff --git a/gnucash-boost173.patch b/gnucash-boost173.patch index 18cdc32..4ee5cb6 100644 --- a/gnucash-boost173.patch +++ b/gnucash-boost173.patch @@ -8,16 +8,6 @@ extern "C" { ---- gnucash-3.10/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp~ 2020-06-04 13:03:01.867912528 +0100 -+++ gnucash-3.10/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp 2020-06-04 13:03:15.101912866 +0100 -@@ -29,6 +29,7 @@ - #include "gnc-imp-settings-csv.hpp" - #include "gnc-imp-settings-csv-tx.hpp" - #include -+#include - - extern "C" - { --- gnucash-3.10/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp~ 2020-06-04 13:04:12.725914340 +0100 +++ gnucash-3.10/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp 2020-06-04 13:04:21.125914555 +0100 @@ -29,6 +29,7 @@ diff --git a/gnucash-glib-warnings.patch b/gnucash-glib-warnings.patch deleted file mode 100644 index e5cebce..0000000 --- a/gnucash-glib-warnings.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up gnucash-3.10/CMakeLists.txt.foo gnucash-3.10/CMakeLists.txt ---- gnucash-3.10/CMakeLists.txt.foo 2020-04-13 21:05:06.369243122 -0400 -+++ gnucash-3.10/CMakeLists.txt 2020-04-13 21:05:47.519628601 -0400 -@@ -589,9 +589,9 @@ set(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAK - - - if (UNIX) -- set( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}") -+ set( CMAKE_C_FLAGS "-Werror -DGLIB_DISABLE_DEPRECATION_WARNINGS -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}") - set( CMAKE_C_FLAGS "-Wno-error=deprecated-declarations -std=gnu11 -Wno-error=parentheses ${CMAKE_C_FLAGS}") -- set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}") -+ set( CMAKE_CXX_FLAGS "-Werror -DGLIB_DISABLE_DEPRECATION_WARNINGS -Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}") - set( CMAKE_CXX_FLAGS "-Wno-error=deprecated-declarations ${REGISTER_CXXFLAG} ${CMAKE_CXX_FLAGS}") - set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}") - endif() diff --git a/gnucash-odr.patch b/gnucash-odr.patch deleted file mode 100644 index 8d1c811..0000000 --- a/gnucash-odr.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nrup a/libgnucash/engine/qofid.cpp b/libgnucash/engine/qofid.cpp ---- a/libgnucash/engine/qofid.cpp 2019-01-11 16:57:38.000000000 -0700 -+++ b/libgnucash/engine/qofid.cpp 2020-01-07 13:13:06.884130657 -0700 -@@ -303,7 +303,7 @@ qof_collection_set_data (QofCollection * - - /* =============================================================== */ - --struct _iterate -+struct __iterate - { - QofInstanceForeachCB fcn; - gpointer data; -@@ -312,7 +312,7 @@ struct _iterate - static void - foreach_cb (gpointer item, gpointer arg) - { -- struct _iterate *iter = static_cast<_iterate*>(arg); -+ struct __iterate *iter = static_cast<__iterate*>(arg); - QofInstance *ent = static_cast(item); - - iter->fcn (ent, iter->data); -@@ -322,7 +322,7 @@ void - qof_collection_foreach (const QofCollection *col, QofInstanceForeachCB cb_func, - gpointer user_data) - { -- struct _iterate iter; -+ struct __iterate iter; - GList *entries; - - g_return_if_fail (col); diff --git a/gnucash.spec b/gnucash.spec index ce3706a..ea9b772 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -1,38 +1,32 @@ Name: gnucash Summary: Finance management application -Version: 3.10 +Version: 3.903 URL: http://gnucash.org/ Release: 5%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/sourceforge/gnucash/gnucash-%{version}.tar.bz2 -Patch0: gnucash-glib-warnings.patch -Patch1: gnucash-odr.patch Patch2: gnucash-boost173.patch # upstream git fixes -Patch100: 06033c19cdff0abf4849ecc96e3ce0b0690fcd13.diff -Patch101: e1b014035753beb111388c8468460b0c61d816bc.diff # https://bugzilla.redhat.com/show_bug.cgi?id=1563466 ExcludeArch: ppc64 s390x -BuildRequires: gcc, gcc-c++, cmake +BuildRequires: gcc, gcc-c++, cmake >= 3.10 BuildRequires: perl-generators, perl-podlators -BuildRequires: libxml2 >= 2.5.10, libxslt-devel, zlib-devel -BuildRequires: gtk3 >= 3.14.0, glib2 >= 2.40.0 -BuildRequires: libofx-devel, aqbanking-devel -# bundled for now -#, gwenhywfar-gui-gtk3-devel -BuildRequires: guile-devel >= 5:2.0, swig >= 2.0.10 +BuildRequires: libxml2 >= 2.9.4, libxslt-devel, zlib-devel +BuildRequires: gtk3 >= 3.22.30, glib2 >= 2.56.1 +BuildRequires: libofx-devel, aqbanking-devel, gwenhywfar-gui-gtk3-devel +BuildRequires: guile-devel >= 5:2.0.14, swig >= 3.0.12 BuildRequires: desktop-file-utils, gettext BuildRequires: libdbi-devel, libdbi-dbd-mysql, libdbi-dbd-pgsql, libdbi-dbd-sqlite BuildRequires: ktoblzcheck-devel -BuildRequires: libsecret-devel BuildRequires: libappstream-glib -BuildRequires: boost-devel >= 1.50.0 -BuildRequires: gtest-devel, gmock-devel -BuildRequires: webkitgtk4-devel -BuildRequires: python3-devel +BuildRequires: libsecret-devel >= 0.18 +BuildRequires: boost-devel >= 1.67.0 +BuildRequires: gtest-devel >= 1.8.0, gmock-devel >= 1.8.0 +BuildRequires: webkitgtk4-devel >= 2.14.1 +BuildRequires: python3-devel >= 3.6 Requires: gnucash-docs >= %{version} Requires: dconf @@ -73,7 +67,8 @@ rm -rf $RPM_BUILD_ROOT/%{_infodir} \ $RPM_BUILD_ROOT/%{_libdir}/lib*.a \ $RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a \ $RPM_BUILD_ROOT/%{_bindir}/gnc-test-env \ - $RPM_BUILD_ROOT/%{_bindir}/gnc-fq-update + $RPM_BUILD_ROOT/%{_bindir}/gnc-fq-update \ + $RPM_BUILD_ROOT/%{_datadir}/guile/site/2.0/tests find $RPM_BUILD_ROOT/%{_libdir} -name *.la -exec rm -f {} \; @@ -91,6 +86,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/gnucas %exclude /usr/lib/debug %{_datadir}/glib-2.0/schemas/* %{_datadir}/gnucash +%{_datadir}/guile/site/2.0/gnucash %{_datadir}/metainfo/* %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/apps/*