From nobody Sun Jan 19 02:01:23 2025 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 4YbGsv6JRlz5lCVV; Sun, 19 Jan 2025 02:01:23 +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 4YbGsv5kzzz3myW; Sun, 19 Jan 2025 02:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737252083; 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=1iyHBNMiHmuWDznflvkBhmHtTSsq1Y91dm2BVEzDpcc=; b=LA3xiTXvfvmz7jckCQxJXNBhg0uqhiLVFfmXJ6ER6VqhEys0tQ7x0RUn4WC/3JOp51OY8r hHhwR5kQ7I5YVGmjojiFuZ42KsrwbGK+/zsn7HUcne14a/N3Eu7EZq4PCr/kS2UYkkz7Lv 7EgRoCmKNMUZJSZQR73vHZw8DlhRbIR4nzawMRWWqjXPUR6jBoGBSRSda9JLyJkhEXneGX CgIU0aPV+N6J8sD/dk0iUeUOPV7Ytn2vD1UGmKGegUe9r0Y9utQCbrBCbVVuRSSNJ2keD2 0ITImQcDYt0FF1nw1w8fImF9pqtZKDpiS2SXalMMV76Avt567kmXPFWwsh1Wxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737252083; 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=1iyHBNMiHmuWDznflvkBhmHtTSsq1Y91dm2BVEzDpcc=; b=WAmsnd3EhISqZoVGAH1tMffSz9u+Tdor1hFkCn8kHoN8ZJTd+a2mU4qS7d2AOrBRiD1vVL qTNwfncZAkme4kVU9pGTULeH4dtahcZfXZxg5qNZJgKGlmxr+kv34Cnx8OjrMoXNEFKXvI gSq2/DNnLahEsHcAvAJI4EK010p399DNIrfH9rmGoNtwiud/JW9b86z0A5vJ8dNI0bB3fN URUiC6f68tF0A2kdmRHOjd5F17JSxWEwHcMK4U9ISn/ZvEpjjOOkS1vWt4cuNnsv0EnwbP gIw6EkhsfW5qio8yhLgoJiQ+uc3x9ou0LICHNcAZ3DVethcIMW/AsdA0UUSzOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737252083; a=rsa-sha256; cv=none; b=imuwPV2mqJqW8SHdXtkSEYoEboPRt5RRbuH8WLIwV1snILBjf0j2dXOIB4mts6KqmVbZpA cQc7tgUDKGgFoFpf/wJBPoTSlxzh8qlQdmwyN8QUmDXdp/b0CB+QzGe6YfRrOWSJRXlhdd KdIxAaPlSWYWlrbetEFUUcFUrUyE2fLdqXu/npM0g3zE/TJSHi/e7nrDFNDefBrFVI6KLQ 3Y6lzcNaVU1QDoJkR+XfdOUKsyQbLXEw0inD8USBxHYQBfqM1ogP7HmXDMtQWhktE5iCEn bWWmG0TFYVIuUu61SlJ4mPGKelm9iyCUIueWI8TLxMWpNtMQn8tw3ycEYfcE2g== 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 4YbGsv5K8ZzDMH; Sun, 19 Jan 2025 02:01:23 +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 50J21Ni6013163; Sun, 19 Jan 2025 02:01:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50J21NoY013160; Sun, 19 Jan 2025 02:01:23 GMT (envelope-from git) Date: Sun, 19 Jan 2025 02:01:23 GMT Message-Id: <202501190201.50J21NoY013160@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: eed93fcb3b1e - main - emulators/virtualbox-ose{,-nox11}-legacy: Unbreak build with PYTHON option with python 3.10+ 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: eed93fcb3b1e681b6f889b7d30b63385f2479dd2 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=eed93fcb3b1e681b6f889b7d30b63385f2479dd2 commit eed93fcb3b1e681b6f889b7d30b63385f2479dd2 Author: Vladimir Druzenko AuthorDate: 2025-01-19 01:57:22 +0000 Commit: Vladimir Druzenko CommitDate: 2025-01-19 02:00:46 +0000 emulators/virtualbox-ose{,-nox11}-legacy: Unbreak build with PYTHON option with python 3.10+ MFH: 2025Q1 --- .../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