From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B303A15815E for ; Sat, 10 Feb 2024 16:31:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C436E2A4B; Sat, 10 Feb 2024 16:31:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3C73E2A3B for ; Sat, 10 Feb 2024 16:31:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E72A03408DD for ; Sat, 10 Feb 2024 16:31:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5597614BE for ; Sat, 10 Feb 2024 16:31:27 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1707582647.13890aa00884b2eacce4fb6150a0e4b2c618f820.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/Manifest app-emulation/virtualbox/files/virtualbox-7.0.10-python.patch app-emulation/virtualbox/files/virtualbox-7.0.6-fix-libxml2.patch app-emulation/virtualbox/virtualbox-7.0.12-r2.ebuild app-emulation/virtualbox/virtualbox-7.0.14-r2.ebuild X-VCS-Directories: app-emulation/virtualbox/files/ app-emulation/virtualbox/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: 13890aa00884b2eacce4fb6150a0e4b2c618f820 X-VCS-Branch: master Date: Sat, 10 Feb 2024 16:31:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c20a91c2-8333-403d-bb21-3bd482eccaf6 X-Archives-Hash: a949f84103a18b828ec9b3b76d2835ba commit: 13890aa00884b2eacce4fb6150a0e4b2c618f820 Author: Viorel Munteanu gentoo org> AuthorDate: Sat Feb 10 09:35:52 2024 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Sat Feb 10 16:30:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13890aa0 app-emulation/virtualbox: move patches to patchset Move most patches from ${FILESDIR} to the patchset to share them with app-emulation/virtualbox-kvm. No changes to the patches. Signed-off-by: Viorel Munteanu gentoo.org> app-emulation/virtualbox/Manifest | 2 +- .../files/virtualbox-7.0.10-python.patch | 18 --- .../files/virtualbox-7.0.6-fix-libxml2.patch | 169 --------------------- .../virtualbox/virtualbox-7.0.12-r2.ebuild | 25 +-- .../virtualbox/virtualbox-7.0.14-r2.ebuild | 25 +-- 5 files changed, 5 insertions(+), 234 deletions(-) diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index c8dbfc28ec2d..1137ea34d61e 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -7,4 +7,4 @@ DIST virtualbox-help-7.0.12.tar.xz 3945920 BLAKE2B 7f2201f3baf6d27d95dc9f878426e DIST virtualbox-help-7.0.14.tar.xz 3944832 BLAKE2B 95079e4da8c960c41cee799142779a6c2587e0e8af7956ca551cb5a4c0f36f313189dfe08afba83a0c32886866a7f9903b5e370008d6b3ce6283fb2288866b06 SHA512 e2f1acdd7577a93047e220300b1996d2855ddef20053c01294f8295fde0840645c41b75632d71dd2fc276219084fe4105fd057623f39375542358796425a2d03 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57 DIST virtualbox-patches-7.0.10_pre20230615.tar.bz2 2253 BLAKE2B 27b422acc2ae85c4324d6f4471db80c9f680b1c4a00223c38b9e3fb31709b05163a1bd53408cffeabdef295e856aa8b01b86e0fecf5d80ace376ea1bd4fc9504 SHA512 c2177f46048f09b6be9ac2c35b43d74f67350b052411cc64adf6c0b3d284055eef79f960f1384a3aaeee7d25f8c19ea8f936ee2623a2251d1d28f85ed3469c22 -DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf +DIST virtualbox-patches-7.0.14.tar.bz2 6937 BLAKE2B da5f18efbba2a8f4701b3d29dc00784e4e80e18a18b029e5dce8c142eb4dc97637069bfc5081422064a7dc59dfacf503ebbdc3421caa96430dc53fa72988aa20 SHA512 57cc34b92e4626de5c445e34ae025da7ec0d752a60618c619a55c28bf7d6b1cc9dc81ea059b949b0f3e625568207e8084f9462faf487ca0daf2794e7f1feac36 diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.10-python.patch b/app-emulation/virtualbox/files/virtualbox-7.0.10-python.patch deleted file mode 100644 index f972580cb6c5..000000000000 --- a/app-emulation/virtualbox/files/virtualbox-7.0.10-python.patch +++ /dev/null @@ -1,18 +0,0 @@ -Virtualbox 7.x will only build a lib named VBoxPython3.so, regardless of the -actual python version used when compiling. Remove VBoxPython3m.so, we don't -use it. - ---- a/src/libs/xpcom18a4/python/Makefile.kmk -+++ b/src/libs/xpcom18a4/python/Makefile.kmk -@@ -693,11 +693,6 @@ - VBoxPython3_EXTENDS = VBoxPythonBase - VBoxPython3_DEFS = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_DEFS)) Py_LIMITED_API=0x03030000 - VBoxPython3_INCS = $(VBoxPythonBase_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC) -- -- DLLS += VBoxPython3m -- VBoxPython3m_EXTENDS = VBoxPythonBase_m -- VBoxPython3m_DEFS = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_m_DEFS)) Py_LIMITED_API=0x03030000 -- VBoxPython3m_INCS = $(VBoxPythonBase_m_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC) - endif - endif # VBOX_WITH_PYTHON_LIMITED_API - diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.6-fix-libxml2.patch b/app-emulation/virtualbox/files/virtualbox-7.0.6-fix-libxml2.patch deleted file mode 100644 index 9da2891721d9..000000000000 --- a/app-emulation/virtualbox/files/virtualbox-7.0.6-fix-libxml2.patch +++ /dev/null @@ -1,169 +0,0 @@ -With dev-libs/libxml2-2.11, xi:include errors out if it can't find a file, so add an empty fallback. -Used to work with dev-libs/libxml2-2.10. - -Upstream has removed user_ and overview_ altogether in the next release as part of a larger docs change, -so this no longer applies. - -See also: https://bugs.gentoo.org/906309 - ---- a/doc/manual/en_US/user_VBoxManage.xml -+++ b/doc/manual/en_US/user_VBoxManage.xml -@@ -242,107 +242,107 @@ - on your particular host. - - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - - - Each time VBoxManage is invoked, only one diff --git a/app-emulation/virtualbox/virtualbox-7.0.12-r2.ebuild b/app-emulation/virtualbox/virtualbox-7.0.12-r2.ebuild index 2a2956c15e0b..a45c4f947cb0 100644 --- a/app-emulation/virtualbox/virtualbox-7.0.12-r2.ebuild +++ b/app-emulation/virtualbox/virtualbox-7.0.12-r2.ebuild @@ -27,7 +27,7 @@ DESCRIPTION="Family of powerful x86 virtualization products for enterprise and h HOMEPAGE="https://www.virtualbox.org/" SRC_URI=" https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2 - https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2 + https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.14.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${PV}.tar.xz ) ) " S="${WORKDIR}/${MY_PN}-${PV}" @@ -190,29 +190,8 @@ REQUIRED_USE=" " PATCHES=( - "${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365 - - # This patch is needed to avoid automagic detection based on a hardcoded - # list of Pythons in configure. It's necessary but not sufficient - # (see the rest of the ebuild's logic for the remainder) to handle - # proper Python selection. - "${FILESDIR}"/${PN}-6.1.34-r3-python.patch - - # 865361 - "${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch - - "${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch - "${FILESDIR}"/${PN}-7.0.10-python.patch - "${FILESDIR}"/${PN}-7.0.6-gcc-13.patch - "${FILESDIR}"/${PN}-7.0.8-mtune-keep-size.patch - "${FILESDIR}"/${PN}-7.0.6-fix-libxml2.patch - # 913109 - "${FILESDIR}"/${PN}-7.0.10-fix-binutils-hardened.patch - # 922445 - "${FILESDIR}"/${PN}-7.0.14-libxml2-2.12.patch - # Downloaded patchset - "${WORKDIR}"/virtualbox-patches-7.0.8/patches + "${WORKDIR}"/virtualbox-patches-7.0.14/patches ) pkg_pretend() { diff --git a/app-emulation/virtualbox/virtualbox-7.0.14-r2.ebuild b/app-emulation/virtualbox/virtualbox-7.0.14-r2.ebuild index 202adf9284a7..6451ab1c7097 100644 --- a/app-emulation/virtualbox/virtualbox-7.0.14-r2.ebuild +++ b/app-emulation/virtualbox/virtualbox-7.0.14-r2.ebuild @@ -27,7 +27,7 @@ DESCRIPTION="Family of powerful x86 virtualization products for enterprise and h HOMEPAGE="https://www.virtualbox.org/" SRC_URI=" https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2 - https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2 + https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.14.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${PV}.tar.xz ) ) " S="${WORKDIR}/${MY_PN}-${PV}" @@ -190,29 +190,8 @@ REQUIRED_USE=" " PATCHES=( - "${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365 - - # This patch is needed to avoid automagic detection based on a hardcoded - # list of Pythons in configure. It's necessary but not sufficient - # (see the rest of the ebuild's logic for the remainder) to handle - # proper Python selection. - "${FILESDIR}"/${PN}-6.1.34-r3-python.patch - - # 865361 - "${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch - - "${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch - "${FILESDIR}"/${PN}-7.0.10-python.patch - "${FILESDIR}"/${PN}-7.0.6-gcc-13.patch - "${FILESDIR}"/${PN}-7.0.8-mtune-keep-size.patch - "${FILESDIR}"/${PN}-7.0.6-fix-libxml2.patch - # 913109 - "${FILESDIR}"/${PN}-7.0.10-fix-binutils-hardened.patch - # 922445 - "${FILESDIR}"/${PN}-7.0.14-libxml2-2.12.patch - # Downloaded patchset - "${WORKDIR}"/virtualbox-patches-7.0.8/patches + "${WORKDIR}"/virtualbox-patches-7.0.14/patches ) pkg_pretend() {