commit: a1b67eff62a33d2f98aefa772e8a758bf8986725 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Tue Apr 18 17:33:08 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Tue Apr 18 17:33:49 2023 +0000 URL: https://gitweb.gentoo.org/proj/virtualbox-patches.git/commit/?id=a1b67eff
Update patches for virtualbox 7.0.8 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> patches/003_virtualbox-4.0.2-restore_old_machines_dir.patch | 12 ------------ patches/003_virtualbox-7.0.8-restore_old_machines_dir.patch | 12 ++++++++++++ patches/005_virtualbox-4.2.26-asneeded.patch | 11 ----------- patches/005_virtualbox-7.0.8-asneeded.patch | 11 +++++++++++ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/patches/003_virtualbox-4.0.2-restore_old_machines_dir.patch b/patches/003_virtualbox-4.0.2-restore_old_machines_dir.patch deleted file mode 100644 index a79cd90..0000000 --- a/patches/003_virtualbox-4.0.2-restore_old_machines_dir.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- VirtualBox-4.0.2_OSE/src/VBox/Main/src-server/SystemPropertiesImpl.cpp -+++ VirtualBox-4.0.2_OSE/src/VBox/Main/src-server/SystemPropertiesImpl.cpp -@@ -1035,7 +1035,8 @@ - // new default with VirtualBox 4.0: "$HOME/VirtualBox VMs" - HRESULT rc = getUserHomeDirectory(path); - if (FAILED(rc)) return rc; -- path += RTPATH_SLASH_STR "VirtualBox VMs"; -+ path += RTPATH_SLASH_STR ".VirtualBox"; -+ path += RTPATH_SLASH_STR "Machines"; - } - - if (!RTPathStartsWithRoot(path.c_str())) diff --git a/patches/003_virtualbox-7.0.8-restore_old_machines_dir.patch b/patches/003_virtualbox-7.0.8-restore_old_machines_dir.patch new file mode 100644 index 0000000..06be394 --- /dev/null +++ b/patches/003_virtualbox-7.0.8-restore_old_machines_dir.patch @@ -0,0 +1,12 @@ +--- VirtualBox-7.0.8/src/VBox/Main/src-server/SystemPropertiesImpl.cpp ++++ VirtualBox-7.0.8/src/VBox/Main/src-server/SystemPropertiesImpl.cpp +@@ -2171,7 +2171,8 @@ + // new default with VirtualBox 4.0: "$HOME/VirtualBox VMs" + HRESULT hrc = i_getUserHomeDirectory(path); + if (FAILED(hrc)) return hrc; +- path += RTPATH_SLASH_STR "VirtualBox VMs"; ++ path += RTPATH_SLASH_STR ".VirtualBox"; ++ path += RTPATH_SLASH_STR "Machines"; + } + + if (!RTPathStartsWithRoot(path.c_str())) diff --git a/patches/005_virtualbox-4.2.26-asneeded.patch b/patches/005_virtualbox-4.2.26-asneeded.patch deleted file mode 100644 index 4b53d16..0000000 --- a/patches/005_virtualbox-4.2.26-asneeded.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- VirtualBox-4.2.26/Config.kmk -+++ VirtualBox-4.2.26/Config.kmk -@@ -4672,7 +4672,7 @@ - TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64 - TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64 - ifeq ($(KBUILD_HOST),linux) --TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl -+TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl crypt - else ifeq ($(KBUILD_HOST),os2) - TEMPLATE_VBoxBldProg_TOOL = GXX3OMF - TEMPLATE_VBoxBldProg_LIBS = socket iconv diff --git a/patches/005_virtualbox-7.0.8-asneeded.patch b/patches/005_virtualbox-7.0.8-asneeded.patch new file mode 100644 index 0000000..121b802 --- /dev/null +++ b/patches/005_virtualbox-7.0.8-asneeded.patch @@ -0,0 +1,11 @@ +--- VirtualBox-7.0.8/Config.kmk ++++ VirtualBox-7.0.8/Config.kmk +@@ -8176,7 +8176,7 @@ + TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64 + TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64 + ifeq ($(KBUILD_HOST),linux) +- TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl ++ TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl crypt + else ifeq ($(KBUILD_HOST),os2) + TEMPLATE_VBoxBldProg_TOOL = GXX3OMF + TEMPLATE_VBoxBldProg_LIBS = socket iconv
