Attachment 215635 Details for Bug 245799 – Add Python 3 flavor

[patch] Add Python 3 flavor

gnumeric.py27+py37.diff (text/plain), 4.61 KB, created by Jan Beich on 2020-06-16 20:31:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-06-16 20:31:46 UTC

Size: 4.61 KB

patch

obsolete

>From 88c388a6c1a9d6fe0f43cb32b6fcaf88ced0301d 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: move deprecation into py27 flavor
>
>py27 remains default/unsuffixed for now to avoid POLA violtion.
>
>PR:		245799
>---
> math/gnumeric/Makefile  |  9 ++++++++-
> math/gnumeric/pkg-plist | 24 ++++++++++++------------
> 2 files changed, 20 insertions(+), 13 deletions(-)
>
>diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
>index 370f835a6314..6f9a53216ded 100644
>--- a/math/gnumeric/Makefile
>+++ b/math/gnumeric/Makefile
>@@ -5,6 +5,7 @@ PORTNAME=	gnumeric
> PORTVERSION=	1.12.46
> CATEGORIES=	math gnome
> MASTER_SITES=	GNOME
>+PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX:N-py27}
> DIST_SUBDIR=	gnome3
> 
> MAINTAINER=	gnome@FreeBSD.org
>@@ -13,8 +14,10 @@ COMMENT=	GNOME spreadsheet program
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+.if ${FLAVOR:U} == py27
> DEPRECATED=	Uses deprecated version of python
> EXPIRATION_DATE=	2020-09-15
>+.endif
> 
> BUILD_DEPENDS=	itstool:textproc/itstool \
> 		ginstall:sysutils/coreutils
>@@ -23,8 +26,9 @@ 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
>+		localbase pathfix pkgconfig python shebangfix tar:xz
> USE_GNOME=	cairo intlhack gtk30 libgsf pygobject3
>+USE_PYTHON=	flavors
> USE_LDCONFIG=	yes
> INSTALLS_ICONS=	yes
> GNU_CONFIGURE=	yes
>@@ -45,6 +49,7 @@ BINARY_ALIAS=	python=${PYTHON_CMD} \
> 		install=ginstall
> 
> PLIST_SUB=	VERSION=${PORTVERSION} \
>+		PY27=${"${FLAVOR:Mpy27}":?:"@comment "} \
> 		GOFFICE=0.10 \
> 		SHORT_VER=${PORTVERSION:R}
> 
>@@ -64,10 +69,12 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's|^GETTEXT_PACKAGE=gnumeric-$${VERSION}|GETTEXT_PACKAGE=gnumeric|g' \
> 		${WRKSRC}/configure
> 
>+.if ${FLAVOR:U} == py27
> post-install:
> 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d \
> 		${PREFIX}/${dir}/gnumeric -f ${STAGEDIR}${PREFIX}/lib/gnumeric/${PORTVERSION}
> 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d \
> 		${PREFIX}/${dir}/gnumeric -f ${STAGEDIR}${PREFIX}/lib/gnumeric/${PORTVERSION}
>+.endif
> 
> .include <bsd.port.mk>
>diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
>index a348cb86d501..da1d825dbffd 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
>+%%PY27%%lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/glossary-po-header
>+%%PY27%%lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.py
>+%%PY27%%lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyc
>+%%PY27%%lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyo
>+%%PY27%%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
>+%%PY27%%lib/gnumeric/%%VERSION%%/plugins/py-func/plugin.xml
>+%%PY27%%lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.py
>+%%PY27%%lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.pyc
>+%%PY27%%lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.pyo
>+%%PY27%%lib/gnumeric/%%VERSION%%/plugins/python-loader/plugin.xml
>+%%PY27%%lib/gnumeric/%%VERSION%%/plugins/python-loader/python_loader.so
>+%%PY27%%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

Actions: View | Diff

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