Attachment 215636 Details for Bug 245799 – Optionalize Python support

[patch] Optionalize Python support

gnumeric.python.optional.diff (text/plain), 5.34 KB, created by Jan Beich on 2020-06-16 20:33:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-06-16 20:33:05 UTC

Size: 5.34 KB

patch

obsolete

>From dcc64cdbcf1b6a257976264a23348bdff182906d Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Tue, 16 Jun 2020 19:26:20 +0000
>Subject: [PATCH] math/gnumeric: optionalize Python loader/plugins
>
>- Temporarily disable PYTHON option when Python 3 is default
>
>PR:		245799
>---
> math/gnumeric/Makefile  | 22 ++++++++++++----------
> math/gnumeric/pkg-plist | 26 +++++++++++++-------------
> 2 files changed, 25 insertions(+), 23 deletions(-)
>
>diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
>index 370f835a6314..9e08fa81ce1b 100644
>--- a/math/gnumeric/Makefile
>+++ b/math/gnumeric/Makefile
>@@ -13,9 +13,6 @@ COMMENT=	GNOME spreadsheet program
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-DEPRECATED=	Uses deprecated version of python
>-EXPIRATION_DATE=	2020-09-15
>-
> BUILD_DEPENDS=	itstool:textproc/itstool \
> 		ginstall:sysutils/coreutils
> LIB_DEPENDS=	libgoffice-0.10.so:devel/goffice \
>@@ -23,8 +20,8 @@ LIB_DEPENDS=	libgoffice-0.10.so:devel/goffice \
> 		libpsiconv.so:converters/psiconv
> 
> USES=		cpe desktop-file-utils gettext gmake gnome libtool \
>-		localbase pathfix pkgconfig python:2.7 shebangfix tar:xz
>-USE_GNOME=	cairo intlhack gtk30 libgsf pygobject3
>+		localbase pathfix pkgconfig shebangfix tar:xz
>+USE_GNOME=	cairo intlhack gtk30 libgsf
> USE_LDCONFIG=	yes
> INSTALLS_ICONS=	yes
> GNU_CONFIGURE=	yes
>@@ -41,22 +38,27 @@ GLIB_SCHEMAS=	org.gnome.gnumeric.dialogs.gschema.xml \
> 
> SHEBANG_FILES=	plugins/perl-func/perl_func.pl
> 
>-BINARY_ALIAS=	python=${PYTHON_CMD} \
>-		install=ginstall
>+BINARY_ALIAS=	install=ginstall
> 
> PLIST_SUB=	VERSION=${PORTVERSION} \
> 		GOFFICE=0.10 \
> 		SHORT_VER=${PORTVERSION:R}
> 
> OPTIONS_SUB=	yes
>-OPTIONS_DEFINE=	PERL GDA
>-OPTIONS_DEFAULT=PERL
>+OPTIONS_DEFINE=	PERL PYTHON GDA
>+OPTIONS_DEFAULT=PERL PYTHON
>+OPTIONS_EXCLUDE=	${PYTHON_DEFAULT:N2.7:C/.+/PYTHON/} # Py3 isn't supported yet
> GDA_DESC=	Gnome Database Access plugin
> PERL_DESC=	Support Perl as extension language
> 
> PERL_USES=	perl5
> PERL_CONFIGURE_WITH=	perl
> 
>+PYTHON_USES= 	python
>+PYTHON_USE=	GNOME=pygobject3
>+PYTHON_BINARY_ALIAS=	python=${PYTHON_CMD}
>+PYTHON_CONFIGURE_WITH=	python
>+
> GDA_CONFIGURE_WITH=	gda
> GDA_USE=	GNOME=libgda5-ui
> 
>@@ -64,7 +66,7 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's|^GETTEXT_PACKAGE=gnumeric-$${VERSION}|GETTEXT_PACKAGE=gnumeric|g' \
> 		${WRKSRC}/configure
> 
>-post-install:
>+post-install-PYTHON-on:
> 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d \
> 		${PREFIX}/${dir}/gnumeric -f ${STAGEDIR}${PREFIX}/lib/gnumeric/${PORTVERSION}
> 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d \
>diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
>index a348cb86d501..2f4e7907fefb 100644
>--- a/math/gnumeric/pkg-plist
>+++ b/math/gnumeric/pkg-plist
>@@ -236,11 +236,11 @@ lib/gnumeric/%%VERSION%%/plugins/fn-tsa/plugin.xml
> %%GDA%%lib/gnumeric/%%VERSION%%/plugins/gdaif/ui.xml
> lib/gnumeric/%%VERSION%%/plugins/glpk/glpk.so
> lib/gnumeric/%%VERSION%%/plugins/glpk/plugin.xml
>-lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/glossary-po-header
>-lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.py
>-lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyc
>-lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyo
>-lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/plugin.xml
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/glossary-po-header
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.py
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyc
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyo
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/plugin.xml
> lib/gnumeric/%%VERSION%%/plugins/html/html.so
> lib/gnumeric/%%VERSION%%/plugins/html/plugin.xml
> lib/gnumeric/%%VERSION%%/plugins/lotus/lotus.so
>@@ -263,13 +263,13 @@ lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plan_perfect.so
> lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plugin.xml
> lib/gnumeric/%%VERSION%%/plugins/psiconv/plugin.xml
> lib/gnumeric/%%VERSION%%/plugins/psiconv/psiconv.so
>-lib/gnumeric/%%VERSION%%/plugins/py-func/plugin.xml
>-lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.py
>-lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.pyc
>-lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.pyo
>-lib/gnumeric/%%VERSION%%/plugins/python-loader/plugin.xml
>-lib/gnumeric/%%VERSION%%/plugins/python-loader/python_loader.so
>-lib/gnumeric/%%VERSION%%/plugins/python-loader/ui-console-menu.xml
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/py-func/plugin.xml
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.py
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.pyc
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.pyo
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/python-loader/plugin.xml
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/python-loader/python_loader.so
>+%%PYTHON%%lib/gnumeric/%%VERSION%%/plugins/python-loader/ui-console-menu.xml
> lib/gnumeric/%%VERSION%%/plugins/qpro/plugin.xml
> lib/gnumeric/%%VERSION%%/plugins/qpro/qpro.so
> lib/gnumeric/%%VERSION%%/plugins/sample_datasource/plugin.xml
>@@ -287,7 +287,7 @@ lib/goffice/%%GOFFICE%%/plugins/gnumeric/gnumeric.so
> lib/goffice/%%GOFFICE%%/plugins/gnumeric/plugin.xml
> lib/libspreadsheet-%%VERSION%%.so
> lib/libspreadsheet.so
>-%%PYTHON_SITELIBDIR%%/gi/overrides/Gnm.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/gi/overrides/Gnm.py
> libdata/pkgconfig/libspreadsheet-%%SHORT_VER%%.pc
> man/man1/gnumeric.1.gz
> man/man1/ssconvert.1.gz

Actions: View | Diff

Attachments on bug 245799: 213649 | 215625 | 215635 | 215636