From 253e00e7f6d6e209d89d4e496bc6a8fd236a1d8c Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 17 Dec 2018 10:04:16 +0000 Subject: 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) --- textproc/retext/Makefile | 13 +++++--- textproc/retext/files/patch-setup.py | 25 +++++++++++++++ textproc/retext/pkg-plist | 61 ------------------------------------ 3 files changed, 33 insertions(+), 66 deletions(-) create mode 100644 textproc/retext/files/patch-setup.py delete mode 100644 textproc/retext/pkg-plist (limited to 'textproc') diff --git a/textproc/retext/Makefile b/textproc/retext/Makefile index 4bf9051aba49..9f2ae98feee6 100644 --- a/textproc/retext/Makefile +++ b/textproc/retext/Makefile @@ -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:textproc/py-markdown@${PY_FL ${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 diff --git a/textproc/retext/files/patch-setup.py b/textproc/retext/files/patch-setup.py new file mode 100644 index 000000000000..4659ed375549 --- /dev/null +++ b/textproc/retext/files/patch-setup.py @@ -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: diff --git a/textproc/retext/pkg-plist b/textproc/retext/pkg-plist deleted file mode 100644 index ea775c11d995..000000000000 --- a/textproc/retext/pkg-plist +++ /dev/null @@ -1,61 +0,0 @@ -bin/retext -%%PYTHON_SITELIBDIR%%/ReText-7.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO -%%PYTHON_SITELIBDIR%%/ReText-7.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt -%%PYTHON_SITELIBDIR%%/ReText-7.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt -%%PYTHON_SITELIBDIR%%/ReText-7.0.0-py%%PYTHON_VER%%.egg-info/requires.txt -%%PYTHON_SITELIBDIR%%/ReText-7.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt -%%PYTHON_SITELIBDIR%%/ReText/__init__.py -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/converterprocess.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/converterprocess.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/editor.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/editor.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/fakevimeditor.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/fakevimeditor.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/highlighter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/highlighter.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/icontheme.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/icontheme.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/mdx_posmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/mdx_posmap.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/preview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/preview.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/syncscroll.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/syncscroll.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/tab.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/tab.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/tablemode.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/tablemode.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/webenginepreview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/webenginepreview.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/webkitpreview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/webkitpreview.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/window.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/window.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/xsettings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/ReText/__pycache__/xsettings.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/ReText/config.py -%%PYTHON_SITELIBDIR%%/ReText/converterprocess.py -%%PYTHON_SITELIBDIR%%/ReText/dialogs.py -%%PYTHON_SITELIBDIR%%/ReText/editor.py -%%PYTHON_SITELIBDIR%%/ReText/fakevimeditor.py -%%PYTHON_SITELIBDIR%%/ReText/highlighter.py -%%PYTHON_SITELIBDIR%%/ReText/icontheme.py -%%PYTHON_SITELIBDIR%%/ReText/mdx_posmap.py -%%PYTHON_SITELIBDIR%%/ReText/preview.py -%%PYTHON_SITELIBDIR%%/ReText/syncscroll.py -%%PYTHON_SITELIBDIR%%/ReText/tab.py -%%PYTHON_SITELIBDIR%%/ReText/tablemode.py -%%PYTHON_SITELIBDIR%%/ReText/webenginepreview.py -%%PYTHON_SITELIBDIR%%/ReText/webkitpreview.py -%%PYTHON_SITELIBDIR%%/ReText/window.py -%%PYTHON_SITELIBDIR%%/ReText/xsettings.py -share/appdata/me.mitya57.ReText.appdata.xml -share/applications/me.mitya57.ReText.desktop -share/retext/icons/retext.png -share/retext/icons/retext.svg -- cgit