Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Aug 2024 11:56:25 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 03ba8625d5f1 - main - net-im/py-matrix-synapse: Allow build with py-setuptools-rust 1.10.1
Message-ID:  <202408151156.47FBuPLU060953@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=03ba8625d5f1c82809f0e6e560c8eb0a4e3af39d

commit 03ba8625d5f1c82809f0e6e560c8eb0a4e3af39d
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-08-15 09:47:00 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-08-15 11:47:43 +0000

    net-im/py-matrix-synapse: Allow build with py-setuptools-rust 1.10.1
    
    - While I'm here, fix BUILD_DEPENDS usage
    
    Note that <=x.y.z is vulnerable because it's broken when the port got bumped for whatever reasons.
    
    Approved by:    portmgr (blanket)
    With hat:       python
---
 net-im/py-matrix-synapse/Makefile                   | 4 ++--
 net-im/py-matrix-synapse/files/patch-pyproject.toml | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
index 541267021de1..91353d08ef2c 100644
--- a/net-im/py-matrix-synapse/Makefile
+++ b/net-im/py-matrix-synapse/Makefile
@@ -12,8 +12,8 @@ WWW=		https://www.matrix.org
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<=1.9.0:devel/py-poetry-core@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3<=1.9.0:devel/py-setuptools-rust@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<1.9.0_99:devel/py-poetry-core@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3<1.10.1_99:devel/py-setuptools-rust@${PY_FLAVOR}
 # Keep the RUN_DEPENDS layout similar to the pyproject.toml file
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}immutabledict>=2.0:devel/py-immutabledict@${PY_FLAVOR} \
diff --git a/net-im/py-matrix-synapse/files/patch-pyproject.toml b/net-im/py-matrix-synapse/files/patch-pyproject.toml
index e969fb13fa8a..d159eaa17a38 100644
--- a/net-im/py-matrix-synapse/files/patch-pyproject.toml
+++ b/net-im/py-matrix-synapse/files/patch-pyproject.toml
@@ -17,3 +17,12 @@
  # This is used for parsing multipart responses
  python-multipart = ">=0.0.9"
  
+@@ -372,7 +362,7 @@ tomli = ">=1.2.3"
+ # runtime errors caused by build system changes.
+ # We are happy to raise these upper bounds upon request,
+ # provided we check that it's safe to do so (i.e. that CI passes).
+-requires = ["poetry-core>=1.1.0,<=1.9.0", "setuptools_rust>=1.3,<=1.8.1"]
++requires = ["poetry-core>=1.1.0,<=1.9.0", "setuptools_rust>=1.3,<=1.10.1"]
+ build-backend = "poetry.core.masonry.api"
+ 
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408151156.47FBuPLU060953>