pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnucash-git: make python dependency optional, and disable it by default.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Jul 31 00:32:43 2017 +0200
Changeset:	e2cf9a18268d24eada4790912788f3e3adee85e4

Modified Files:
	gnucash-git/Makefile
	gnucash-git/PLIST
	gnucash-git/options.mk
Added Files:
	gnucash-git/PLIST.python

Log Message:
gnucash-git: make python dependency optional, and disable it by default.

With python enabled, gnucash dumps core on startup with a >4000 frames
backtrace. (8.99.1/amd64)

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

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        | 17 -----------------
 gnucash-git/PLIST.python | 18 ++++++++++++++++++
 gnucash-git/options.mk   | 24 ++++++++++++++++++++++--
 4 files changed, 41 insertions(+), 30 deletions(-)

diffs:
diff --git a/gnucash-git/Makefile b/gnucash-git/Makefile
index cb68254884..7537270e20 100644
--- a/gnucash-git/Makefile
+++ b/gnucash-git/Makefile
@@ -18,16 +18,11 @@ LICENSE=		gnu-gpl-v3
 DEPENDS+=		guile-slib>=3.2.1:../../devel/guile-slib
 DEPENDS+=		p5-Finance-Quote-[0-9]*:../../finance/p5-Finance-Quote
 DEPENDS+=		p5-Date-Manip-[0-9]*:../../devel/p5-Date-Manip
-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
 DEPENDS+=		dconf-[0-9]*:../../devel/dconf
 
 # for autoreconf
 BUILD_DEPENDS+=		gettext-m4-[0-9]*:../../devel/gettext-m4
 BUILD_DEPENDS+=		gettext-tools-[0-9]*:../../devel/gettext-tools
-# to make a configure test happy
-BUILD_DEPENDS+=		libdbi-driver-sqlite3-[0-9]*:../../databases/libdbi-driver-sqlite3
 
 GIT_REPOSITORIES=	github
 GIT_MODULE.github=	gnucash
@@ -43,7 +38,6 @@ GNU_CONFIGURE=		yes
 INFO_FILES=		YES
 
 CONFIGURE_ARGS+=	--disable-error-on-warning
-CONFIGURE_ARGS+=	--enable-python
 CONFIGURE_ARGS+=	--with-xdg-data-dirs=${PREFIX}/share
 CONFIGURE_ARGS+=	GTEST_ROOT=${WRKDIR}/googletest-release-1.8.0/googletest
 CONFIGURE_ARGS+=	GMOCK_ROOT=${WRKDIR}/googletest-release-1.8.0/googlemock
