diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -23,7 +23,7 @@ libpam.so.0 libpng16.so.16 libpthread.so.0 -libpython3.6m.so.1.0 +libpython3.7m.so.1.0 librt.so.1 libssl.so.1.0.0 libstdc++.so.6 diff --git a/files/fixes_for_5.5.patch b/files/fixes_for_5.5.patch new file mode 100644 --- /dev/null +++ b/files/fixes_for_5.5.patch @@ -0,0 +1,305 @@ +Index: VirtualBox-6.1.2/src/VBox/HostDrivers/linux/Makefile +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/HostDrivers/linux/Makefile ++++ VirtualBox-6.1.2/src/VBox/HostDrivers/linux/Makefile +@@ -35,9 +35,6 @@ endif + ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),) + obj-m += vboxnetadp/ + endif +-ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),) +- obj-m += vboxpci/ +-endif + + else # ! KERNELRELEASE + +@@ -45,10 +42,11 @@ else # ! KERNELRELEASE + + KBUILD_VERBOSE ?= + KERN_VER ?= $(shell uname -r) +-.PHONY: all install clean check unload load vboxdrv vboxnetflt vboxnetadp \ +- vboxpci ++PWD ?= $(shell pwd) ++ ++.PHONY: all install clean check unload load vboxdrv vboxnetflt vboxnetadp + +-all: vboxdrv vboxnetflt vboxnetadp vboxpci ++all: vboxdrv vboxnetflt vboxnetadp + + # We want to build on Linux 2.6.18 and later kernels. + ifneq ($(filter-out 1.% 2.0.% 2.1.% 2.2.% 2.3.% 2.4.% 2.5.%,$(KERN_VER)),) +@@ -64,6 +62,7 @@ vboxnetflt: vboxdrv + if [ -f vboxdrv/Module.symvers ]; then \ + cp vboxdrv/Module.symvers vboxnetflt; \ + fi; \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetflt/Module.symvers; \ + echo "=== Building 'vboxnetflt' module ==="; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt || exit 1; \ + cp vboxnetflt/vboxnetflt.ko .; \ +@@ -75,41 +74,29 @@ vboxnetadp: vboxdrv + if [ -f vboxdrv/Module.symvers ]; then \ + cp vboxdrv/Module.symvers vboxnetadp; \ + fi; \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetadp/Module.symvers; \ + echo "=== Building 'vboxnetadp' module ==="; \ +- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp || exit 1; \ ++ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp || exit 1; \ + cp vboxnetadp/vboxnetadp.ko .; \ + echo; \ + fi + +-vboxpci: vboxdrv +- @if [ -d vboxpci ]; then \ +- if [ -f vboxdrv/Module.symvers ]; then \ +- cp vboxdrv/Module.symvers vboxpci; \ +- fi; \ +- echo "=== Building 'vboxpci' module ==="; \ +- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci || exit 1; \ +- cp vboxpci/vboxpci.ko .; \ +- echo; \ +- fi +- + install: + @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv install + @if [ -d vboxnetflt ]; then \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetflt/Module.symvers; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt install; \ + fi + @if [ -d vboxnetadp ]; then \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetadp/Module.symvers; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp install; \ + fi +- @if [ -d vboxpci ]; then \ +- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci install; \ +- fi + + else + + vboxdrv: + vboxnetflt: + vboxnetadp: +-vboxpci: + install: + + endif +@@ -122,16 +109,13 @@ clean: + @if [ -d vboxnetadp ]; then \ + $(MAKE) -C vboxnetadp clean; \ + fi +- @if [ -d vboxpci ]; then \ +- $(MAKE) -C vboxpci clean; \ +- fi +- rm -f vboxdrv.ko vboxnetflt.ko vboxnetadp.ko vboxpci.ko ++ rm -f vboxdrv.ko vboxnetflt.ko vboxnetadp.ko + + check: + @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv check + + unload: +- @for module in vboxpci vboxnetadp vboxnetflt vboxdrv; do \ ++ @for module in vboxnetadp vboxnetflt vboxdrv; do \ + if grep "^$$module " /proc/modules >/dev/null; then \ + echo "Removing previously installed $$module module"; \ + /sbin/rmmod $$module; \ +@@ -139,7 +123,7 @@ unload: + done + + load: unload +- @for module in vboxdrv vboxnetflt vboxnetadp vboxpci; do \ ++ @for module in vboxdrv vboxnetflt vboxnetadp; do \ + if test -f $$module.ko; then \ + echo "Installing $$module module"; \ + /sbin/insmod $$module.ko; \ +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/Makefile +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/Makefile ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/Makefile +@@ -24,6 +24,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/ + else # ! KERNELRELEASE + + KBUILD_VERBOSE = ++PWD ?= $(shell pwd) + ifeq ($(KBUILD_VERBOSE),) + VBOX_QUIET := @ + VBOX_QUIET_SH := @ +@@ -49,6 +50,7 @@ vboxsf: vboxguest + if [ -f vboxguest/Module.symvers ]; then \ + cp vboxguest/Module.symvers vboxsf; \ + fi; \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxsf/Module.symvers; \ + echo "=== Building 'vboxsf' module ==="; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxsf/Module.symvers) -C vboxsf || exit 1; \ + if [ -f vboxsf/vboxsf.ko ]; then \ +@@ -64,6 +66,7 @@ vboxvideo: + if [ -f vboxguest/Module.symvers ]; then \ + cp vboxguest/Module.symvers vboxvideo; \ + fi; \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxvideo/Module.symvers; \ + echo "=== Building 'vboxvideo' module ==="; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxvideo/Module.symvers) -C vboxvideo || exit 1; \ + if [ -f vboxvideo/vboxvideo.ko ]; then \ +@@ -77,9 +80,11 @@ vboxvideo: + install: + $(VBOX_QUIET)$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest install + $(VBOX_QUIET_SH)if [ -d vboxsf ]; then \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxsf/Module.symvers; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxsf install; \ + fi + $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxvideo/Module.symvers; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \ + fi + +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.c +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.c +@@ -35,8 +35,18 @@ + #include + #include + #include ++#include + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) ++#include ++#include ++#include ++#include ++#include ++#include ++#else + #include ++#endif + #include + + #include "vbox_drv.h" +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.h +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.h +@@ -103,7 +103,13 @@ + #define S64_MIN ((s64)(-S64_MAX - 1)) + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) ++#include ++#include ++#include ++#else + #include ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75) + #include + #endif +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_fb.c +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_fb.c ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_fb.c +@@ -42,7 +42,19 @@ + #include + #include + ++#include ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#define drm_compat_ioctl NULL ++#else + #include ++#endif + #include + #include + #include +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_mode.c ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c +@@ -45,6 +45,14 @@ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) || defined(RHEL_81) + #include + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) ++#include ++#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) ++#include ++#else ++#include ++#endif + + #include "VBoxVideo.h" + +@@ -398,6 +406,13 @@ static struct drm_encoder *drm_encoder_f + static struct drm_encoder *vbox_best_single_encoder(struct drm_connector + *connector) + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) ++ struct drm_encoder *encoder; ++ ++ /* There is only one encoder per connector */ ++ drm_connector_for_each_possible_encoder(connector, encoder) ++ return encoder; ++#else + int enc_id = connector->encoder_ids[0]; + + /* pick the encoder ids */ +@@ -410,6 +425,7 @@ static struct drm_encoder *vbox_best_sin + #else + return drm_encoder_find(connector->dev, enc_id); + #endif ++#endif + + return NULL; + } +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_ttm.c +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_ttm.c +@@ -34,6 +34,10 @@ + */ + #include "vbox_drv.h" + #include ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) ++#include ++#endif + + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72) + #define PLACEMENT_FLAGS(placement) (placement) +@@ -310,11 +314,12 @@ int vbox_mm_init(struct vbox_private *vb + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) || defined(RHEL_71) + dev->anon_inode->i_mapping, + #endif +-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) +- DRM_FILE_PAGE_OFFSET, true); +-#else +- true); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) ++ bdev->vma_manager, ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) ++ DRM_FILE_PAGE_OFFSET, + #endif ++ true); + if (ret) { + DRM_ERROR("Error initialising bo driver; %d\n", ret); + #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81) +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_irq.c +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_irq.c ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_irq.c +@@ -42,6 +42,10 @@ + #include + #endif + #include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) ++#include ++#include ++#endif + + static void vbox_clear_irq(void) + { + diff --git a/files/series b/files/series --- a/files/series +++ b/files/series @@ -1,3 +1,5 @@ Disable-automatic-check-for-updates.patch 0001-Fix-rdesktop-vrdp-keymaps-path.patch 0001-Patch-out-notify-send-call.patch +virtualbox-fix-ui-background-color.patch +fixes_for_5.5.patch diff --git a/files/virtualbox-fix-ui-background-color.patch b/files/virtualbox-fix-ui-background-color.patch new file mode 100644 --- /dev/null +++ b/files/virtualbox-fix-ui-background-color.patch @@ -0,0 +1,302 @@ +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp +@@ -114,10 +114,6 @@ void UITools::preparePalette() + { + /* Setup palette: */ + setAutoFillBackground(true); +- QPalette pal = palette(); +- QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110); +- pal.setColor(QPalette::Window, bodyColor); +- setPalette(pal); + } + + void UITools::prepareLayout() +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp +@@ -1328,7 +1328,7 @@ void UIVirtualBoxManager::prepareMenuBar + /* Make sure menu-bar fills own solid background: */ + menuBar()->setAutoFillBackground(true); + QPalette pal = menuBar()->palette(); +- const QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(160); ++ const QColor color = pal.color(QPalette::Active, QPalette::Window); + pal.setColor(QPalette::Active, QPalette::Button, color); + menuBar()->setPalette(pal); + } +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp +@@ -121,10 +121,6 @@ void UIChooser::preparePalette() + { + /* Setup palette: */ + setAutoFillBackground(true); +- QPalette pal = palette(); +- QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110); +- pal.setColor(QPalette::Window, bodyColor); +- setPalette(pal); + } + + void UIChooser::prepareLayout() +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp +@@ -902,7 +902,7 @@ void UIChooserItemMachine::paintBackgrou + else + { + /* Prepare color: */ +- QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid); ++ QColor backgroundColor = pal.color(QPalette::Active, QPalette::Button); + /* Draw gradient: */ + QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft()); + bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessMax)); +@@ -931,7 +931,7 @@ void UIChooserItemMachine::paintBackgrou + /* Default background: */ + else + { +- QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid); ++ QColor backgroundColor = pal.color(QPalette::Active, QPalette::Button); + color1 = backgroundColor.lighter(m_iDefaultLightnessMax); + color2 = backgroundColor.lighter(m_iDefaultLightnessMax - 70); + } +@@ -952,7 +952,7 @@ void UIChooserItemMachine::paintBackgrou + /* Default background: */ + else + { +- QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid); ++ QColor backgroundColor = pal.color(QPalette::Active, QPalette::Button); + color1 = backgroundColor.lighter(m_iDefaultLightnessMin); + color2 = backgroundColor.lighter(m_iDefaultLightnessMin - 40); + } +@@ -987,7 +987,7 @@ void UIChooserItemMachine::paintFrame(QP + strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50); + /* Default frame: */ + else +- strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(m_iDefaultLightnessMin); ++ strokeColor = pal.color(QPalette::Active, QPalette::Button).lighter(m_iDefaultLightnessMin); + + /* Create/assign pen: */ + QPen pen(strokeColor); +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp +@@ -710,7 +710,7 @@ void UIToolsItem::paintBackground(QPaint + /* Prepare color: */ + const QColor backgroundColor = isEnabled() + ? pal.color(QPalette::Active, QPalette::Highlight) +- : pal.color(QPalette::Disabled, QPalette::Midlight); ++ : pal.color(QPalette::Disabled, QPalette::Highlight); + /* Draw gradient: */ + QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft()); + bgGrad.setColorAt(0, backgroundColor.lighter(m_iHighlightLightnessMax)); +@@ -749,7 +749,7 @@ void UIToolsItem::paintBackground(QPaint + /* Prepare color: */ + const QColor backgroundColor = isEnabled() + ? pal.color(QPalette::Active, QPalette::Highlight) +- : pal.color(QPalette::Disabled, QPalette::Midlight); ++ : pal.color(QPalette::Disabled, QPalette::Highlight); + /* Draw gradient: */ + QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft()); + bgGrad.setColorAt(0, backgroundColor.lighter(m_iHoverLightnessMax)); +@@ -787,8 +787,8 @@ void UIToolsItem::paintBackground(QPaint + { + /* Prepare color: */ + const QColor backgroundColor = isEnabled() +- ? pal.color(QPalette::Active, QPalette::Mid) +- : pal.color(QPalette::Disabled, QPalette::Midlight); ++ ? pal.color(QPalette::Active, QPalette::Window) ++ : pal.color(QPalette::Disabled, QPalette::Window); + /* Draw gradient: */ + QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft()); + bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessMax)); +@@ -821,7 +821,7 @@ void UIToolsItem::paintFrame(QPainter *p + strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50); + /* Default frame: */ + else +- strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(m_iDefaultLightnessMin); ++ strokeColor = pal.color(QPalette::Active, QPalette::Button).lighter(m_iDefaultLightnessMin); + + /* Create/assign pen: */ + QPen pen(strokeColor); +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp +@@ -314,14 +314,6 @@ void UIVirtualBoxManagerWidget::prepare( + { + /* Configure palette: */ + setAutoFillBackground(true); +- QPalette pal = palette(); +-#ifdef VBOX_WS_MAC +- const QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(145); +-#else +- const QColor color = pal.color(QPalette::Active, QPalette::Mid).lighter(160); +-#endif +- pal.setColor(QPalette::Window, color); +- setPalette(pal); + + /* Prepare: */ + prepareWidgets(); +@@ -449,7 +441,7 @@ void UIVirtualBoxManagerWidget::prepareW + } + + /* Adjust splitter colors according to main widgets it splits: */ +- m_pSplitter->configureColor(palette().color(QPalette::Active, QPalette::Midlight).darker(110)); ++ m_pSplitter->configureColor(palette().color(QPalette::Active, QPalette::Button).darker(110)); + /* Set the initial distribution. The right site is bigger. */ + m_pSplitter->setStretchFactor(0, 2); + m_pSplitter->setStretchFactor(1, 3); +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp +@@ -643,7 +643,7 @@ void UIChooserItem::paintFlatButton(QPai + + /* Prepare colors: */ + const QPalette pal = QApplication::palette(); +- const QColor color = pal.color(QPalette::Active, QPalette::Mid); ++ const QColor color = pal.color(QPalette::Active, QPalette::Button); + + /* Prepare pen: */ + QPen pen; +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp +@@ -245,10 +245,6 @@ void UIChooserView::prepare() + void UIChooserView::preparePalette() + { + /* Setup palette: */ +- QPalette pal = qApp->palette(); +- const QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110); +- pal.setColor(QPalette::Base, bodyColor); +- setPalette(pal); + } + + void UIChooserView::resizeEvent(QResizeEvent *pEvent) +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp +@@ -182,10 +182,6 @@ void UIToolsView::prepare() + void UIToolsView::preparePalette() + { + /* Setup palette: */ +- QPalette pal = qApp->palette(); +- const QColor bodyColor = pal.color(QPalette::Active, QPalette::Midlight).darker(110); +- pal.setColor(QPalette::Base, bodyColor); +- setPalette(pal); + } + + void UIToolsView::resizeEvent(QResizeEvent *pEvent) +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp +@@ -1183,7 +1183,7 @@ void UIDetailsElement::paintBackground(Q + const QPalette pal = palette(); + + /* Paint default background: */ +- const QColor defaultColor = pal.color(QPalette::Active, QPalette::Mid); ++ const QColor defaultColor = pal.color(QPalette::Active, QPalette::Window); + const QColor dcTone1 = defaultColor.lighter(m_iDefaultToneFinal); + const QColor dcTone2 = defaultColor.lighter(m_iDefaultToneStart); + QLinearGradient gradientDefault(fullRect.topLeft(), fullRect.bottomLeft()); +@@ -1224,7 +1224,7 @@ void UIDetailsElement::paintFrame(QPaint + : optionRect; + + /* Paint frame: */ +- const QColor strokeColor = palette().color(QPalette::Active, QPalette::Mid).lighter(m_iDefaultToneStart); ++ const QColor strokeColor = palette().color(QPalette::Active, QPalette::Window).lighter(m_iDefaultToneStart); + QPen pen(strokeColor); + pen.setWidth(0); + pPainter->setPen(pen); +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp +@@ -110,7 +110,7 @@ void UIToolBar::paintEvent(QPaintEvent * + const QRect rectangle = pEvent->rect(); + + /* Prepare gradient: */ +- const QColor backgroundColor = palette().color(QPalette::Active, QPalette::Mid); ++ const QColor backgroundColor = palette().color(QPalette::Active, QPalette::Window); + QLinearGradient gradient(rectangle.topLeft(), rectangle.bottomLeft()); + gradient.setColorAt(0, backgroundColor.lighter(130)); + gradient.setColorAt(1, backgroundColor.lighter(125)); +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp +@@ -700,7 +700,7 @@ void UIDetailsSet::paintBackground(QPain + const QRect optionRect = pOptions->rect; + + /* Paint default background: */ +- const QColor defaultColor = palette().color(QPalette::Active, QPalette::Midlight).darker(110); ++ const QColor defaultColor = palette().color(QPalette::Active, QPalette::Window).darker(110); + pPainter->fillRect(optionRect, defaultColor); + + /* Restore painter: */ +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp +@@ -639,7 +639,7 @@ void UIChooserItemGlobal::paintBackgroun + pPainter->fillRect(rectangle, bgGrad); + #else + /* Prepare color: */ +- QColor backgroundColor = pal.color(QPalette::Active, QPalette::Mid).lighter(160); ++ QColor backgroundColor = pal.color(QPalette::Active, QPalette::Window).lighter(160); + /* Draw gradient: */ + pPainter->fillRect(rectangle, backgroundColor); + #endif +@@ -670,7 +670,7 @@ void UIChooserItemGlobal::paintFrame(QPa + strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50); + /* Default frame: */ + else +- strokeColor = pal.color(QPalette::Active, QPalette::Mid).lighter(m_iDefaultLightnessMin); ++ strokeColor = pal.color(QPalette::Active, QPalette::Window).lighter(m_iDefaultLightnessMin); + + /* Create/assign pen: */ + QPen pen(strokeColor); +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp +@@ -277,7 +277,7 @@ void UIDetailsGroup::paintBackground(QPa + #ifdef VBOX_WS_MAC + const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(145); + #else +- const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(160); ++ const QColor defaultColor = palette().color(QPalette::Active, QPalette::Window).lighter(160); + #endif + pPainter->fillRect(optionRect, defaultColor); + +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp +=================================================================== +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp +@@ -1499,7 +1499,7 @@ void UIChooserItemGroup::paintBackground + const QPalette pal = palette(); + const QColor headerColor = pal.color(QPalette::Active, + model()->selectedItems().contains(this) ? +- QPalette::Highlight : QPalette::Midlight); ++ QPalette::Highlight : QPalette::Button); + + /* Root-item: */ + if (isRoot()) +@@ -1596,7 +1596,7 @@ void UIChooserItemGroup::paintFrame(QPai + const QPalette pal = palette(); + const QColor strokeColor = pal.color(QPalette::Active, + model()->selectedItems().contains(this) ? +- QPalette::Highlight : QPalette::Midlight).darker(headerDarkness() + 10); ++ QPalette::Highlight : QPalette::Button).darker(headerDarkness() + 10); + + /* Create/assign pen: */ + QPen pen(strokeColor); + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : virtualbox version : 6.1.2 -release : 140 +release : 141 source : - https://download.virtualbox.org/virtualbox/6.1.2/VirtualBox-6.1.2.tar.bz2 : 4326576e8428ea3626194fc82646347576e94c61f11d412a669fc8a10c2a1e67 - git|https://github.com/jwrdegoede/vboxsf.git : 5aba938bcabd978e4615186ad7d8617d633e6f30 diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ virtualbox - Joshua Strobl - joshua@stroblindustries.com + Pierre-Yves + pyu@riseup.net GPL-2.0-only virt @@ -23,12 +23,12 @@ virt - virtualbox-common + virtualbox-common - /lib/modules/4.9.210-150.lts/extra/vboxdrv.ko - /lib/modules/4.9.210-150.lts/extra/vboxnetadp.ko - /lib/modules/4.9.210-150.lts/extra/vboxnetflt.ko + /lib/modules/4.9.212-152.lts/extra/vboxdrv.ko + /lib/modules/4.9.212-152.lts/extra/vboxnetadp.ko + /lib/modules/4.9.212-152.lts/extra/vboxnetflt.ko @@ -87,7 +87,7 @@ /usr/lib64/virtualbox/VBoxNetNAT /usr/lib64/virtualbox/VBoxNetNAT.so /usr/lib64/virtualbox/VBoxPython.so - /usr/lib64/virtualbox/VBoxPython3_6m.so + /usr/lib64/virtualbox/VBoxPython3_7m.so /usr/lib64/virtualbox/VBoxRT.so /usr/lib64/virtualbox/VBoxSDL /usr/lib64/virtualbox/VBoxSDL.so @@ -339,12 +339,12 @@ virt - virtualbox-common + virtualbox-common - /lib/modules/5.4.12-142.current/extra/vboxdrv.ko - /lib/modules/5.4.12-142.current/extra/vboxnetadp.ko - /lib/modules/5.4.12-142.current/extra/vboxnetflt.ko + /lib/modules/5.5.1-145.current/extra/vboxdrv.ko + /lib/modules/5.5.1-145.current/extra/vboxnetadp.ko + /lib/modules/5.5.1-145.current/extra/vboxnetflt.ko @@ -356,15 +356,15 @@ programming.devel - virtualbox - virtualbox-common + virtualbox + virtualbox-common - /usr/lib/python3.6/site-packages/vboxapi-1.0-py3.6.egg-info - /usr/lib/python3.6/site-packages/vboxapi/VirtualBox_constants.py - /usr/lib/python3.6/site-packages/vboxapi/__init__.py - /usr/lib/python3.6/site-packages/vboxapi/__pycache__/VirtualBox_constants.cpython-36.pyc - /usr/lib/python3.6/site-packages/vboxapi/__pycache__/__init__.cpython-36.pyc + /usr/lib/python3.7/site-packages/vboxapi-1.0-py3.7.egg-info + /usr/lib/python3.7/site-packages/vboxapi/VirtualBox_constants.py + /usr/lib/python3.7/site-packages/vboxapi/__init__.py + /usr/lib/python3.7/site-packages/vboxapi/__pycache__/VirtualBox_constants.cpython-37.pyc + /usr/lib/python3.7/site-packages/vboxapi/__pycache__/__init__.cpython-37.pyc /usr/lib64/virtualbox/sdk/bindings/VirtualBox.xidl /usr/lib64/virtualbox/sdk/bindings/auth/VBoxAuthPAM.c /usr/lib64/virtualbox/sdk/bindings/auth/VBoxAuthSimple.cpp @@ -809,12 +809,12 @@ virt - virtualbox-guest-common + virtualbox-guest-common - /lib/modules/4.9.210-150.lts/misc/vboxguest.ko - /lib/modules/4.9.210-150.lts/misc/vboxsf.ko - /lib/modules/4.9.210-150.lts/misc/vboxvideo.ko + /lib/modules/4.9.212-152.lts/misc/vboxguest.ko + /lib/modules/4.9.212-152.lts/misc/vboxsf.ko + /lib/modules/4.9.212-152.lts/misc/vboxvideo.ko /sbin/mount.vboxsf @@ -849,19 +849,19 @@ virt - virtualbox-guest-common + virtualbox-guest-common - /lib/modules/5.4.12-142.current/misc/vboxsf.ko + /lib/modules/5.5.1-145.current/misc/vboxsf.ko - - 2020-01-15 + + 2020-02-04 6.1.2 Packaging update - Joshua Strobl - joshua@stroblindustries.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file