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 5D41715806E for ; Mon, 15 May 2023 14:35:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78E93E0907; Mon, 15 May 2023 14:35:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 4CA5BE0907 for ; Mon, 15 May 2023 14:35:45 +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 44DEE340E63 for ; Mon, 15 May 2023 14:35:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4062A8B7 for ; Mon, 15 May 2023 14:35:42 +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: <1684161251.bdb82397c63941c5a2e59804a62ee1d7f1533802.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/files/virtualbox-7.0.6-fix-libxml2.patch app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild app-emulation/virtualbox/virtualbox-7.0.8a.ebuild X-VCS-Directories: app-emulation/virtualbox/ app-emulation/virtualbox/files/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: bdb82397c63941c5a2e59804a62ee1d7f1533802 X-VCS-Branch: master Date: Mon, 15 May 2023 14:35:42 +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: 498d5372-84d4-486d-bc52-1f08fb1eaece X-Archives-Hash: d6ea1b583b965dcff354284ecaee6869 commit: bdb82397c63941c5a2e59804a62ee1d7f1533802 Author: Viorel Munteanu gentoo org> AuthorDate: Mon May 15 14:30:17 2023 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Mon May 15 14:34:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdb82397 app-emulation/virtualbox: fix building with dev-libs/libxml2-2.11 Closes: https://bugs.gentoo.org/906309 Signed-off-by: Viorel Munteanu gentoo.org> .../files/virtualbox-7.0.6-fix-libxml2.patch | 169 +++++++++++++++++++++ .../virtualbox/virtualbox-7.0.6-r2.ebuild | 1 + app-emulation/virtualbox/virtualbox-7.0.8a.ebuild | 1 + 3 files changed, 171 insertions(+) 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 new file mode 100644 index 000000000000..9da2891721d9 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-7.0.6-fix-libxml2.patch @@ -0,0 +1,169 @@ +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.6-r2.ebuild b/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild index 02b13adc7290..ebbe07aa2de2 100644 --- a/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild +++ b/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild @@ -205,6 +205,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch "${FILESDIR}"/${PN}-7.0.0-python3_11.patch "${FILESDIR}"/${PN}-7.0.6-gcc-13.patch + "${FILESDIR}"/${PN}-7.0.6-fix-libxml2.patch # Downloaded patchset "${WORKDIR}"/virtualbox-patches-6.1.36/patches diff --git a/app-emulation/virtualbox/virtualbox-7.0.8a.ebuild b/app-emulation/virtualbox/virtualbox-7.0.8a.ebuild index 404a9f53d2bb..c3be27bf7acd 100644 --- a/app-emulation/virtualbox/virtualbox-7.0.8a.ebuild +++ b/app-emulation/virtualbox/virtualbox-7.0.8a.ebuild @@ -206,6 +206,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0.8-python3_11.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 # Downloaded patchset "${WORKDIR}"/virtualbox-patches-7.0.8/patches