Date: Wed, 1 Oct 2025 14:23:22 GMT
From: Vladimir Druzenko <vvd@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: 40fa37204330 - main - emulators/virtualbox-ose{,-nox11}{,-70,-71,-72,-legacy}: Fix build with ftp/curl 8.16.0
Message-ID: <202510011423.591ENMdT065146@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=40fa37204330ec70f24e229271fb71e255b6b6b5 commit 40fa37204330ec70f24e229271fb71e255b6b6b5 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2025-10-01 12:35:54 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-10-01 14:08:08 +0000 emulators/virtualbox-ose{,-nox11}{,-70,-71,-72,-legacy}: Fix build with ftp/curl 8.16.0 kBuild: Compiling VBoxRT - /wrkdirs/usr/ports/emulators/virtualbox-ose-72/work/VirtualBox-7.2.0/src/VBox/Runtime/generic/http-curl.cpp /wrkdirs/usr/ports/emulators/virtualbox-ose-72/work/VirtualBox-7.2.0/src/VBox/Runtime/generic/http-curl.cpp:702:27: error: assigning to 'curl_proxytype' from incompatible type 'long' 702 | pThis->enmProxyType = CURLPROXY_HTTP; | ^~~~~~~~~~~~~~ /usr/local/include/curl/curl.h:791:35: note: expanded from macro 'CURLPROXY_HTTP' 791 | #define CURLPROXY_HTTP 0L /* added in 7.10, new in 7.19.4 default is | ^~ Upstream bug report: https://github.com/curl/curl/issues/18054#issuecomment-3354156324 PR: 289924 --- emulators/virtualbox-ose-70/Makefile | 2 ++ emulators/virtualbox-ose-71/Makefile | 2 ++ emulators/virtualbox-ose-72/Makefile | 2 ++ emulators/virtualbox-ose-legacy/Makefile | 2 ++ emulators/virtualbox-ose/Makefile | 2 ++ 5 files changed, 10 insertions(+) diff --git a/emulators/virtualbox-ose-70/Makefile b/emulators/virtualbox-ose-70/Makefile index 4d7dea9d02ca..70ae1ff3695f 100644 --- a/emulators/virtualbox-ose-70/Makefile +++ b/emulators/virtualbox-ose-70/Makefile @@ -317,6 +317,8 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py + @${REINPLACE_CMD} -e 's|curl_proxytype|long|g' \ + ${WRKSRC}/src/VBox/Runtime/generic/http-curl.cpp post-patch-AIO-off: @${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \ diff --git a/emulators/virtualbox-ose-71/Makefile b/emulators/virtualbox-ose-71/Makefile index 7b5d79a0d306..288552b6f76d 100644 --- a/emulators/virtualbox-ose-71/Makefile +++ b/emulators/virtualbox-ose-71/Makefile @@ -317,6 +317,8 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py + @${REINPLACE_CMD} -e 's|curl_proxytype|long|g' \ + ${WRKSRC}/src/VBox/Runtime/generic/http-curl.cpp post-patch-AIO-off: @${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \ diff --git a/emulators/virtualbox-ose-72/Makefile b/emulators/virtualbox-ose-72/Makefile index 3110b3efe1aa..e6caf18b27d1 100644 --- a/emulators/virtualbox-ose-72/Makefile +++ b/emulators/virtualbox-ose-72/Makefile @@ -317,6 +317,8 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py + @${REINPLACE_CMD} -e 's|curl_proxytype|long|g' \ + ${WRKSRC}/src/VBox/Runtime/generic/http-curl.cpp post-patch-AIO-off: @${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \ diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 77ed9000a262..2040fa8bf3e0 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -314,6 +314,8 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py + @${REINPLACE_CMD} -e 's|curl_proxytype|long|g' \ + ${WRKSRC}/src/VBox/Runtime/generic/http-curl.cpp do-build: cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \ diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 3bb9bd477162..0090c98652d1 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -328,6 +328,8 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py + @${REINPLACE_CMD} -e 's|curl_proxytype|long|g' \ + ${WRKSRC}/src/VBox/Runtime/generic/http-curl.cpp post-patch-AIO-off: @${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510011423.591ENMdT065146>