@@ -53,9 +47,7 @@ REPLACE_PERL+=		src/backend/xml/test/grab-types.pl
 REPLACE_PERL+=		src/quotes/Quote_example.pl
 REPLACE_PERL+=		src/gnc-test-env.pl
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 2.6.1
-REPLACE_PYTHON+=	src/python/pycons/*.py src/python/pycons/pycons
-PY_PATCHPLIST=		yes
+PLIST_SRC=		PLIST
 
 PKG_SYSCONFSUBDIR=	gnucash
 CONF_FILES+=		${PREFIX}/share/examples/gnucash/gnucash/config ${PKG_SYSCONFDIR}/config
@@ -77,8 +69,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/guile20/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
 BUILDLINK_API_DEPENDS.gnome-keyring+=	gnome-keyring>=0.6
 .include "../../security/gnome-keyring/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libsecret+=	libsecret>=0.18
diff --git a/gnucash-git/PLIST b/gnucash-git/PLIST
index c831455539..6fd3303597 100644
--- a/gnucash-git/PLIST
+++ b/gnucash-git/PLIST
@@ -225,7 +225,6 @@ include/gnucash/table-model.h
 include/gnucash/tree-view-utils.h
 include/gnucash/window-main-summarybar.h
 include/gnucash/window-report.h
-lib/gnucash/libgncmod-app-utils-python.la
 lib/gnucash/libgncmod-app-utils.la
 ${PLIST.dbi}lib/gnucash/libgncmod-backend-dbi.la
 lib/gnucash/libgncmod-backend-xml.la
@@ -243,7 +242,6 @@ lib/gnucash/libgncmod-html.la
 lib/gnucash/libgncmod-ledger-core.la
 lib/gnucash/libgncmod-locale-reports-us.la
 lib/gnucash/libgncmod-log-replay.la
-lib/gnucash/libgncmod-python.la
 lib/gnucash/libgncmod-qif-import.la
 lib/gnucash/libgncmod-qif.la
 lib/gnucash/libgncmod-register-core.la
@@ -385,17 +383,10 @@ lib/gnucash/scm/ccache/2.0/xml-generator.go
 lib/libgnc-backend-sql.la
 lib/libgnc-backend-xml-utils.la
 lib/libgnc-business-ledger.la
-lib/libgnc-core-utils-python.la
 lib/libgnc-core-utils.la
 lib/libgnc-gnome.la
 lib/libgnc-module.la
 lib/libgnc-qof.la
-${PYSITELIB}/gnucash/__init__.py
-${PYSITELIB}/gnucash/_gnucash_core_c.la
-${PYSITELIB}/gnucash/function_class.py
-${PYSITELIB}/gnucash/gnucash_business.py
-${PYSITELIB}/gnucash/gnucash_core.py
-${PYSITELIB}/gnucash/gnucash_core_c.py
 libexec/gnucash/overrides/gnucash-env
 libexec/gnucash/overrides/gnucash-make-guids
 libexec/gnucash/src/libqof/qof/test/kvp_frame.hpp
@@ -983,14 +974,6 @@ share/gnucash/migratable-prefs.xml
 share/gnucash/pixmaps/gnucash-icon-48x48.bmp
 share/gnucash/pixmaps/gnucash-icon.ico
 share/gnucash/pixmaps/gnucash_splash.png
-share/gnucash/python/init.py
-share/gnucash/python/pycons/__init__.py
-share/gnucash/python/pycons/console.py
-share/gnucash/python/pycons/ishell.py
-share/gnucash/python/pycons/pycons
-share/gnucash/python/pycons/setup.py
-share/gnucash/python/pycons/shell.py
-share/gnucash/python/pycons/simple_plot.py
 share/gnucash/scm/build-config.scm
 share/gnucash/scm/business-options.scm
 share/gnucash/scm/business-prefs.scm
diff --git a/gnucash-git/PLIST.python b/gnucash-git/PLIST.python
new file mode 100644
index 0000000000..0829fe2f37
--- /dev/null
+++ b/gnucash-git/PLIST.python
@@ -0,0 +1,18 @@
+@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/function_class.py
+${PYSITELIB}/gnucash/gnucash_business.py
+${PYSITELIB}/gnucash/gnucash_core.py
+${PYSITELIB}/gnucash/gnucash_core_c.py
+share/gnucash/python/init.py
+share/gnucash/python/pycons/__init__.py
+share/gnucash/python/pycons/console.py
+share/gnucash/python/pycons/ishell.py
+share/gnucash/python/pycons/pycons
+share/gnucash/python/pycons/setup.py
+share/gnucash/python/pycons/shell.py
+share/gnucash/python/pycons/simple_plot.py
diff --git a/gnucash-git/options.mk b/gnucash-git/options.mk
index bef7b64d39..35676652f6 100644
--- a/gnucash-git/options.mk
+++ b/gnucash-git/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2016/08/30 04:13:13 jnemeth Exp $
+# $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnucash
-PKG_SUPPORTED_OPTIONS=	libdbi libofx
+PKG_SUPPORTED_OPTIONS=	libdbi libofx python
 PKG_SUGGESTED_OPTIONS=	libdbi libofx
 
 .include "../../mk/bsd.options.mk"
@@ -18,7 +18,27 @@ CONFIGURE_ARGS+=	--disable-ofx
 .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
 .include "../../databases/libdbi/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-dbi
 .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
+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
+.endif


Home | Main Index | Thread Index | Old Index