virtualbox-7.0.2
This commit is contained in:
Rmys
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
|
||||
index da373c92..18fb69a7 100644
|
||||
--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
|
||||
+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
|
||||
@@ -2349,7 +2349,7 @@ QString UIExtraDataManager::preventBetaBuildWarningForVersion()
|
||||
bool UIExtraDataManager::applicationUpdateEnabled()
|
||||
{
|
||||
/* 'True' unless 'restriction' feature allowed: */
|
||||
- return !isFeatureAllowed(GUI_PreventApplicationUpdate);
|
||||
+ return false;
|
||||
}
|
||||
|
||||
QString UIExtraDataManager::applicationUpdateData()
|
||||
@@ -0,0 +1,149 @@
|
||||
From 9736107f45a17f04e4a0f9ab14fe913660cde3ad Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hesse <mail@eworm.de>
|
||||
Date: Mon, 17 Oct 2022 15:07:30 +0200
|
||||
Subject: [PATCH] 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(-)
|
||||
|
||||
diff --git a/src/VBox/Devices/EFI/Firmware/Config.kmk b/src/VBox/Devices/EFI/Firmware/Config.kmk
|
||||
index e2e537f1..de640194 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! :/
|
||||
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
|
||||
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
|
||||
--- 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
|
||||
|
||||
diff --git a/src/VBox/Devices/PC/ipxe/Makefile.kmk b/src/VBox/Devices/PC/ipxe/Makefile.kmk
|
||||
index 8a611f6d..c57f0454 100644
|
||||
--- a/src/VBox/Devices/PC/ipxe/Makefile.kmk
|
||||
+++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk
|
||||
@@ -401,7 +401,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
|
||||
|
||||
diff --git a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
||||
index b2bd260b..133e7398 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 \
|
||||
diff --git a/src/VBox/Main/webservice/Makefile.kmk b/src/VBox/Main/webservice/Makefile.kmk
|
||||
index 072d066e..d2feea75 100644
|
||||
--- a/src/VBox/Main/webservice/Makefile.kmk
|
||||
+++ b/src/VBox/Main/webservice/Makefile.kmk
|
||||
@@ -260,7 +260,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) \
|
||||
- $(VBOX_GCC_Wno-vla) -Wno-format -Wno-deprecated-declarations $(VBOX_GCC_fno-printf-return-value)
|
||||
+ $(VBOX_GCC_Wno-vla) -Wno-deprecated-declarations $(VBOX_GCC_fno-printf-return-value)
|
||||
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
|
||||
$(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)
|
||||
# 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
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/src/VBox/Main/webservice/Makefile.kmk 2013-11-21 19:00:46.812761628 +0100
|
||||
+++ b/src/VBox/Main/webservice/Makefile.kmk 2016-08-18 15:16:05.803599026 +0100
|
||||
@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \
|
||||
$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
|
||||
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
|
||||
$(RM) -f $@
|
||||
- $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
|
||||
+ $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
|
||||
ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
|
||||
$(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
|
||||
$(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
|
||||
@@ -0,0 +1,12 @@
|
||||
Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7
|
||||
--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:23.184986182 +0100
|
||||
+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:39.879176964 +0100
|
||||
@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
|
||||
|
||||
ifdef VBOX_USE_SYSTEM_XORG_HEADERS
|
||||
# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
|
||||
- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
|
||||
+ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS))
|
||||
SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
|
||||
vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
|
||||
vboxvideo_drv_system_CFLAGS := \
|
||||
@@ -0,0 +1,77 @@
|
||||
From 9284f5a37708ddf0108898a48eca5db0e5316a43 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hesse <mail@eworm.de>
|
||||
Date: Mon, 17 Oct 2022 16:35:53 +0200
|
||||
Subject: [PATCH] properly handle i3wm
|
||||
|
||||
---
|
||||
.../VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp | 4 ++--
|
||||
.../Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp | 3 +++
|
||||
.../Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h | 3 ++-
|
||||
src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp | 4 ++++
|
||||
4 files changed, 11 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
|
||||
index 9c5faa42..5439e2a7 100644
|
||||
--- a/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
|
||||
+++ b/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
|
||||
@@ -443,8 +443,8 @@ const QRect UIDesktopWidgetWatchdog::availableGeometry(int iHostScreenIndex /* =
|
||||
/* Get cached available-geometry: */
|
||||
const QRect availableGeometry = m_availableGeometryData.value(iHostScreenIndex);
|
||||
/* Return cached available-geometry if it's valid or screen-geometry otherwise: */
|
||||
- return availableGeometry.isValid() ? availableGeometry :
|
||||
- QApplication::desktop()->screenGeometry(iHostScreenIndex);
|
||||
+ return availableGeometry.isValid() && NativeWindowSubsystem::X11WindowManagerType() != X11WMType_i3 ?
|
||||
+ availableGeometry : QApplication::desktop()->screenGeometry(iHostScreenIndex);
|
||||
# endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
|
||||
# else /* !VBOX_WS_X11 */
|
||||
/* Redirect call to desktop-widget: */
|
||||
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 53927559..ea648da7 100644
|
||||
--- a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp
|
||||
+++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp
|
||||
@@ -117,6 +117,9 @@ X11WMType NativeWindowSubsystem::X11WindowManagerType()
|
||||
else
|
||||
if (QString((const char*)pcData).contains("Xfwm4", Qt::CaseInsensitive))
|
||||
wmType = X11WMType_Xfwm4;
|
||||
+ else
|
||||
+ if (QString((const char*)pcData).contains("i3", Qt::CaseInsensitive))
|
||||
+ wmType = X11WMType_i3;
|
||||
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 bad78665..f2a0b462 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
|
||||
X11WMType_Metacity,
|
||||
X11WMType_Mutter,
|
||||
X11WMType_Xfwm4,
|
||||
+ X11WMType_i3,
|
||||
};
|
||||
|
||||
/** X11: Screen-saver inhibit methods. */
|
||||
@@ -95,7 +96,7 @@
|
||||
/** X11: Determines and returns whether the compositing manager is running. */
|
||||
bool X11IsCompositingManagerRunning();
|
||||
/** X11: Determines and returns current Window Manager type. */
|
||||
- X11WMType X11WindowManagerType();
|
||||
+ SHARED_LIBRARY_STUFF X11WMType X11WindowManagerType();
|
||||
|
||||
#if 0 // unused for now?
|
||||
/** X11: Inits the screen saver save/restore mechanism. */
|
||||
diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
|
||||
index 815db408..8cddb431 100644
|
||||
--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
|
||||
+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
|
||||
@@ -888,6 +888,10 @@ 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 */
|
||||
|
||||
/* Make sure we have no focus: */
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
|
||||
index 6ad7df3e..2f12c277 100644
|
||||
--- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
|
||||
+++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
|
||||
@@ -162,6 +162,9 @@ static int vbglR3GuestCtrlMsgWaitFor(uint32_t idClient, uint32_t *pidMsg, uint32
|
||||
*/
|
||||
DECL_NO_INLINE(static, bool) vbglR3GuestCtrlDetectPeekGetCancelSupport(uint32_t idClient)
|
||||
{
|
||||
+
|
||||
+ return false;
|
||||
+
|
||||
/*
|
||||
* Seems we get VINF_SUCCESS back from the host if we try unsupported
|
||||
* guest control functions, so we need to supply some random message
|
||||
+54
@@ -0,0 +1,54 @@
|
||||
From eb9ded87d9d1a6755f2bb7258641c9c80c54c347 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hesse <mail@eworm.de>
|
||||
Date: Mon, 17 Oct 2022 16:30:32 +0200
|
||||
Subject: [PATCH] support building from dkms
|
||||
|
||||
---
|
||||
src/VBox/HostDrivers/linux/Makefile | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile
|
||||
index badeb4f4..314281f3 100644
|
||||
--- a/src/VBox/HostDrivers/linux/Makefile
|
||||
+++ b/src/VBox/HostDrivers/linux/Makefile
|
||||
@@ -33,25 +33,25 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
|
||||
#
|
||||
|
||||
-ifneq ($(KERNELRELEASE),)
|
||||
+ifneq ($(KBUILD_EXTMOD),)
|
||||
|
||||
-# Building from kBuild (make -C <kernel_directory> M=`pwd`),
|
||||
-# or inside a kernel source tree.
|
||||
+# Building from kBuild (make -C <kernel_directory> M=`pwd`).
|
||||
+# KBUILD_EXTMOD is set to $(M) in this case.
|
||||
|
||||
obj-m = vboxdrv/
|
||||
- ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),)
|
||||
+ ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetflt/Makefile),)
|
||||
obj-m += vboxnetflt/
|
||||
endif
|
||||
- ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
|
||||
+ ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp/Makefile),)
|
||||
obj-m += vboxnetadp/
|
||||
endif
|
||||
- ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
|
||||
+ ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),)
|
||||
obj-m += vboxpci/
|
||||
endif
|
||||
|
||||
-else # ! KERNELRELEASE
|
||||
+else # ! KBUILD_EXTMOD
|
||||
|
||||
-# convenience Makefile without KERNELRELEASE
|
||||
+# convenience Makefile without KBUILD_EXTMOD
|
||||
|
||||
ifndef SUDO
|
||||
ifneq ($(shell id -u),0)
|
||||
@@ -244,5 +244,5 @@ load: unload
|
||||
fi; \
|
||||
done
|
||||
|
||||
-endif # ! KERNELRELEASE
|
||||
+endif # ! KBUILD_EXTMOD
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From 12e0a15f8893187ee92fa5af8095b8bb33adefe5 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hesse <mail@eworm.de>
|
||||
Date: Mon, 17 Oct 2022 16:40:29 +0200
|
||||
Subject: [PATCH] upate xclient script
|
||||
|
||||
---
|
||||
src/VBox/Additions/x11/Installer/98vboxadd-xclient | 13 +++----------
|
||||
1 file changed, 3 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
|
||||
index 7c9b5989..271261a4 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
|
||||
test -w $i || rm -f $i
|
||||
done
|
||||
|
||||
-if ! test -c /dev/vboxguest 2>/dev/null; then
|
||||
- # Do not start if the kernel module is not present.
|
||||
- # Execute notify-send in the back-ground to avoid racing with sddm,
|
||||
- # as notify-send may wait for sddm to start while it waits for us to exit.
|
||||
- notify-send "VBoxClient: the VirtualBox kernel service is not running. Exiting." &
|
||||
-elif test -z "${SSH_CONNECTION}"; then
|
||||
- # 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.
|
||||
+# 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
|
||||
fi
|
||||
@@ -0,0 +1,13 @@
|
||||
Fix compiling with shared liblzf library by not mangling the needed symbols
|
||||
--- a/src/VBox/Runtime/common/zip/zip.cpp 2022-10-07 01:11:55.000000000 +0800
|
||||
+++ b/src/VBox/Runtime/common/zip/zip.cpp 2022-10-19 22:35:37.996450458 +0800
|
||||
@@ -61,7 +61,9 @@
|
||||
# include <zlib.h>
|
||||
#endif
|
||||
#ifdef RTZIP_USE_LZF
|
||||
+extern "C" {
|
||||
# include <lzf.h>
|
||||
+}
|
||||
# include <iprt/crc.h>
|
||||
#endif
|
||||
#ifdef RTZIP_USE_LZJB
|
||||
Reference in New Issue
Block a user