gnucash-git: sync with gnucash-devel

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gnucash-git: sync with gnucash-devel
From: Thomas Klausner <tk%giga.or.at@localhost>
Date: Sun, 25 Mar 2018 09:30:46 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Sun Mar 25 11:30:46 2018 +0200
Changeset:	01ce8f5b71537342f5ff6cdc6669bcdef583de71

Modified Files:
	gnucash-git/Makefile
	gnucash-git/PLIST
	gnucash-git/PLIST.python
	gnucash-git/distinfo
	gnucash-git/options.mk
Added Files:
	gnucash-git/PLIST.dbi
	gnucash-git/PLIST.ofx
Removed Files:
	gnucash-git/patches/patch-gnucash_gnucash-bin.c

Log Message:
gnucash-git: sync with gnucash-devel

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

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

diffstat:
 gnucash-git/Makefile                            |  5 +----
 gnucash-git/PLIST                               |  9 ++++----
 gnucash-git/PLIST.dbi                           |  2 ++
 gnucash-git/PLIST.ofx                           |  4 ++++
 gnucash-git/PLIST.python                        |  7 +++---
 gnucash-git/distinfo                            |  1 -
 gnucash-git/options.mk                          | 30 ++++++++++++-------------
 gnucash-git/patches/patch-gnucash_gnucash-bin.c | 25 ---------------------
 8 files changed, 28 insertions(+), 55 deletions(-)

diffs:
diff --git a/gnucash-git/Makefile b/gnucash-git/Makefile
index 1951482c9a..6c9901dbbe 100644
--- a/gnucash-git/Makefile
+++ b/gnucash-git/Makefile
@@ -39,6 +39,7 @@ CMAKE_ARGS+=		-DGMOCK_ROOT=${WRKDIR}/googletest-release-1.8.0/googlemock
 CMAKE_ARGS+=		-DGTEST_ROOT=${WRKDIR}/googletest-release-1.8.0/googletest
 CMAKE_ARGS+=		-DWITH_AQBANKING=OFF
 CMAKE_ARGS+=		-DPERL_EXECUTABLE=${PERL5}
+CMAKE_ARGS+=		-DCOMPILE_GSCHEMAS=OFF
 #CMAKE_ARGS+=		-GNinja
 #BUILD_DEPENDS+=	ninja-build-[0-9]*:../../devel/ninja-build
 
@@ -73,10 +74,6 @@ BUILDLINK_API_DEPENDS.boost-headers+=   boost-headers>=1.64.0nb3
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../lang/guile22/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gnome-keyring+=	gnome-keyring>=0.6
-.include "../../security/gnome-keyring/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libsecret+=	libsecret>=0.18
-.include "../../security/libsecret/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/gnucash-git/PLIST b/gnucash-git/PLIST
index af3dec9756..e5879055d6 100644
--- a/gnucash-git/PLIST
+++ b/gnucash-git/PLIST
@@ -227,7 +227,6 @@ include/gnucash/tree-view-utils.h
 include/gnucash/window-main-summarybar.h
 include/gnucash/window-report.h
 lib/gnucash/libgncmod-app-utils.so
-${PLIST.dbi}lib/gnucash/libgncmod-backend-dbi.so
 lib/gnucash/libgncmod-backend-xml.so
 lib/gnucash/libgncmod-bi-import.so
 lib/gnucash/libgncmod-csv-export.so
@@ -241,7 +240,6 @@ lib/gnucash/libgncmod-html.so
 lib/gnucash/libgncmod-ledger-core.so
 lib/gnucash/libgncmod-locale-reports-us.so
 lib/gnucash/libgncmod-log-replay.so
-${PLIST.ofx}lib/gnucash/libgncmod-ofx.so
 lib/gnucash/libgncmod-qif-import.so
 lib/gnucash/libgncmod-qif.so
 lib/gnucash/libgncmod-register-core.so
