gnucash-git: adapt to upstream changes.

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

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Mon Feb 26 09:48:04 2018 +0100
Changeset:	6579596d5039d76668eefabd2503649acfffe607

Modified Files:
	gnucash-git/Makefile
	gnucash-git/PLIST
	gnucash-git/distinfo
	gnucash-git/patches/patch-gnucash_gnucash-bin.c
Removed Files:
	gnucash-git/patches/patch-gnucash_CMakeLists.txt
	gnucash-git/patches/patch-gnucash_ugly-hack_CMakeLists.txt

Log Message:
gnucash-git: adapt to upstream changes.

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

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

diffstat:
 gnucash-git/Makefile                               | 12 +++-------
 gnucash-git/PLIST                                  | 27 ++++++----------------
 gnucash-git/distinfo                               |  4 +---
 gnucash-git/patches/patch-gnucash_CMakeLists.txt   | 26 ---------------------
 gnucash-git/patches/patch-gnucash_gnucash-bin.c    |  6 ++---
 .../patches/patch-gnucash_ugly-hack_CMakeLists.txt |  8 -------
 6 files changed, 14 insertions(+), 69 deletions(-)

diffs:
diff --git a/gnucash-git/Makefile b/gnucash-git/Makefile
index cbfacec8d3..90f7867b28 100644
--- a/gnucash-git/Makefile
+++ b/gnucash-git/Makefile
@@ -57,17 +57,11 @@ REPLACE_PERL+=		util/elegant-sort.pl
 PLIST_SRC=		PLIST
 
 PKG_SYSCONFSUBDIR=	gnucash
-CONF_FILES+=		${PREFIX}/share/examples/gnucash/gnucash/config ${PKG_SYSCONFDIR}/config
-CONF_FILES+=		${PREFIX}/share/examples/gnucash/gnucash/environment ${PKG_SYSCONFDIR}/environment
-INSTALLATION_DIRS=	share/examples/gnucash/gnucash
+CONF_FILES+=		${PREFIX}/share/examples/gnucash/environment ${PKG_SYSCONFDIR}/environment
+INSTALLATION_DIRS=	share/examples/gnucash
 
 post-install:
-	${MV} ${DESTDIR}${PREFIX}/etc/gnucash/config ${DESTDIR}${PREFIX}/share/examples/gnucash/gnucash/config
-	${MV} ${DESTDIR}${PREFIX}/etc/gnucash/environment ${DESTDIR}${PREFIX}/share/examples/gnucash/gnucash/environment
-
-# remove after 2.7.5
-pre-patch:
-	${MKDIR} -p ${WRKSRC}/gnucash/ugly-hack
+	${MV} ${DESTDIR}${PREFIX}/etc/gnucash/environment ${DESTDIR}${PREFIX}/share/examples/gnucash/environment
 
 .include "options.mk"
 
diff --git a/gnucash-git/PLIST b/gnucash-git/PLIST
index 403a121d78..af3dec9756 100644
--- a/gnucash-git/PLIST
+++ b/gnucash-git/PLIST
@@ -250,7 +250,6 @@ lib/gnucash/libgncmod-report-gnome.so
 lib/gnucash/libgncmod-report-system.so
 lib/gnucash/libgncmod-stylesheets.so
 lib/gnucash/libgncmod-tax-us.so
-lib/gnucash/scm/ccache/2.2/build-config.go
 lib/gnucash/scm/ccache/2.2/business-options.go
 lib/gnucash/scm/ccache/2.2/business-prefs.go
 lib/gnucash/scm/ccache/2.2/c-interface.go
@@ -281,9 +280,8 @@ lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-multi.go
 lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-swigged-c.go
 lib/gnucash/scm/ccache/2.2/gnucash/gnome-utils.go
 lib/gnucash/scm/ccache/2.2/gnucash/import-export/qif-import.go
-lib/gnucash/scm/ccache/2.2/gnucash/main.go
+lib/gnucash/scm/ccache/2.2/gnucash/import-export/string.go
 lib/gnucash/scm/ccache/2.2/gnucash/price-quotes.go
