[packages/VirtualBox] up to 6.1.8
atler
atler at pld-linux.org
Sun May 17 23:41:41 CEST 2020
commit bb47c3ae4e2b8121dc565357eb20c49d9881d574
Author: Jan Palus <atler at pld-linux.org>
Date: Sun May 17 23:41:25 2020 +0200
up to 6.1.8
VirtualBox.spec | 12 ++++--------
eflags.ac.patch | 13 -------------
x86-guest.patch | 11 -----------
3 files changed, 4 insertions(+), 32 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index b90afa2..e3c44d8 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -47,19 +47,19 @@ exit 1
%define qtver 5.6.0
-%define rel 2
+%define rel 1
%define pname VirtualBox
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.6
+Version: 6.1.8
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: fe6328d22dfb20ea372daa4b58b12374
+# Source0-md5: 17bf20786de812186f607f07ba7fa076
Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: ab8b016b524a4e2190bdd5908d3202c8
+# Source1-md5: 9e4f570698175108bc16415cdc31e280
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
@@ -87,8 +87,6 @@ Patch14: %{pname}-multipython.patch
Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
Patch17: qt5-gl.patch
-Patch18: eflags.ac.patch
-Patch19: x86-guest.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -553,8 +551,6 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker
%patch15 -p0
%patch16 -p0
%patch17 -p1
-%patch18 -p1
-%patch19 -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
diff --git a/eflags.ac.patch b/eflags.ac.patch
deleted file mode 100644
index 3a46115..0000000
--- a/eflags.ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- VirtualBox-6.1.2/src/VBox/HostDrivers/linux/export_modules.sh.orig 2020-02-14 01:33:04.739918751 +0100
-+++ VirtualBox-6.1.2/src/VBox/HostDrivers/linux/export_modules.sh 2020-02-14 01:33:35.779769111 +0100
-@@ -173,8 +173,8 @@
- < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
- else
- sed -e "s;VBOX_WITH_HARDENING;;g" \
-- -e "s;VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV;;g" \
-- -e "s;IPRT_WITH_EFLAGS_AC_PRESERVING;;g" \
-+ -e "s;VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV;;g" \
-+ -e "s;IPRT_WITHOUT_EFLAGS_AC_PRESERVING;;g" \
- < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
- fi
-
diff --git a/x86-guest.patch b/x86-guest.patch
deleted file mode 100644
index 044fe3e..0000000
--- a/x86-guest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- VirtualBox-6.1.6/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp.orig 2020-04-09 19:34:49.000000000 +0200
-+++ VirtualBox-6.1.6/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp 2020-04-17 00:05:01.199999966 +0200
-@@ -293,7 +293,7 @@
- }
- }
-
--int x11MonitorThreadFunction(RTTHREAD hThreadSelf, void *pvUser)
-+DECLCALLBACK(int) x11MonitorThreadFunction(RTTHREAD hThreadSelf, void *pvUser)
- {
- (void)hThreadSelf;
- (void*)pvUser;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/bb47c3ae4e2b8121dc565357eb20c49d9881d574
More information about the pld-cvs-commit
mailing list