From fe44c01df84c0f5404142acbac19445b9cacf60a Mon Sep 17 00:00:00 2001 From: arved Date: Mon, 11 Feb 2019 21:14:31 +0000 Subject: [PATCH] Update to a snapshot from master. This should fix the wrong desktop file entry. Add missing dependencies while here PR: 235112 Reported by: 0mp Obtained from: https://github.com/retext-project/retext/issues/425 git-svn-id: svn+ssh://svn.freebsd.org/ports/head@492737 35697150-7ecd-e111-bb59-0022644237b5 --- textproc/retext/Makefile | 9 +++++---- textproc/retext/distinfo | 6 +++--- textproc/retext/files/patch-setup.py | 25 ------------------------- 3 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 textproc/retext/files/patch-setup.py diff --git a/textproc/retext/Makefile b/textproc/retext/Makefile index 9c2baf64a6901..63bda85e3635a 100644 --- a/textproc/retext/Makefile +++ b/textproc/retext/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= retext -PORTVERSION= 7.0.0 -PORTREVISION= 3 +DISTVERSION= 7.0.0-130 +DISTVERSIONSUFFIX=-g1c34ae3 CATEGORIES= textproc MAINTAINER= arved@FreeBSD.org @@ -13,7 +13,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE_GPL RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Markups>=3.0.0:textproc/py-markups@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markdown-math>=0.6:textproc/py-markdown-math@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}markdown-math>=0.6:textproc/py-markdown-math@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} USES= python:3.2+ desktop-file-utils pyqt:5 qt:5 USE_GITHUB= yes @@ -24,7 +26,6 @@ USE_QT= linguisttools_build USE_PYQT= core_run sip_run gui_run widgets_run printsupport_run \ network_run -PYDISTUTILS_INSTALLARGS= --no-rename # workaround for the plist problem: https://github.com/retext-project/retext/issues/425 BINARY_ALIAS= lrelease=${LRELEASE} NO_ARCH= yes diff --git a/textproc/retext/distinfo b/textproc/retext/distinfo index 022c001360fb0..d2fc94b5d5137 100644 --- a/textproc/retext/distinfo +++ b/textproc/retext/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532460972 -SHA256 (retext-project-retext-7.0.0_GH0.tar.gz) = 7df3fcdad1d1f9a046ae33591b54dd7a6894de64eb0370f2dabf4cd75eb66586 -SIZE (retext-project-retext-7.0.0_GH0.tar.gz) = 134132 +TIMESTAMP = 1549919363 +SHA256 (retext-project-retext-7.0.0-130-g1c34ae3_GH0.tar.gz) = 2a638c23b467d692e289ce968b35216cf365f1c6dffc045b6dcf5dc3f9c4dab6 +SIZE (retext-project-retext-7.0.0-130-g1c34ae3_GH0.tar.gz) = 268506 diff --git a/textproc/retext/files/patch-setup.py b/textproc/retext/files/patch-setup.py deleted file mode 100644 index 4659ed3755499..0000000000000 --- a/textproc/retext/files/patch-setup.py +++ /dev/null @@ -1,25 +0,0 @@ -Equivalent of the commit 162b0c787e2005efebac7beb97d1dd681bb692b7 -that fixes https://github.com/retext-project/retext/issues/422 - ---- setup.py.orig 2017-02-11 15:21:52 UTC -+++ setup.py -@@ -16,6 +16,7 @@ For more details, please go to the `home - - import platform - import re -+import os - import sys - from os.path import join - from distutils import log -@@ -35,9 +36,10 @@ if sys.version_info[0] < 3: - def build_translations(): - print('running build_translations') - error = None -+ environment = dict(os.environ, QT_SELECT='5') - for ts_file in glob(join('locale', '*.ts')): - try: -- check_call(('lrelease', ts_file), env={'QT_SELECT': '5'}) -+ check_call(('lrelease', ts_file), env=environment) - except Exception as e: - error = e - if error: