diff --git a/hardware/virtualization/virtualbox/actions.py b/hardware/virtualization/virtualbox/actions.py index d902a0cef8..b296fc9f63 100644 --- a/hardware/virtualization/virtualbox/actions.py +++ b/hardware/virtualization/virtualbox/actions.py @@ -15,7 +15,7 @@ VBoxDataDir = "/usr/share/virtualbox" KDIR = kerneltools.getKernelVersion() def setup(): - shelltools.system("sed -i -e 's|pkg-config Qt5Core Qt5Gui|pkg-config Qt5Core|' configure") + # shelltools.system("sed -i -e 's|pkg-config Qt6Core Qt6Gui|pkg-config Qt6Core|' configure") pisitools.dosed("LocalConfig.kmk", "__VBOXLIBDIR__", VBoxLibDir) pisitools.dosed("LocalConfig.kmk", "__VBOXDATADIR__", VBoxDataDir) @@ -108,10 +108,12 @@ def install(): pisitools.dobin("additions/VBoxControl") pisitools.dobin("additions/VBoxDRMClient") + pisitools.dobin("additions/vboxwl") pisitools.dosbin("additions/VBoxService") pisitools.dosbin("additions/mount.vboxsf", "/sbin") + pisitools.insinto("/lib/security", "additions/pam_vbox.so") #pisitools.dolib("additions/VBoxOGL*") @@ -123,12 +125,12 @@ def install(): # Python bindings pisitools.insinto("%s/sdk/bindings/xpcom" % VBoxLibDir, "sdk/bindings/xpcom/python") - shelltools.cd("sdk/installer") - shelltools.copy("vboxapisetup.py", "setup.py") + shelltools.cd("sdk/installer/python/vboxapi") + # shelltools.copy("vboxapisetup.py", "setup.py") shelltools.export("VBOX_INSTALL_PATH", VBoxLibDir) pythonmodules.install() - shelltools.cd("../..") + shelltools.cd("../../../..") mvb_name = "module-virtualbox-%s" % get.srcVERSION() mvbg_name = "module-virtualbox-guest-%s" % get.srcVERSION() diff --git a/hardware/virtualization/virtualbox/files/LocalConfig.kmk b/hardware/virtualization/virtualbox/files/LocalConfig.kmk index acfe3c3940..1169f38009 100644 --- a/hardware/virtualization/virtualbox/files/LocalConfig.kmk +++ b/hardware/virtualization/virtualbox/files/LocalConfig.kmk @@ -23,6 +23,7 @@ VBOX_JAVA_HOME = /usr/lib/jvm/java-8-openjdk VBOX_WITH_CLOUD_NET := # enable features +BOX_WITH_UNATTENDED = 1 VBOX_WITH_VBOX_IMG = 1 VBOX_WITH_VBOXIMGMOUNT = 1 VBOX_WITH_VBOXSDL = 1 diff --git a/hardware/virtualization/virtualbox/files/archlinux/004-drop-Wno-format.patch b/hardware/virtualization/virtualbox/files/archlinux/004-drop-Wno-format.patch index 02440b9b2c..6dc181ec2c 100644 --- a/hardware/virtualization/virtualbox/files/archlinux/004-drop-Wno-format.patch +++ b/hardware/virtualization/virtualbox/files/archlinux/004-drop-Wno-format.patch @@ -1,112 +1,73 @@ -From 9736107f45a17f04e4a0f9ab14fe913660cde3ad Mon Sep 17 00:00:00 2001 +From c2dc4a940e485a26e1b729e94c5aa710834d1542 Mon Sep 17 00:00:00 2001 From: Christian Hesse -Date: Mon, 17 Oct 2022 15:07:30 +0200 -Subject: [PATCH] drop -Wno-format +Date: Tue, 18 Apr 2023 22:59:50 +0200 +Subject: [PATCH 1/1] drop -Wno-format --- - src/VBox/Devices/EFI/Firmware/Config.kmk | 2 +- - .../Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf | 6 +++--- - .../CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 6 +++--- - src/VBox/Devices/Makefile.kmk | 2 +- - src/VBox/Devices/PC/ipxe/Makefile.kmk | 2 +- - src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk | 2 +- - src/VBox/Main/webservice/Makefile.kmk | 3 +-- - src/libs/xpcom18a4/Config.kmk | 6 +++--- - 8 files changed, 14 insertions(+), 15 deletions(-) + src/VBox/Devices/EFI/Firmware/Config.kmk | 2 +- + src/VBox/Devices/Makefile.kmk | 2 +- + src/VBox/Devices/PC/ipxe/Makefile.kmk | 2 +- + src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk | 2 +- + src/VBox/Main/webservice/Makefile.kmk | 3 +-- + 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/VBox/Devices/EFI/Firmware/Config.kmk b/src/VBox/Devices/EFI/Firmware/Config.kmk -index e2e537f1..de640194 100644 +index 5e7dcf91..04f4c854 100644 --- a/src/VBox/Devices/EFI/Firmware/Config.kmk +++ b/src/VBox/Devices/EFI/Firmware/Config.kmk -@@ -155,7 +155,7 @@ TEMPLATE_VBoxEfiBldProg_LIBS = \ - ifn1of ($(KBUILD_HOST),win) # This stuff isn't up to our standard at all! :/ +@@ -165,7 +165,7 @@ TEMPLATE_VBoxEfiBldProg_LIBS = \ + ifn1of ($(KBUILD_HOST), win) # This stuff isn't up to our standard at all! :/ TEMPLATE_VBoxEfiBldProg_CFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CFLAGS)) \ -Wno-sign-compare -Wno-missing-prototypes -Wno-strict-prototypes \ -- -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow -Wno-format \ -+ -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow \ - -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-label +- -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow -Wno-format \ ++ -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow \ + -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-label TEMPLATE_VBoxEfiBldProg_CXXFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CXXFLAGS)) \ -Wno-all -Wno-shadow -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable \ -diff --git a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf -index 5300ea32..e9485765 100644 ---- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf -+++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf -@@ -618,10 +618,10 @@ - # -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration). - # - GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS -+ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS - GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -- GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -+ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -+ GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized - GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize -diff --git a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -index 1b1d46b0..df9998a5 100644 ---- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -+++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -@@ -567,10 +567,10 @@ - # -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration). - # - GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS -+ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS - GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -- GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -+ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -+ GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable - GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized - GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized - GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk -index 02da1255..c2cbbc1c 100644 +index 613ff466..9123b767 100644 --- a/src/VBox/Devices/Makefile.kmk +++ b/src/VBox/Devices/Makefile.kmk -@@ -836,7 +836,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1 - ifeq ($(KBUILD_TARGET),win) - $(file)_CFLAGS = -wd4018 - else -- $(file)_CFLAGS += -Wno-sign-compare -Wno-format -Wno-bad-function-cast -+ $(file)_CFLAGS += -Wno-sign-compare -Wno-bad-function-cast - endif - endef +@@ -859,7 +859,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SU + ifeq ($(KBUILD_TARGET),win) + $(file)_CFLAGS = -wd4018 + else +- $(file)_CFLAGS += -Wno-sign-compare -Wno-format -Wno-bad-function-cast ++ $(file)_CFLAGS += -Wno-sign-compare -Wno-bad-function-cast + endif + endef diff --git a/src/VBox/Devices/PC/ipxe/Makefile.kmk b/src/VBox/Devices/PC/ipxe/Makefile.kmk -index 8a611f6d..c57f0454 100644 +index 6c95001a..9708145c 100644 --- a/src/VBox/Devices/PC/ipxe/Makefile.kmk +++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk -@@ -401,7 +401,7 @@ endif +@@ -396,7 +396,7 @@ endif # BLDPROGS += ipxezbin ipxezbin_TEMPLATE = VBoxBldProg - ipxezbin_CFLAGS = -Wno-format -Wno-unused-function -Wno-pointer-arith + ipxezbin_CFLAGS = -Wno-unused-function -Wno-pointer-arith ipxezbin_SOURCES = src/util/zbin.c - ipxezbin_LIBS = lzma # @todo Can't assume liblzma on the build system - + ifdef VBOX_WITH_LIBLZMA + ipxezbin_INCS = $(SDK_VBoxLibLzma_INCS) # Can't use the proper SDK here as link order matters and liblzma depends on our runtime. diff --git a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -index b2bd260b..133e7398 100644 +index 394834e5..2f90d86f 100644 --- a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +++ b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk @@ -118,7 +118,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) && defined(VBOX_WITH_EXTPACK) - VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0 - VBoxDTraceCmd_SDKS = VBOX_ZLIB - ifn1of ($(KBUILD_TARGET), win) -- VBoxDTraceCmd_CFLAGS = -Wno-format $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow -+ VBoxDTraceCmd_CFLAGS = $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow - endif - VBoxDTraceCmd_INCS = \ - include \ + VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0 + VBoxDTraceCmd_SDKS = VBoxZlib + ifn1of ($(KBUILD_TARGET), win) +- VBoxDTraceCmd_CFLAGS = -Wno-format $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow ++ VBoxDTraceCmd_CFLAGS = $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow + endif + VBoxDTraceCmd_INCS = \ + include \ diff --git a/src/VBox/Main/webservice/Makefile.kmk b/src/VBox/Main/webservice/Makefile.kmk -index 072d066e..d2feea75 100644 +index 84880dcd..f301f9cc 100644 --- a/src/VBox/Main/webservice/Makefile.kmk +++ b/src/VBox/Main/webservice/Makefile.kmk -@@ -260,7 +260,7 @@ ifdef VBOX_GSOAP_INSTALLED +@@ -264,7 +264,7 @@ ifdef VBOX_GSOAP_INSTALLED ifn1of ($(KBUILD_TARGET), win) vboxsoap_CXXFLAGS += -Wno-shadow -Wno-parentheses $(VBOX_GCC_Wno-literal-suffix) \ $(VBOX_GCC_Wno-stringop-overflow) $(VBOX_GCC_Wno-stringop-truncation) \ @@ -115,35 +76,11 @@ index 072d066e..d2feea75 100644 ifn1of ($(KBUILD_TYPE), debug) # Save time+memory by using -O0 instead of -O2. vboxsoap_CXXFLAGS += -O0 ## @todo this could be interesting for g++ (not clang++): -fcprop-registers endif -@@ -331,7 +331,6 @@ ifdef VBOX_GSOAP_INSTALLED +@@ -335,7 +335,6 @@ ifdef VBOX_GSOAP_INSTALLED $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts ifn1of ($(KBUILD_TARGET), win) $(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS = \ -- -Wno-format \ - $(VBOX_GCC_Wno-int-in-bool-context) \ - $(VBOX_GCC_Wno-logical-op) +- -Wno-format \ + $(VBOX_GCC_Wno-int-in-bool-context) \ + $(VBOX_GCC_Wno-logical-op) # currently necessary when compiling against OpenSSL 1.0 due to a missing -diff --git a/src/libs/xpcom18a4/Config.kmk b/src/libs/xpcom18a4/Config.kmk -index 3b0831e5..a83a080b 100644 ---- a/src/libs/xpcom18a4/Config.kmk -+++ b/src/libs/xpcom18a4/Config.kmk -@@ -243,8 +243,8 @@ TEMPLATE_XPCOMEXE_LDFLAGS.darwin = -bind_at_load $(filter-out -current_version - # - TEMPLATE_XPCOMTSTEXE = XPCOM executable files (testcases) - TEMPLATE_XPCOMTSTEXE_EXTENDS = XPCOMEXE --TEMPLATE_XPCOMTSTEXE_CXXFLAGS = $(TEMPLATE_XPCOMEXE_CXXFLAGS) -Wno-format --TEMPLATE_XPCOMTSTEXE_CFLAGS = $(TEMPLATE_XPCOMEXE_CFLAGS) -Wno-format -+TEMPLATE_XPCOMTSTEXE_CXXFLAGS = $(TEMPLATE_XPCOMEXE_CXXFLAGS) -+TEMPLATE_XPCOMTSTEXE_CFLAGS = $(TEMPLATE_XPCOMEXE_CFLAGS) - TEMPLATE_XPCOMTSTEXE_INST = $(INST_TESTCASE) - ifdef VBOX_WITH_RUNPATH - TEMPLATE_XPCOMTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_XPCOMEXE_LDFLAGS) -@@ -277,7 +277,7 @@ TEMPLATE_XPCOMBLDPROG_INCS = \ - $(VBOX_PATH_SDK)/bindings/xpcom/include/string \ - $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \ - $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd --TEMPLATE_XPCOMBLDPROG_CFLAGS = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) -Wno-format -+TEMPLATE_XPCOMBLDPROG_CFLAGS = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) - TEMPLATE_XPCOMBLDPROG_CXXFLAGS.darwin = $(TEMPLATE_VBoxBldProg_CXXFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-common -fno-rtti - TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris = $(TEMPLATE_VBoxBldProg_CXXFLAGS.solaris) -fno-omit-frame-pointer # for now anyway. - TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin = $(TEMPLATE_VBoxBldProg_LDFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions diff --git a/hardware/virtualization/virtualbox/files/archlinux/009-properly-handle-i3wm.patch b/hardware/virtualization/virtualbox/files/archlinux/009-properly-handle-i3wm.patch index 6967efa3ca..50999e3df6 100644 --- a/hardware/virtualization/virtualbox/files/archlinux/009-properly-handle-i3wm.patch +++ b/hardware/virtualization/virtualbox/files/archlinux/009-properly-handle-i3wm.patch @@ -1,8 +1,20 @@ +From 04cf1e3a266fcc4e65d01b8b492d2c5fbe1bf13d Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 11 Sep 2024 21:10:09 +0200 +Subject: [PATCH 1/1] properly handle i3wm + +--- + .../VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp | 3 ++- + .../Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.cpp | 3 +++ + src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.h | 3 ++- + src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp | 3 +++ + 4 files changed, 10 insertions(+), 2 deletions(-) + diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp -index 01aa93c6..06a78ac1 100644 +index e9b78fde..17a1dfc0 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp -@@ -391,7 +391,8 @@ QRect UIDesktopWidgetWatchdog::availableGeometry(QScreen *pScreen) const +@@ -380,7 +380,8 @@ QRect UIDesktopWidgetWatchdog::availableGeometry(QScreen *pScreen) const /* Get cached available-geometry: */ const QRect availableGeometry = m_availableGeometryData.value(screenToIndex(pScreen)); /* Return cached available-geometry if it's valid or screen-geometry otherwise: */ @@ -10,13 +22,13 @@ index 01aa93c6..06a78ac1 100644 + return availableGeometry.isValid() && NativeWindowSubsystem::X11WindowManagerType() != X11WMType_i3 ? + availableGeometry : screenGeometry(pScreen); # endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */ - #else /* !VBOX_WS_X11 */ + #else /* !VBOX_WS_NIX */ /* Just return screen available-geometry: */ -diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp -index e8b8db43..8c8ebdca 100644 ---- a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp -@@ -115,6 +115,9 @@ X11WMType NativeWindowSubsystem::X11WindowManagerType() +diff --git a/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.cpp b/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.cpp +index ab520e51..f168050d 100644 +--- a/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.cpp +@@ -139,6 +139,9 @@ X11WMType NativeWindowSubsystem::X11WindowManagerType() else if (QString((const char*)pcData).contains("Xfwm4", Qt::CaseInsensitive)) wmType = X11WMType_Xfwm4; @@ -26,11 +38,11 @@ index e8b8db43..8c8ebdca 100644 if (pcData) XFree(pcData); } -diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h -index 12b4a172..dae12f25 100644 ---- a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h -+++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h -@@ -49,6 +49,7 @@ enum X11WMType +diff --git a/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.h b/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.h +index e1dfc07f..b1a789e7 100644 +--- a/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.h ++++ b/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.h +@@ -51,6 +51,7 @@ enum X11WMType X11WMType_Metacity, X11WMType_Mutter, X11WMType_Xfwm4, @@ -38,27 +50,26 @@ index 12b4a172..dae12f25 100644 }; /** X11: Screen-saver inhibit methods. */ -@@ -95,7 +96,7 @@ namespace NativeWindowSubsystem - /** X11: Determines and returns whether the compositing manager is running. */ - bool X11IsCompositingManagerRunning(); +@@ -104,7 +105,7 @@ namespace NativeWindowSubsystem + /** Wrapper for window manager type functions. */ + X11WMType windowManagerType(bool fIsXServerAvailable); /** X11: Determines and returns current Window Manager type. */ - X11WMType X11WindowManagerType(); + SHARED_LIBRARY_STUFF X11WMType X11WindowManagerType(); + /** Wayland: Determines and returns current Window Manager type. */ + X11WMType WaylandWindowManagerType(); - /** X11: Returns true if XLib extension with name @p extensionName is avaible, false otherwise. */ - bool X11CheckExtension(const char *extensionName); diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp -index 8ac46c99..5b749947 100644 +index 272729a4..6346fb63 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp -@@ -1076,6 +1076,10 @@ void UIMiniToolBar::prepare() +@@ -1076,6 +1076,9 @@ void UIMiniToolBar::prepare() /* Enable translucency through Qt API if supported: */ if (uiCommon().isCompositingManagerRunning()) setAttribute(Qt::WA_TranslucentBackground); + + if (NativeWindowSubsystem::X11WindowManagerType() == X11WMType_i3) -+ setWindowFlags(Qt::FramelessWindowHint); -+ - #endif /* VBOX_WS_X11 */ ++ setWindowFlags(Qt::FramelessWindowHint); + #endif /* VBOX_WS_NIX */ /* Make sure we have no focus: */ diff --git a/hardware/virtualization/virtualbox/files/archlinux/018-upate-xclient-script.patch b/hardware/virtualization/virtualbox/files/archlinux/018-upate-xclient-script.patch index eeb5e0e878..0f044b7a3d 100644 --- a/hardware/virtualization/virtualbox/files/archlinux/018-upate-xclient-script.patch +++ b/hardware/virtualization/virtualbox/files/archlinux/018-upate-xclient-script.patch @@ -1,17 +1,17 @@ -From 12e0a15f8893187ee92fa5af8095b8bb33adefe5 Mon Sep 17 00:00:00 2001 +From 866928ba1ad8d62f62bb3abab463740da8a4d07a Mon Sep 17 00:00:00 2001 From: Christian Hesse -Date: Mon, 17 Oct 2022 16:40:29 +0200 -Subject: [PATCH] upate xclient script +Date: Wed, 11 Sep 2024 21:14:24 +0200 +Subject: [PATCH 1/1] upate xclient script --- - src/VBox/Additions/x11/Installer/98vboxadd-xclient | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) + .../Additions/x11/Installer/98vboxadd-xclient | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Additions/x11/Installer/98vboxadd-xclient -index 7c9b5989..271261a4 100755 +index 7a45de98..bcfe024e 100755 --- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient +++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient -@@ -31,18 +31,11 @@ for i in $HOME/.vboxclient-*.pid; do +@@ -31,17 +31,9 @@ for i in $HOME/.vboxclient-*.pid; do test -w $i || rm -f $i done @@ -24,12 +24,17 @@ index 7c9b5989..271261a4 100755 - # This script can also be triggered by a connection over SSH, which is not - # what we had in mind, so we do not start VBoxClient in that case. We do - # not use "exit" here as this script is "source"d, not executed. +- +- # Check wheather X11 or Wayland version of VBoxClient should be started. +# Do not start if the kernel module is not present; or if this script is +# triggered by a connection over SSH. -+if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then - /usr/bin/VBoxClient --clipboard - /usr/bin/VBoxClient --checkhostversion - /usr/bin/VBoxClient --seamless - /usr/bin/VBoxClient --draganddrop -- /usr/bin/VBoxClient --vmsvga-session # In case VMSVGA emulation is enabled ++if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then + vbox_wl_check=$(/usr/bin/vboxwl --check 2> /dev/null) + if test "$vbox_wl_check" = "WL"; then + /usr/bin/VBoxClient --wayland +@@ -52,5 +44,4 @@ elif test -z "${SSH_CONNECTION}"; then + fi + + /usr/bin/VBoxClient --checkhostversion +- /usr/bin/VBoxClient --vmsvga-session # In case VMSVGA emulation is enabled fi diff --git a/hardware/virtualization/virtualbox/pspec.xml b/hardware/virtualization/virtualbox/pspec.xml index 14945a0fe5..de390c9e32 100644 --- a/hardware/virtualization/virtualbox/pspec.xml +++ b/hardware/virtualization/virtualbox/pspec.xml @@ -12,7 +12,7 @@ app:gui A powerful virtualization program VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things. - http://download.virtualbox.org/virtualbox/7.0.20/VirtualBox-7.0.20.tar.bz2 + http://download.virtualbox.org/virtualbox/7.1.4/VirtualBox-7.1.4.tar.bz2 dkms.conf dkms-guest.conf @@ -54,16 +54,16 @@ pulseaudio-libs-devel kernel-headers kernel-module-headers - qt5-x11extras-devel jdk8-openjdk jre8-openjdk libxcb-devel - qt5-base-devel - qt5-linguist + qt6-base-devel + qt6-linguist docbook-xml libglvnd-devel python3-devel - qt5-assistant-devel + qt6-assistant-devel + qt6-scxml-devel LocalConfig.kmk @@ -86,7 +86,8 @@ virtualbox - qt5-base + xz + qt6-base libxcb mesa liblzf @@ -112,10 +113,10 @@ libxml2 openssl device-mapper - qt5-x11extras libglvnd python3 - qt5-assistant + qt6-assistant + qt6-scxml module-virtualbox @@ -214,6 +215,13 @@ + + 2024-12-20 + 7.1.4 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2024-07-18 7.0.20