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 029BC15806E for ; Fri, 2 Jun 2023 18:27:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E436E088C; Fri, 2 Jun 2023 18:27:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CED1E088C for ; Fri, 2 Jun 2023 18:27:43 +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 133E8341380 for ; Fri, 2 Jun 2023 18:27:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77734A7A for ; Fri, 2 Jun 2023 18:27:40 +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: <1685730448.85b9381262655b68fe5f48e0e586d383f9e52c97.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-6.1.44-fix-libxml2.patch app-emulation/virtualbox/virtualbox-6.1.44.ebuild X-VCS-Directories: app-emulation/virtualbox/files/ app-emulation/virtualbox/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: 85b9381262655b68fe5f48e0e586d383f9e52c97 X-VCS-Branch: master Date: Fri, 2 Jun 2023 18:27:40 +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: 31003fd9-25a6-46e2-995d-280528c30171 X-Archives-Hash: 5dc6668954e82a2ba80a504957375696 commit: 85b9381262655b68fe5f48e0e586d383f9e52c97 Author: Viorel Munteanu gentoo org> AuthorDate: Fri Jun 2 18:20:21 2023 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Fri Jun 2 18:27:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b93812 app-emulation/virtualbox: fix building with dev-libs/libxml2-2.11 Replace some xhtml codes with their numeric equivalents and add empty fallbacks for missing files. Nothing changes in the resulting files. Closes: https://bugs.gentoo.org/906309 Signed-off-by: Viorel Munteanu gentoo.org> .../files/virtualbox-6.1.44-fix-libxml2.patch | 25 ++++++++++++++++++++++ app-emulation/virtualbox/virtualbox-6.1.44.ebuild | 11 ++++++++++ 2 files changed, 36 insertions(+) diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.44-fix-libxml2.patch b/app-emulation/virtualbox/files/virtualbox-6.1.44-fix-libxml2.patch new file mode 100644 index 000000000000..c3e76e58c3f2 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-6.1.44-fix-libxml2.patch @@ -0,0 +1,25 @@ +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. + +See also: https://bugs.gentoo.org/906309 + +--- a/doc/manual/en_US/user_Frontends.xml ++++ b/doc/manual/en_US/user_Frontends.xml +@@ -1205,6 +1205,6 @@ + + + +- ++ + + +--- b/doc/manual/en_US/user_VBoxManage.xml ++++ a/doc/manual/en_US/user_VBoxManage.xml +@@ -8975,6 +8975,6 @@ + + +- ++ + + diff --git a/app-emulation/virtualbox/virtualbox-6.1.44.ebuild b/app-emulation/virtualbox/virtualbox-6.1.44.ebuild index 84d1d998b3b0..b148184cbd9b 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.44.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.44.ebuild @@ -179,6 +179,9 @@ PATCHES=( # 865361 "${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch + # 906309 + "${FILESDIR}"/${PN}-6.1.44-fix-libxml2.patch + # Downloaded patchset "${WORKDIR}"/virtualbox-patches-6.1.36/patches ) @@ -278,6 +281,14 @@ src_configure() { append-cxxflags $(test-flags-CXX -mno-$i) done + # replace xhtml names with numeric equivalents + find doc/manual -name \*.xml -exec sed -i \ + -e 's/ /\ /g' \ + -e 's/–/\–/g' \ + -e 's/←/\←/g' \ + -e 's/→/\→/g' \ + -e 's/↔/\↔/g' {} \+ || die + tc-export AR CC CXX LD RANLIB export HOST_CC="$(tc-getBUILD_CC)"