From nobody Sun Jan 19 02:03:29 2025 X-Original-To: dev-commits-ports-branches@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 4YbGwK6rnjz5lCHh; Sun, 19 Jan 2025 02:03:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YbGwK5xN6z3nZr; Sun, 19 Jan 2025 02:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737252209; 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=EWKkSlCGvltOh6Fk6O/8Q8Ih1ROrua3oDWQjO//lSWw=; b=pEC2aQUnOzfWo1xq0IOkYaVsIGXCswO6j04RrrV1ISRDVItuPforzVvMmjOnyJFhmShAlq ahkXaMbtDsJY7uKfOSDtamHtdnHJBYweQM2UOtSPwbfOW1wtLCWASsVige44DhnLTWYbra j1k0JGYTJ2gUvg2Uzn416GUMhCA8QsW+futFxe4gOWNdM2EOdtlnNj5pcLak3V2OAMrA7o KAIt9d89IHgTiz/jtNGJWJayBjCYI5ASk1BqSNoIqS1CKOY1mfpOZxq/BWra3rWbP29qFs Ujl6CYGjZu1ypSKSr2Ssj8V45k7Xq3Fz4o2xJuKKvapBMeA6/yNGoMZkOnN9eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737252209; 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=EWKkSlCGvltOh6Fk6O/8Q8Ih1ROrua3oDWQjO//lSWw=; b=HQOKedI8XbXFgiwfe5F1jycr1fYkACRC4SVNwRVos0RWGXbXJC6kBw8RT7LqXIHjV/Yh+j X8sLIlEKLZnId3U1ulqO+LaAP4HfRHVc37TmytwB1PJzxaAhalZFPyu/Wc70UaT5U0Kql6 QWycz8+VX42q81Fqnk5Cn9/h3v+0hFz7yvYtcktPFRI71xR3tR8ox/qT9vhzxgBtejjGMp DULrlSVw467txRftWJdJ0yBXYaw/Uk2WTCijW1FI9FPaWz4QjWXMl3yEdsDD9pA7dYS6bM cKIt+OS57DJxS1b+Jzhy0FP11xB6sIdMEXD3IO6AvzEIBuPi7VdPRuT6QunxaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737252209; a=rsa-sha256; cv=none; b=qbzfZy4/lEAeEyuLjvW8wVBKZS3C28ROSz6wvvmLxFoDTyWKQvwPXRwSkpy6+TKIlPpvjQ NhoXJ3g5u5T6lRxKL96lrtlK3GqVFI51YAhKufQHalHJMGzUeX41sy8zx+oV3viaEg1Nnx ElwSSzLWg7LndKmOZkjl41v7Y6t/kADmbRtvGrNjnhr/spYXbDkSOdSiWv3ST/s7mV8q31 BpjUOWyGZC8YI8LkEIQNYwhaxuG006qUC+BKWXDCHh7AH8BvrFBJG3WkeemoxQxxunxGcE BJtmNORnZRM2wE4yMlKlGPHHY5aAEq9cH9PMBMSbP4vok1gGS6FNSbA4VRBwww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YbGwK4mkTzV70; Sun, 19 Jan 2025 02:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50J23T8G015888; Sun, 19 Jan 2025 02:03:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50J23Tob015885; Sun, 19 Jan 2025 02:03:29 GMT (envelope-from git) Date: Sun, 19 Jan 2025 02:03:29 GMT Message-Id: <202501190203.50J23Tob015885@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: f2716023b46a - 2025Q1 - emulators/virtualbox-ose{,-nox11}-legacy: Unbreak build with PYTHON option with python 3.10+ List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: f2716023b46acaece599704619eb7c3407dc88bf Auto-Submitted: auto-generated The branch 2025Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f2716023b46acaece599704619eb7c3407dc88bf commit f2716023b46acaece599704619eb7c3407dc88bf Author: Vladimir Druzenko AuthorDate: 2025-01-19 01:57:22 +0000 Commit: Vladimir Druzenko CommitDate: 2025-01-19 02:03:14 +0000 emulators/virtualbox-ose{,-nox11}-legacy: Unbreak build with PYTHON option with python 3.10+ MFH: 2025Q1 (cherry picked from commit eed93fcb3b1e681b6f889b7d30b63385f2479dd2) --- .../files/patch-src_libs_xpcom18a4_python_src_PyXPCOM.h | 11 +++++++++++ emulators/virtualbox-ose-legacy/pkg-plist | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/emulators/virtualbox-ose-legacy/files/patch-src_libs_xpcom18a4_python_src_PyXPCOM.h b/emulators/virtualbox-ose-legacy/files/patch-src_libs_xpcom18a4_python_src_PyXPCOM.h new file mode 100644 index 000000000000..82f7b847556d --- /dev/null +++ b/emulators/virtualbox-ose-legacy/files/patch-src_libs_xpcom18a4_python_src_PyXPCOM.h @@ -0,0 +1,11 @@ +--- src/libs/xpcom18a4/python/src/PyXPCOM.h.orig ++++ src/libs/xpcom18a4/python/src/PyXPCOM.h +@@ -140,7 +140,7 @@ inline PyObject *PyBool_FromLong(long ok) + # ifndef PyUnicode_AsUTF8 + # define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o) + # endif +-# ifndef PyUnicode_AsUTF8AndSize ++# if PY_MINOR_VERSION < 10 + # define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s) + # endif + typedef struct PyMethodChain diff --git a/emulators/virtualbox-ose-legacy/pkg-plist b/emulators/virtualbox-ose-legacy/pkg-plist index ecaa95f51ab1..d95f1eeccd6a 100644 --- a/emulators/virtualbox-ose-legacy/pkg-plist +++ b/emulators/virtualbox-ose-legacy/pkg-plist @@ -333,7 +333,10 @@ include/virtualbox/xpcom/xptcall.h include/virtualbox/xpcom/xptcstubsdecl.inc include/virtualbox/xpcom/xptcstubsdef.inc include/virtualbox/xpcom/xptinfo.h -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info +%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info/PKG-INFO +%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt +%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt +%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info/top_level.txt %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi%%PYTHON_PYCDIR%%VirtualBox_constants%%PYTHON_PYCEXT%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.py @@ -398,7 +401,6 @@ lib/virtualbox/VBoxNetDHCP.so @(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetNAT lib/virtualbox/VBoxNetNAT.so %%PYTHON%%lib/virtualbox/VBoxPython.so -%%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so lib/virtualbox/VBoxREM.so %%I386%%lib/virtualbox/VBoxREM32.so %%I386%%lib/virtualbox/VBoxREM64.so