@@ -481,7 +479,6 @@ share/glib-2.0/schemas/org.gnucash.dialogs.export.csv.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.import.csv.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.import.generic.gschema.xml
-${PLIST.ofx}share/glib-2.0/schemas/org.gnucash.dialogs.import.ofx.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.import.qif.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.reconcile.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.sxs.gschema.xml
@@ -814,9 +811,13 @@ share/gnucash/accounts/pt_PT/acctchrt_renter.gnucash-xea
 share/gnucash/accounts/pt_PT/acctchrt_retiremt.gnucash-xea
 share/gnucash/accounts/pt_PT/acctchrt_spouseinc.gnucash-xea
 share/gnucash/accounts/pt_PT/acctchrt_spouseretire.gnucash-xea
+share/gnucash/accounts/ru/acctchrt_auto.gnucash-xea
+share/gnucash/accounts/ru/acctchrt_autoloan.gnucash-xea
 share/gnucash/accounts/ru/acctchrt_common.gnucash-xea
 share/gnucash/accounts/ru/acctchrt_homeloan.gnucash-xea
 share/gnucash/accounts/ru/acctchrt_homeown.gnucash-xea
+share/gnucash/accounts/ru/acctchrt_kids.gnucash-xea
+share/gnucash/accounts/ru/acctchrt_otherloan.gnucash-xea
 share/gnucash/accounts/ru/acctchrt_renter.gnucash-xea
 share/gnucash/accounts/sk/acctchrt_brokerage.gnucash-xea
 share/gnucash/accounts/sk/acctchrt_carloan.gnucash-xea
@@ -1003,7 +1004,6 @@ share/gnucash/jqplot/jquery.jqplot.js
 share/gnucash/jqplot/jquery.min.js
 share/gnucash/make-prefs-migration-script.xsl
 share/gnucash/migratable-prefs.xml
-share/gnucash/pixmaps/Makefile
 share/gnucash/pixmaps/gnucash-icon-48x48.bmp
 share/gnucash/pixmaps/gnucash-icon.ico
 share/gnucash/pixmaps/gnucash_splash.png
@@ -1180,7 +1180,6 @@ share/gnucash/ui/gnc-plugin-csv-import-ui.xml
 share/gnucash/ui/gnc-plugin-customer-import-ui.xml
 share/gnucash/ui/gnc-plugin-file-history-ui.xml
 share/gnucash/ui/gnc-plugin-log-replay-ui.xml
-${PLIST.ofx}share/gnucash/ui/gnc-plugin-ofx-ui.xml
 share/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
 share/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
 share/gnucash/ui/gnc-plugin-page-budget-ui.xml
diff --git a/gnucash-git/PLIST.dbi b/gnucash-git/PLIST.dbi
new file mode 100644
index 0000000000..250141882f
--- /dev/null
+++ b/gnucash-git/PLIST.dbi
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+lib/gnucash/libgncmod-backend-dbi.so
diff --git a/gnucash-git/PLIST.ofx b/gnucash-git/PLIST.ofx
new file mode 100644
index 0000000000..6160c85ae2
--- /dev/null
+++ b/gnucash-git/PLIST.ofx
@@ -0,0 +1,4 @@
+@comment $NetBSD$
+lib/gnucash/libgncmod-ofx.so
+share/glib-2.0/schemas/org.gnucash.dialogs.import.ofx.gschema.xml
+share/gnucash/ui/gnc-plugin-ofx-ui.xml
diff --git a/gnucash-git/PLIST.python b/gnucash-git/PLIST.python
index 0829fe2f37..a04017f369 100644
--- a/gnucash-git/PLIST.python
+++ b/gnucash-git/PLIST.python
@@ -1,9 +1,8 @@
 @comment $NetBSD$
-lib/gnucash/libgncmod-app-utils-python.la
-lib/gnucash/libgncmod-python.la
-lib/libgnc-core-utils-python.la
 ${PYSITELIB}/gnucash/__init__.py
-${PYSITELIB}/gnucash/_gnucash_core_c.la
+${PYSITELIB}/gnucash/_gnucash_core_c.so
+${PYSITELIB}/gnucash/_sw_app_utils.so
+${PYSITELIB}/gnucash/_sw_core_utils.so
 ${PYSITELIB}/gnucash/function_class.py
 ${PYSITELIB}/gnucash/gnucash_business.py
 ${PYSITELIB}/gnucash/gnucash_core.py
