From 2078c9238a8ed1acf2248e62d0cd83ea7b9c75c2 Mon Sep 17 00:00:00 2001 From: Vinfall Date: Thu, 12 Sep 2024 10:05:40 +0800 Subject: [PATCH] virtualbox-ose: update to 7.1.4. --- srcpkgs/virtualbox-ose/INSTALL.msg | 5 + .../patches/015-no-update.patch | 45 +++-- .../patches/050-fix-include.patch | 12 -- srcpkgs/virtualbox-ose/patches/052-xml.patch | 163 ------------------ srcpkgs/virtualbox-ose/template | 14 +- 5 files changed, 33 insertions(+), 206 deletions(-) create mode 100644 srcpkgs/virtualbox-ose/INSTALL.msg delete mode 100644 srcpkgs/virtualbox-ose/patches/050-fix-include.patch delete mode 100644 srcpkgs/virtualbox-ose/patches/052-xml.patch diff --git a/srcpkgs/virtualbox-ose/INSTALL.msg b/srcpkgs/virtualbox-ose/INSTALL.msg new file mode 100644 index 00000000000000..816c2f7d1ce190 --- /dev/null +++ b/srcpkgs/virtualbox-ose/INSTALL.msg @@ -0,0 +1,5 @@ +In kernel 6.12, KVM initializes virtualization on module loading by default. +This prevents VirtualBox VMs from starting. +In order to avoid this, either add "kvm.enable_virt_at_load=0" parameter +into kernel command line or unload corresponding kvm_XXX module. + diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch index 12ee94908c9598..f4019330c30ae2 100644 --- a/srcpkgs/virtualbox-ose/patches/015-no-update.patch +++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch @@ -1,27 +1,24 @@ - +Adapted for VBox 7.1.0 Description: Disable "Check for Updates" action. Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212 Author: Daniel Hahler , Felix Geyer , Gianfranco Costamagna ---- a/doc/manual/en_US/user_Introduction.xml -+++ b/doc/manual/en_US/user_Introduction.xml -@@ -6090,14 +6090,14 @@ - . - - -- +--- a/doc/manual/en_US/dita/topics/preferences.dita ++++ b/doc/manual/en_US/dita/topics/preferences.dita +@@ -31,11 +31,13 @@ +
  • +

    Input. Enables you to specify keyboard shortcuts, both in and in individual VMs. For example you might want to specify a different Host key. This is the key that toggles whether the cursor is in the focus of the VM or the Host OS windows, see . The Host key is also used to trigger certain VM actions, see .

    +
    • + - - - Language. Enables you to +
  • +

    Language. Enables you to specify the language used for menus, labels, and text in + .

    --- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp @@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB @@ -33,9 +30,9 @@ Author: Daniel Hahler , Felix Geyer , Gian } QString UIExtraDataManager::applicationUpdateData() ---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -@@ -47,10 +47,10 @@ +--- a/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp +@@ -49,10 +49,10 @@ #ifdef VBOX_WS_WIN # include "UIGlobalSettingsInterface.h" #endif @@ -50,7 +47,7 @@ Author: Daniel Hahler , Felix Geyer , Gian /* GUI includes: Machine Settings: */ #include "UIMachineSettingsAudio.h" -@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate +@@ -98,7 +98,7 @@ void UISettingsDialogGlobal::retranslate #ifdef VBOX_GUI_WITH_NETWORK_MANAGER /* Update page: */ @@ -59,7 +56,7 @@ Author: Daniel Hahler , Felix Geyer , Gian #endif /* Language page: */ -@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate +@@ -109,7 +109,7 @@ void UISettingsDialogGlobal::retranslate #ifdef VBOX_GUI_WITH_NETWORK_MANAGER /* Proxy page: */ @@ -68,7 +65,7 @@ Author: Daniel Hahler , Felix Geyer , Gian #endif #ifdef VBOX_WS_WIN -@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare() +@@ -219,14 +219,14 @@ void UISettingsDialogGlobal::prepare() } #ifdef VBOX_GUI_WITH_NETWORK_MANAGER /* Update page: */ @@ -85,7 +82,7 @@ Author: Daniel Hahler , Felix Geyer , Gian #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ /* Language page: */ case GlobalSettingsPageType_Language: -@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare() +@@ -248,14 +248,14 @@ void UISettingsDialogGlobal::prepare() } #ifdef VBOX_GUI_WITH_NETWORK_MANAGER /* Proxy page: */ diff --git a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch b/srcpkgs/virtualbox-ose/patches/050-fix-include.patch deleted file mode 100644 index f6f3e115dba3b1..00000000000000 --- a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h -=================================================================== ---- virtualbox-ose-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h -+++ virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h -@@ -32,6 +32,7 @@ - #endif - - /* Qt includes: */ -+#include - #include - #include - diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch deleted file mode 100644 index 81f93ba7a5ebb7..00000000000000 --- a/srcpkgs/virtualbox-ose/patches/052-xml.patch +++ /dev/null @@ -1,163 +0,0 @@ -Fix ftbfs -From: nezos@hotmail.com ---- a/doc/manual/en_US/user_VBoxManage.xml -+++ b/doc/manual/en_US/user_VBoxManage.xml -@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V - on your particular host. - - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - -- -+ - - - Each time VBoxManage is invoked, only one diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index 8eda04269d1516..6981d6ce688961 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,6 +1,6 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -version=7.0.20 +version=7.1.4 revision=1 short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Orphaned " @@ -8,18 +8,18 @@ license="GPL-2.0-only, CDDL-1.0" homepage="https://www.virtualbox.org" changelog="https://www.virtualbox.org/wiki/Changelog" distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2" -checksum=5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02 +checksum=872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e nopie=yes lib32disabled=yes archs="x86_64" -hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang +hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which glslang vulkan-loader" makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel - libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel - libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel - SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel + libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel + libXinerama-devel libxslt-devel opus-devel pam-devel qt6-base-devel qt6-scxml-devel + SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel" @@ -80,7 +80,7 @@ do_install() { install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \ VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \ VBoxVolInfo xpidl \ - VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \ + VBoxBalloonCtrl vboxwebsrv webtest \ -t ${DESTDIR}/usr/lib/virtualbox # locales