-lib/gnucash/scm/ccache/2.2/gnucash/printf.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/aging.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/balsheet-eg.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/business-reports.go
@@ -367,8 +365,7 @@ lib/gnucash/scm/ccache/2.2/gnucash/reports/test-load-report-gnome-module.go
 lib/gnucash/scm/ccache/2.2/gnucash/tax/de_DE.go
 lib/gnucash/scm/ccache/2.2/gnucash/tax/us.go
 lib/gnucash/scm/ccache/2.2/gnucash/unittest-support.go
-lib/gnucash/scm/ccache/2.2/gnumeric/gnumeric-utilities.go
-lib/gnucash/scm/ccache/2.2/gnumeric/table-utils.go
+lib/gnucash/scm/ccache/2.2/gnucash/utilities.go
 lib/gnucash/scm/ccache/2.2/hooks.go
 lib/gnucash/scm/ccache/2.2/html-acct-table.go
 lib/gnucash/scm/ccache/2.2/html-barchart.go
@@ -399,8 +396,6 @@ lib/gnucash/scm/ccache/2.2/qif-import/qif-utils.go
 lib/gnucash/scm/ccache/2.2/report-utilities.go
 lib/gnucash/scm/ccache/2.2/report.go
 lib/gnucash/scm/ccache/2.2/simple-obj.go
-lib/gnucash/scm/ccache/2.2/string.go
-lib/gnucash/scm/ccache/2.2/substring-search.go
 lib/gnucash/scm/ccache/2.2/test-account.go
 lib/gnucash/scm/ccache/2.2/test-c-interface.go
 lib/gnucash/scm/ccache/2.2/test-create-account.go
@@ -410,7 +405,6 @@ lib/gnucash/scm/ccache/2.2/txf-de_DE.go
 lib/gnucash/scm/ccache/2.2/txf-help-de_DE.go
 lib/gnucash/scm/ccache/2.2/txf-help.go
 lib/gnucash/scm/ccache/2.2/txf.go
-lib/gnucash/scm/ccache/2.2/xml-generator.go
 lib/libgnc-backend-sql.so
 lib/libgnc-backend-xml-utils.so
 lib/libgnc-core-utils.so
@@ -470,6 +464,7 @@ share/doc/gnucash/bogus.qif
 share/doc/gnucash/cbb-export.qif
 share/doc/gnucash/currency_tree_xml.gnucash
 share/doc/gnucash/every.qif
+share/doc/gnucash/gtk-3.0.css
 share/doc/gnucash/guile-hackers.txt
 share/doc/gnucash/invoice.csv
 share/doc/gnucash/ms-money.qif
@@ -478,8 +473,7 @@ share/doc/gnucash/quicktest.qif
 share/doc/gnucash/swipe.qif
 share/doc/gnucash/taxreport.gnucash
 share/doc/gnucash/web.qif
-share/examples/gnucash/gnucash/config
-share/examples/gnucash/gnucash/environment
+share/examples/gnucash/environment
 share/glib-2.0/schemas/org.gnucash.dialogs.business.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.checkprinting.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.commodities.gschema.xml
@@ -596,6 +590,7 @@ share/gnucash/accounts/en_GB/acctchrt_retiremt.gnucash-xea
 share/gnucash/accounts/en_GB/acctchrt_spouseinc.gnucash-xea
 share/gnucash/accounts/en_GB/acctchrt_spouseretire.gnucash-xea
 share/gnucash/accounts/en_GB/uk-vat.gnucash-xea
+share/gnucash/accounts/en_IN/acctchrt_gstindia.gnucash-xea
 share/gnucash/accounts/es_ES/acctchrt_brokerage.gnucash-xea
 share/gnucash/accounts/es_ES/acctchrt_carloan.gnucash-xea
 share/gnucash/accounts/es_ES/acctchrt_cdmoneymkt.gnucash-xea
@@ -879,7 +874,6 @@ share/gnucash/checks/quicken_3part.chk
 share/gnucash/checks/quicken_check_21.chk
 share/gnucash/checks/quicken_wallet.chk
 share/gnucash/checks/voucher.chk