diff --git a/gnucash-git/distinfo b/gnucash-git/distinfo
index b7a0ab568f..5091d2b643 100644
--- a/gnucash-git/distinfo
+++ b/gnucash-git/distinfo
@@ -4,4 +4,3 @@ 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_gnucash-bin.c) = 0a6c1b1ad303e2120e6ddaf191d906a49233dbe7
diff --git a/gnucash-git/options.mk b/gnucash-git/options.mk
index 4cdd2f03e0..9fb613e656 100644
--- a/gnucash-git/options.mk
+++ b/gnucash-git/options.mk
@@ -2,43 +2,41 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnucash
 PKG_SUPPORTED_OPTIONS=	libdbi libofx python
-PKG_SUGGESTED_OPTIONS=	libdbi libofx
+PKG_SUGGESTED_OPTIONS=	libdbi libofx python
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	dbi ofx
-
 .if !empty(PKG_OPTIONS:Mlibofx)
-PLIST.ofx=	yes
+CMAKE_ARGS+=	-DWITH_OFX=ON
+PLIST_SRC+=	PLIST.ofx
 .include "../../finance/libofx/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-ofx
+CMAKE_ARGS+=	-DWITH_OFX=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibdbi)
-CONFIGURE_ARGS+=	--enable-dbi
-PLIST.dbi=		yes
-
-# to make a configure test happy
-BUILD_DEPENDS+=		libdbi-driver-sqlite3-[0-9]*:../../databases/libdbi-driver-sqlite3
+CMAKE_ARGS+=	-DWITH_SQL=ON
+PLIST_SRC+=	PLIST.dbi
+BUILD_DEPENDS+=	libdbi-driver-sqlite3-[0-9]*:../../databases/libdbi-driver-sqlite3
 .include "../../databases/libdbi/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-dbi
+CMAKE_ARGS+=	-DWITH_SQL=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mpython)
-CONFIGURE_ARGS+=		--enable-python
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 2.6.1
-REPLACE_PYTHON+=		src/python/pycons/*.py src/python/pycons/pycons
+CMAKE_ARGS+=			-DWITH_PYTHON=ON
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+REPLACE_PYTHON+=		bindings/python/example_scripts/*.py
+REPLACE_PYTHON+=		bindings/python/example_scripts/rest-api/*.py
+REPLACE_PYTHON+=		gnucash/python/pycons/*.py
 PY_PATCHPLIST=			yes
 PLIST_SRC+=			PLIST.python
 
-DEPENDS+=		${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
 # /usr/pkg/share/gnucash/python/pycons/console.py imports readline
 DEPENDS+=		${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .else
-CONFIGURE_ARGS+=	--disable-python
+CMAKE_ARGS+=			-DWITH_PYTHON=OFF
 .endif
diff --git a/gnucash-git/patches/patch-gnucash_gnucash-bin.c b/gnucash-git/patches/patch-gnucash_gnucash-bin.c
deleted file mode 100644
index 2e23053abe..0000000000
--- a/gnucash-git/patches/patch-gnucash_gnucash-bin.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-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	2018-02-26 08:15:09.000000000 +0000
-+++ gnucash/gnucash-bin.c
-@@ -22,6 +22,7 @@
-  */
- #include <config.h>
- 
-+#include <signal.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -602,6 +603,8 @@ inner_main (void *closure, int argc, cha
-     SCM main_mod;
-     char* fn;
- 
-+    signal(SIGTTOU, SIG_IGN);
-+
-     scm_c_eval_string("(debug-set! stack 200000)");
- 
-     main_mod = scm_c_resolve_module("gnucash utilities");
Prev by Date: emacs-git: sync PLIST with upstream
Next by Date: beautysh: Import beautysh-3.8 as wip/beautysh
Previous by Thread: urlwatch: update to urlwatch-2.9
Next by Thread: beautysh: Import beautysh-3.8 as wip/beautysh
Indexes:
Home | Main Index | Thread Index | Old Index