[packages/VirtualBox] up to 6.1.12
atler
atler at pld-linux.org
Thu Jul 16 18:35:50 CEST 2020
commit e267c8351f811ed68ed4b60f6acd80ec01cce8cf
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Jul 16 18:34:59 2020 +0200
up to 6.1.12
- disabled "cloud" feature due to missing source file (CloudGateway.cpp)
VirtualBox.spec | 9 ++++-----
qt5.15.patch | 55 -------------------------------------------------------
2 files changed, 4 insertions(+), 60 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 202be26..73a15de 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -52,14 +52,14 @@ exit 1
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 6.1.10
+Version: 6.1.12
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: GPL v2
Group: Applications/Emulators
Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: b690ab7f2b6c7f9e46eabc101df021ed
+# Source0-md5: 3c351f7fd6376e0bb3c8489505a9450c
Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: abbfda1a505eedbd2bea255fb60bffe6
+# Source1-md5: 8df4a68f37ec84d1b98d0e09ed640ce5
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
@@ -87,7 +87,6 @@ Patch14: %{pname}-multipython.patch
Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
Patch17: qt5-gl.patch
-Patch18: qt5.15.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -552,7 +551,6 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker
%patch15 -p0
%patch16 -p0
%patch17 -p1
-%patch18 -p1
%{__sed} -i -e 's, at VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -617,6 +615,7 @@ VBOX_WITH_TESTSUITE :=
VBOX_WITH_VRDP_RDESKTOP=
VBOX_WITH_MULTIVERSION_PYTHON=0
%{!?with_host:VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1}
+VBOX_WITH_CLOUD_NET=
EOF
%undefine filterout_c
diff --git a/qt5.15.patch b/qt5.15.patch
deleted file mode 100644
index a0eba5d..0000000
--- a/qt5.15.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ur VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
---- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-05-14 14:40:35.000000000 -0400
-+++ VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp 2020-06-03 10:46:06.750776100 -0400
-@@ -17,6 +17,7 @@
-
- /* Qt includes: */
- #include <QPainter>
-+#include <QPainterPath>
-
- /* GUI include */
- #include "UIImageTools.h"
-diff -ur VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
---- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-05-14 14:40:44.000000000 -0400
-+++ VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp 2020-06-03 10:52:50.125585673 -0400
-@@ -19,6 +19,7 @@
- #include <QApplication>
- #include <QHBoxLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyle>
- #include <QToolButton>
-
-diff -ur VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
---- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-05-14 14:40:44.000000000 -0400
-+++ VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp 2020-06-03 10:51:38.560369848 -0400
-@@ -21,6 +21,7 @@
- #include <QMenu>
- #include <QMoveEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStateMachine>
- #include <QStyle>
- #include <QTimer>
-diff -ur VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
---- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-05-14 14:40:44.000000000 -0400
-+++ VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-06-03 10:47:51.348523624 -0400
-@@ -19,6 +19,7 @@
- #include <QApplication>
- #include <QLabel>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QStyle>
- #include <QVBoxLayout>
-diff -ur VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
---- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-05-14 14:40:44.000000000 -0400
-+++ VirtualBox-6.1.8.patched/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-06-03 10:49:01.201695063 -0400
-@@ -24,6 +24,7 @@
- /* Qt includes: */
- #include <QIcon>
- #include <QWidget>
-+#include <QPainterPath>
-
- /* GUI includes: */
- #include "UILibraryDefs.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/e267c8351f811ed68ed4b60f6acd80ec01cce8cf
More information about the pld-cvs-commit
mailing list