diff --git a/gnucash-odr.patch b/gnucash-odr.patch new file mode 100644 index 0000000..8d1c811 --- /dev/null +++ b/gnucash-odr.patch @@ -0,0 +1,30 @@ +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 201985c..6437415 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -2,10 +2,11 @@ Name: gnucash Summary: Finance management application Version: 3.7 URL: http://gnucash.org/ -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/sourceforge/gnucash/gnucash-%{version}.tar.bz2 Patch0: gnucash-glib-warnings.patch +Patch1: gnucash-odr.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1563466 ExcludeArch: ppc64 s390x @@ -90,6 +91,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/gnucas %config(noreplace) %{_sysconfdir}/gnucash/* %changelog +* Fri Jan 17 2020 Jeff Law - 3.7-3 +- Rename one instance of struct _iterate to struct __iterate to + avoid ODR problems with LTO + * Fri Nov 01 2019 Pete Walter - 3.7-2 - Rebuild for ICU 65