From nobody Mon Jun 05 18:51:32 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QZjPc4V69z4ZvFX; Mon, 5 Jun 2023 18:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QZjPc3Pj1z3sLD; Mon, 5 Jun 2023 18:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685991092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3AY1zHg64BIZKNCYSPpzqBl33apoga7QI3CEvtk4eq8=; b=tRNNFjr8tsmAD7AEcAZObzQ0RHe+Z82AFdtRyq7BwFbaZjmLcQ80lDaOULJGJtZOd21taT uwI/lVost0+nlNyIuIshhYjPysqxe8caGI8yCYvOUyev45omIy2KQGW/zN9xKRYkf3UMKd XeZiTrYamL1D9b07+npzVbPd8QZP14ltfMogDPcDg+vx5MjbmRAfkqwlROwlbyNZyQzDC5 wwOlCdKFeWlg0MFZCujRbtE5VWm0s/b0K4IQjXTXfp2oDfYFjm6IBIK8Js4nYntRqPgawr ODLxU7lEf/LAlOochVkN6XxjPfrSACnPdVzYE3C4KUJ3Yvn9bikp+EgJcNqOqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685991092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3AY1zHg64BIZKNCYSPpzqBl33apoga7QI3CEvtk4eq8=; b=a9PZuAZNSWc/aIB5YCHPL7kMfBTYsmuAgyk0p3ugYVgqVL+RHxgNnXPVj/L9dstiEXaz8N 8CIQ5OKKfjh2AEb/B/VA6peLgjKss4kynnMY8Z5NOa1gqEvokpBI+tUqOwY6r1ISURMXm4 7VlWUbrLphe8tG3FGei9HTo/vcDULyNr5kz3H1LOyJpLulx0ib8SaJSjUMoeV16rhZqe2M tIA+LCHtkS2Mti16xTumjt40pR2JEXd0M3n5gh6hmllbl2PID4t9Rda3JvGxqGL3Ob2nfR ulakPwY9Ey1bMMfDGQEFzfWrLpwSPXUz1P2bgNTfpU0v+GBYV6WZ9+Fk+SlXUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685991092; a=rsa-sha256; cv=none; b=OKrCKBf7amRv/KpJYnYcC5bzfckqjpjqMech3g6ZomYDKaITPDP8CXJdMl1JOYV2FR7ZL8 Mb3RlU6lmfSPVYj+9tViXnPRki/7yAWCTwLw9siFRXUuMcsVi/R9S21t13Jyo1GU7wyWJ8 rtTFPG7p5TeP6qFp/46DONN/nCLTBOd7hkr1vAqOQy0xoK+9Pg1dUk4YR274yA4JbkZul4 ZDoBCzoTJmnvmY6vBuoXsnjxlIc8aYV9n5MTMHQnzhM4Z45UyBeNGQn0zJF44hb5soRR0q tvEa8i/IOllYUulKpQOohsrMv4BJDxKY9Je/WsfbyCGanN/EfLj8WvW6FY7MjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QZjPc2W0Rzydv; Mon, 5 Jun 2023 18:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 355IpWl2049917; Mon, 5 Jun 2023 18:51:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 355IpWcN049916; Mon, 5 Jun 2023 18:51:32 GMT (envelope-from git) Date: Mon, 5 Jun 2023 18:51:32 GMT Message-Id: <202306051851.355IpWcN049916@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 6c4a339fa855 - main - x11-fonts/py-opentype-sanitizer: Update to 9.1.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c4a339fa8550f3e34a7087d6954fb3328f2bc50 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c4a339fa8550f3e34a7087d6954fb3328f2bc50 commit 6c4a339fa8550f3e34a7087d6954fb3328f2bc50 Author: Po-Chuan Hsieh AuthorDate: 2023-06-05 18:38:44 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-05 18:46:56 +0000 x11-fonts/py-opentype-sanitizer: Update to 9.1.0 - Convert to USE_PYTHON=pep517 - Rename build.py to build_ext.py. Otherwise, it masks PEP517_BUILD_CMD (python -m build ...). Changes: https://github.com/googlefonts/ots-python/releases --- x11-fonts/py-opentype-sanitizer/Makefile | 9 ++++-- x11-fonts/py-opentype-sanitizer/distinfo | 6 ++-- .../files/patch-pyproject.toml | 10 ++++++ .../py-opentype-sanitizer/files/patch-setup.py | 36 +++++++++++----------- 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/x11-fonts/py-opentype-sanitizer/Makefile b/x11-fonts/py-opentype-sanitizer/Makefile index de2091d0e68b..24606ed1f82d 100644 --- a/x11-fonts/py-opentype-sanitizer/Makefile +++ b/x11-fonts/py-opentype-sanitizer/Makefile @@ -1,5 +1,5 @@ PORTNAME= opentype-sanitizer -PORTVERSION= 9.0.0 +PORTVERSION= 9.1.0 CATEGORIES= x11-fonts python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,15 +11,18 @@ WWW= https://github.com/googlefonts/ots-python LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ots-sanitize:x11-fonts/ots USES= python:3.6+ -USE_PYTHON= autoplist concurrent distutils pytest +USE_PYTHON= autoplist concurrent pep517 pytest LDFLAGS+= -lpython${PYTHON_VER}${PYTHON_ABIVER} post-patch: + @${MV} ${WRKSRC}/build.py ${WRKSRC}/build_ext.py @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/python/ots/__init__.py @${RM} -r ${WRKSRC}/src/c/ diff --git a/x11-fonts/py-opentype-sanitizer/distinfo b/x11-fonts/py-opentype-sanitizer/distinfo index 3cbb158a4569..587ed2ed20d4 100644 --- a/x11-fonts/py-opentype-sanitizer/distinfo +++ b/x11-fonts/py-opentype-sanitizer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663672778 -SHA256 (opentype-sanitizer-9.0.0.tar.gz) = 4b89660e166a1fe057ab1c6b63038fc48ee73e768e80e1bf982abaf7b16fa064 -SIZE (opentype-sanitizer-9.0.0.tar.gz) = 162061 +TIMESTAMP = 1685792192 +SHA256 (opentype-sanitizer-9.1.0.tar.gz) = d5975df9e4440a299997c2fc082926ee90a33744da7d2b1ce62d98ebfa07f3c2 +SIZE (opentype-sanitizer-9.1.0.tar.gz) = 159945 diff --git a/x11-fonts/py-opentype-sanitizer/files/patch-pyproject.toml b/x11-fonts/py-opentype-sanitizer/files/patch-pyproject.toml new file mode 100644 index 000000000000..1c8b1c94759a --- /dev/null +++ b/x11-fonts/py-opentype-sanitizer/files/patch-pyproject.toml @@ -0,0 +1,10 @@ +--- pyproject.toml.orig 2023-05-31 23:17:56 UTC ++++ pyproject.toml +@@ -3,7 +3,5 @@ requires = [ + "setuptools", + "wheel", + "setuptools_scm", +- "meson >= 0.48", +- "ninja", + ] + build-backend = "setuptools.build_meta" diff --git a/x11-fonts/py-opentype-sanitizer/files/patch-setup.py b/x11-fonts/py-opentype-sanitizer/files/patch-setup.py index 2ce8a8102b5e..dc5492e3a1ad 100644 --- a/x11-fonts/py-opentype-sanitizer/files/patch-setup.py +++ b/x11-fonts/py-opentype-sanitizer/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2019-10-09 09:44:36 UTC +--- setup.py.orig 2023-05-31 23:17:56 UTC +++ setup.py -@@ -16,17 +16,17 @@ if sys.version_info[:2] < (3, 6): +@@ -17,19 +17,8 @@ if sys.version_info[:2] < (3, 6): ) cmdclass = {} @@ -9,34 +9,34 @@ -except ImportError: - pass -else: -+#try: -+# from wheel.bdist_wheel import bdist_wheel -+#except ImportError: -+# pass -+#else: - class UniversalBdistWheel(bdist_wheel): - def get_tag(self): - return ("py2.py3", "none") + bdist_wheel.get_tag(self)[2:] -+# class UniversalBdistWheel(bdist_wheel): -+# def get_tag(self): -+# return ("py2.py3", "none") + bdist_wheel.get_tag(self)[2:] - cmdclass["bdist_wheel"] = UniversalBdistWheel -+# cmdclass["bdist_wheel"] = UniversalBdistWheel - - +- +- class Download(Command): -@@ -212,9 +212,9 @@ class CustomEggInfo(egg_info): + + user_options = [ +@@ -213,10 +202,6 @@ class CustomEggInfo(egg_info): egg_info.run(self) -cmdclass["download"] = Download -cmdclass["build_ext"] = ExecutableBuildExt -cmdclass["egg_info"] = CustomEggInfo -+#cmdclass["download"] = Download -+#cmdclass["build_ext"] = ExecutableBuildExt -+#cmdclass["egg_info"] = CustomEggInfo +- + build_options = [] + platform_tags = get_platform().split("-") + if "macosx" in platform_tags: +@@ -227,7 +212,7 @@ if "macosx" in platform_tags: ots_sanitize = Executable( - "ots.ots-sanitize", script="build.py", output_dir=os.path.join("build", "meson") + "ots.ots-sanitize", +- script="build.py", ++ script="build_ext.py", + options=build_options, + output_dir=os.path.join("build", "meson"), + )