gnucash: fix build with glib 2.68

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Thu Apr 1 09:54:35 2021 +0200
Changeset:	8d920b02b4c91e6315fb58f8d90cda86059f6ed3

Modified Files:
	gnucash/PLIST
	gnucash/distinfo
Added Files:
	gnucash/patches/patch-gnucash_gnome_assistant-loan.cpp
Removed Files:
	gnucash/TODO

Log Message:
gnucash: fix build with glib 2.68

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8d920b02b4c91e6315fb58f8d90cda86059f6ed3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnucash/PLIST                                      |  2 ++
 gnucash/TODO                                       |  3 ---
 gnucash/distinfo                                   |  1 +
 .../patches/patch-gnucash_gnome_assistant-loan.cpp | 28 ++++++++++++++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diffs:
diff --git a/gnucash/PLIST b/gnucash/PLIST
index 6c76815afa..8bbaf856c7 100644
--- a/gnucash/PLIST
+++ b/gnucash/PLIST
@@ -440,6 +440,7 @@ lib/libgnc-module.so
 lib/libgnucash-guile.so
 man/man1/gnc-fq-dump.1
 man/man1/gnc-fq-helper.1
+man/man1/gnucash-cli.1
 man/man1/gnucash.1
 share/applications/gnucash.desktop
 share/doc/gnucash/AUTHORS
@@ -465,6 +466,7 @@ share/doc/gnucash/ChangeLog.2016
 share/doc/gnucash/ChangeLog.2017
 share/doc/gnucash/ChangeLog.2018
 share/doc/gnucash/ChangeLog.2019
+share/doc/gnucash/ChangeLog.2020
 share/doc/gnucash/DOCUMENTERS
 share/doc/gnucash/HACKING
 share/doc/gnucash/LICENSE
diff --git a/gnucash/TODO b/gnucash/TODO
deleted file mode 100644
index e057560b70..0000000000
--- a/gnucash/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-Does not build because of glib 2.68.0.
-
-https://bugs.gnucash.org/show_bug.cgi?id=798156
diff --git a/gnucash/distinfo b/gnucash/distinfo
index 401e95980b..abc3ece77f 100644
--- a/gnucash/distinfo
+++ b/gnucash/distinfo
@@ -4,3 +4,4 @@ SHA1 (gnucash-4.5.tar.bz2) = f735b922c544f6c99271f2d621b540c0ca3e4a82
 RMD160 (gnucash-4.5.tar.bz2) = 20badb1f56f6377c6050d89121e83a23b47f3c37
 SHA512 (gnucash-4.5.tar.bz2) = 5e6dfebae8845ab7ad8fcb95f38eb1d0907e789637f722fccf31486b05ee9ebbfb60b8c70e1cef1fc5913b73bfdc2251babed09b6f894c266b969874f3dff30b
 Size (gnucash-4.5.tar.bz2) = 14472274 bytes
+SHA1 (patch-gnucash_gnome_assistant-loan.cpp) = 0dc5526c7553d810daa47bc6768f6ebeff33ca86
diff --git a/gnucash/patches/patch-gnucash_gnome_assistant-loan.cpp b/gnucash/patches/patch-gnucash_gnome_assistant-loan.cpp
new file mode 100644
index 0000000000..98e54cbe23
--- /dev/null
+++ b/gnucash/patches/patch-gnucash_gnome_assistant-loan.cpp
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Fix build with glib 2.68
+https://bugs.gnucash.org/show_bug.cgi?id=798156
+
+--- gnucash/gnome/assistant-loan.cpp.orig	2021-03-26 23:08:11.000000000 +0000
++++ gnucash/gnome/assistant-loan.cpp
+@@ -23,6 +23,10 @@
+  * Boston, MA  02110-1301,  USA       gnu%gnu.org@localhost                   *
+ \********************************************************************/
+ 
++#include <glib.h>
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
++
+ extern "C"
+ {
+ #include <config.h>
+@@ -50,9 +54,6 @@ extern "C"
+ #endif
+ }
+ 
+-#include <glib.h>
+-#include <glib/gi18n.h>
+-#include <gtk/gtk.h>
+ #include <gnc-locale-utils.hpp>
+ #include <boost/locale.hpp>
+ #include <string>