From c8bfa2db15eb864545c4537cff151fc7ae07bc77 Mon Sep 17 00:00:00 2001 From: Kubilay Kocak Date: Mon, 28 Sep 2020 02:34:02 +0000 Subject: [PATCH] www/py-django-dpaste: Fix RUN_DEPENDS regression ports r549439 caused www/py-django-dpaste to fail to build: py37-django-dpaste-3.3.1_1 depends on package: py37-jsx-lexer=0.0.7 - not found This change backports an upstream commit [1] allowing js-lexer dependency to >=0.0.7 [1] https://github.com/bartTC/dpaste/commit/02a6812c80a7471cffd0e82b5093ac6e7a783bcd Reported by: pkg-fallout MFH: 2020Q3 (build fix, no functional change in quarterly) --- www/py-django-dpaste/Makefile | 2 +- www/py-django-dpaste/files/patch-setup.cfg | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 www/py-django-dpaste/files/patch-setup.cfg diff --git a/www/py-django-dpaste/Makefile b/www/py-django-dpaste/Makefile index 85b936df261d..f22d3d148397 100644 --- a/www/py-django-dpaste/Makefile +++ b/www/py-django-dpaste/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-csp>=3.3:www/py-django-csp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-staticinline>=1.0:www/py-django-staticinline@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsx-lexer=0.0.7:textproc/py-jsx-lexer@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsx-lexer>=0.0.7:textproc/py-jsx-lexer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}misaka>=2.1.0:textproc/py-misaka@${PY_FLAVOR} diff --git a/www/py-django-dpaste/files/patch-setup.cfg b/www/py-django-dpaste/files/patch-setup.cfg new file mode 100644 index 000000000000..aa2d71226348 --- /dev/null +++ b/www/py-django-dpaste/files/patch-setup.cfg @@ -0,0 +1,16 @@ +From 02a6812c80a7471cffd0e82b5093ac6e7a783bcd Mon Sep 17 00:00:00 2001 +From: Martin Mahner +Date: Wed, 8 Jan 2020 13:12:28 +0100 +Subject: [PATCH] Dependency updates and cleanup. + +--- setup.cfg.orig 2020-09-28 02:16:26 UTC ++++ setup.cfg +@@ -35,7 +35,7 @@ install_requires = + django-staticinline>=1.0 + django-csp>=3.3 + +- jsx-lexer==0.0.7 ++ jsx-lexer>=0.0.7 + misaka>=2.1.0 + docutils +