Date: Mon, 17 Dec 2018 10:04:16 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487671 - in head/textproc/retext: . files Message-ID: <201812171004.wBHA4GPj045603@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Mon Dec 17 10:04:16 2018 New Revision: 487671 URL: https://svnweb.freebsd.org/changeset/ports/487671 Log: textproc/retext: Fix broken translations; Fix autoplist 1. My previous commit r487632 deleted the empty directory. But it turned out that translation files are supposed to be there. With the help of the upstream, I fixed the translations. As it turned out, USES=qt:5 is needed, and lrelease should be made available to setup.py. The added patch makes setup.py to find lrelease, this was broken upstream. 2. autoplist was not used because it was broken due to the file name mismatch. PYDISTUTILS_INSTALLARGS=--no-rename is a workaround, permanent fix will be added by the upstream later. 3. Add NO_ARCH=yes. Approved by: portmgr (unbreak) Added: head/textproc/retext/files/ head/textproc/retext/files/patch-setup.py (contents, props changed) Deleted: head/textproc/retext/pkg-plist Modified: head/textproc/retext/Makefile Modified: head/textproc/retext/Makefile ============================================================================== --- head/textproc/retext/Makefile Mon Dec 17 09:57:50 2018 (r487670) +++ head/textproc/retext/Makefile Mon Dec 17 10:04:16 2018 (r487671) @@ -2,7 +2,7 @@ PORTNAME= retext PORTVERSION= 7.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= arved@FreeBSD.org @@ -15,15 +15,18 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:te ${PYTHON_PKGNAMEPREFIX}Markups>=3.0.0:textproc/py-markups@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown-math>=0.6:textproc/py-markdown-math@${PY_FLAVOR} -USES= python:3.2+ desktop-file-utils pyqt:5 +USES= python:3.2+ desktop-file-utils pyqt:5 qt:5 USE_GITHUB= yes GH_ACCOUNT= retext-project GH_PROJECT= retext -USE_PYTHON= distutils noflavors +USE_PYTHON= distutils autoplist noflavors +USE_QT= linguisttools_build USE_PYQT= core_run sip_run gui_run widgets_run printsupport_run \ network_run -post-stage: # https://github.com/retext-project/retext/issues/422 - @${RMDIR} ${STAGEDIR}${DATADIR}/locale +PYDISTUTILS_INSTALLARGS= --no-rename # workaround for the plist problem: https://github.com/retext-project/retext/issues/425 +BINARY_ALIAS= lrelease=${LRELEASE} + +NO_ARCH= yes .include <bsd.port.mk> Added: head/textproc/retext/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/retext/files/patch-setup.py Mon Dec 17 10:04:16 2018 (r487671) @@ -0,0 +1,25 @@ +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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812171004.wBHA4GPj045603>