-share/gnucash/gtkbuilder/Makefile
 share/gnucash/gtkbuilder/assistant-acct-period.glade
 share/gnucash/gtkbuilder/assistant-csv-account-import.glade
 share/gnucash/gtkbuilder/assistant-csv-export.glade
@@ -1013,7 +1007,6 @@ share/gnucash/pixmaps/Makefile
 share/gnucash/pixmaps/gnucash-icon-48x48.bmp
 share/gnucash/pixmaps/gnucash-icon.ico
 share/gnucash/pixmaps/gnucash_splash.png
-share/gnucash/scm/build-config.scm
 share/gnucash/scm/business-options.scm
 share/gnucash/scm/business-prefs.scm
 share/gnucash/scm/c-interface.scm
@@ -1044,9 +1037,8 @@ share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-scm-multi.scm
 share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-swigged-c.scm
 share/gnucash/scm/gnucash/gnome-utils.scm
 share/gnucash/scm/gnucash/import-export/qif-import.scm
-share/gnucash/scm/gnucash/main.scm
+share/gnucash/scm/gnucash/import-export/string.scm
 share/gnucash/scm/gnucash/price-quotes.scm
-share/gnucash/scm/gnucash/printf.scm
 share/gnucash/scm/gnucash/report/aging.scm
 share/gnucash/scm/gnucash/report/balsheet-eg.css
 share/gnucash/scm/gnucash/report/balsheet-eg.eguile.scm
@@ -1136,8 +1128,7 @@ share/gnucash/scm/gnucash/reports/test-load-report-gnome-module.scm
 share/gnucash/scm/gnucash/tax/de_DE.scm
 share/gnucash/scm/gnucash/tax/us.scm
 share/gnucash/scm/gnucash/unittest-support.scm
-share/gnucash/scm/gnumeric/gnumeric-utilities.scm
-share/gnucash/scm/gnumeric/table-utils.scm
+share/gnucash/scm/gnucash/utilities.scm
 share/gnucash/scm/hooks.scm
 share/gnucash/scm/html-acct-table.scm
 share/gnucash/scm/html-barchart.scm
@@ -1168,8 +1159,6 @@ share/gnucash/scm/qif-import/qif-utils.scm
 share/gnucash/scm/report-utilities.scm
 share/gnucash/scm/report.scm
 share/gnucash/scm/simple-obj.scm
-share/gnucash/scm/string.scm
-share/gnucash/scm/substring-search.scm
 share/gnucash/scm/test-account.scm
 share/gnucash/scm/test-c-interface.scm
 share/gnucash/scm/test-create-account.scm
@@ -1179,9 +1168,7 @@ share/gnucash/scm/txf-de_DE.scm
 share/gnucash/scm/txf-help-de_DE.scm
 share/gnucash/scm/txf-help.scm
 share/gnucash/scm/txf.scm
-share/gnucash/scm/xml-generator.scm
 share/gnucash/tip_of_the_day.list
-share/gnucash/ui/Makefile
 share/gnucash/ui/gnc-main-window-ui.xml
 share/gnucash/ui/gnc-plugin-account-tree-ui.xml
 share/gnucash/ui/gnc-plugin-basic-commands-ui.xml
diff --git a/gnucash-git/distinfo b/gnucash-git/distinfo
index fc449afa34..b7a0ab568f 100644
--- a/gnucash-git/distinfo
+++ b/gnucash-git/distinfo
@@ -4,6 +4,4 @@ SHA1 (googletest-1.8.0.tar.gz) = e7e646a6204638fe8e87e165292b8dd9cd4c36ed
 RMD160 (googletest-1.8.0.tar.gz) = b0a9e48874df3291a261ed85a0c0a4d677b01dc1
 SHA512 (googletest-1.8.0.tar.gz) = 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 Size (googletest-1.8.0.tar.gz) = 1281617 bytes
-SHA1 (patch-gnucash_CMakeLists.txt) = e88a47ee90e9db8d91238a81a89b89d436fd6f5d
-SHA1 (patch-gnucash_gnucash-bin.c) = 065610e4bdf340913cb15e08e6382a7f92a0908f
-SHA1 (patch-gnucash_ugly-hack_CMakeLists.txt) = f5f163869ec55e3f895c30343412ffe793909517
+SHA1 (patch-gnucash_gnucash-bin.c) = 0a6c1b1ad303e2120e6ddaf191d906a49233dbe7
diff --git a/gnucash-git/patches/patch-gnucash_CMakeLists.txt b/gnucash-git/patches/patch-gnucash_CMakeLists.txt
deleted file mode 100644
index 0bd91740bd..0000000000
--- a/gnucash-git/patches/patch-gnucash_CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-From https://bugzilla.gnome.org/show_bug.cgi?id=792884
-
---- gnucash/CMakeLists.txt.orig	2018-02-03 15:01:36.000000000 +0000
-+++ gnucash/CMakeLists.txt
-@@ -27,6 +27,9 @@ ADD_SUBDIRECTORY (import-export)
- ADD_SUBDIRECTORY (python)
- ADD_SUBDIRECTORY (register)
- ADD_SUBDIRECTORY (report)
-+#This needs to go last so that glib-compile-schemas runs after all of
-+#the schema files are installed.
-+ADD_SUBDIRECTORY (ugly-hack)
- 
- ADD_DEFINITIONS (-DHAVE_CONFIG_H)
- 
-@@ -257,9 +260,6 @@ add_custom_command(
- 
- add_custom_target(compiled-schemas ALL DEPENDS ${SCHEMADIR_BUILD}/gschemas.compiled)
- 
--install(FILES ${SCHEMADIR_BUILD}/gschemas.compiled DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
--
--
- # The GResource Files are absolute paths but SET_LOCAL_DIST requires
- # relative paths.
- FOREACH(gres_file ${gresource_files})
diff --git a/gnucash-git/patches/patch-gnucash_gnucash-bin.c b/gnucash-git/patches/patch-gnucash_gnucash-bin.c
index 9e2456f7f4..2e23053abe 100644
--- a/gnucash-git/patches/patch-gnucash_gnucash-bin.c
+++ b/gnucash-git/patches/patch-gnucash_gnucash-bin.c
@@ -4,7 +4,7 @@ Allow starting gnucash in the background.
 python's readline module causes a SIGTTOU to be sent and if this
 is not handled (even by ignoring it), it stops the process.
 
---- gnucash/gnucash-bin.c.orig	2017-10-28 21:23:58.000000000 +0000
+--- gnucash/gnucash-bin.c.orig	2018-02-26 08:15:09.000000000 +0000
 +++ gnucash/gnucash-bin.c
 @@ -22,6 +22,7 @@
   */
@@ -14,7 +14,7 @@ is not handled (even by ignoring it), it stops the process.
  #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
-@@ -608,6 +609,8 @@ inner_main (void *closure, int argc, cha
+@@ -602,6 +603,8 @@ inner_main (void *closure, int argc, cha
      SCM main_mod;
      char* fn;
  
@@ -22,4 +22,4 @@ is not handled (even by ignoring it), it stops the process.
 +
      scm_c_eval_string("(debug-set! stack 200000)");
  
-     main_mod = scm_c_resolve_module("gnucash main");
+     main_mod = scm_c_resolve_module("gnucash utilities");
diff --git a/gnucash-git/patches/patch-gnucash_ugly-hack_CMakeLists.txt b/gnucash-git/patches/patch-gnucash_ugly-hack_CMakeLists.txt
deleted file mode 100644
index 15ff388420..0000000000
--- a/gnucash-git/patches/patch-gnucash_ugly-hack_CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD$
-
-From https://bugzilla.gnome.org/show_bug.cgi?id=792884
-
---- gnucash/ugly-hack/CMakeLists.txt.orig	2018-02-09 20:30:58.475024471 +0000
-+++ gnucash/ugly-hack/CMakeLists.txt
-@@ -0,0 +1 @@
-+install(CODE "execute_process(COMMAND ${GLIB_COMPILE_SCHEMAS} ${CMAKE_INSTALL_FULL_DATADIR}/glib-2.0/schemas)")