commit 849da46a471275fca6ebc5c566287def81048218
Author: Jan Palus <at...@pld-linux.org>
Date: Fri Nov 9 19:18:37 2018 +0100
up to 5.2.22
VirtualBox.spec | 8 +++-----
gcc8.patch | 27 ---------------------------
2 files changed, 3 insertions(+), 32 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index e2e0481..0c7bd49 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -47,14 +47,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: 5.2.20
+Version: 5.2.22
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: ba93e3de1689c5c4048abf17872ef149
+# Source0-md5: c9c2f162ac5f99d28d8c0ca43b19ed01
Source1:
http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 31c8da994293af605be81989af278e9d
+# Source1-md5: 86499eebfff3513e8919d2df32806ec9
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
@@ -82,7 +82,6 @@ Patch14: %{pname}-multipython.patch
Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
Patch17: %{pname}-kerndir.patch
-Patch19: gcc8.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -552,7 +551,6 @@ cd ../..\
%patch15 -p0
%patch16 -p0
%patch17 -p1
-%patch19 -p0
%{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/'
src/VBox/Installer/common/virtualbox.desktop.in
diff --git a/gcc8.patch b/gcc8.patch
deleted file mode 100644
index 9f3d19e..0000000
--- a/gcc8.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-------------------------------------------------------------------------
-r73343 | vboxsync | 2018-07-25 08:39:58 +0200 (śro, 25 lip 2018) | 3 lines
-Changed paths:
- M /trunk/configure
-
-configure: remove the upper version limit in the gcc test and plan to
-blacklist if necessary in future.
-Thank you Gianfranco Costamagna.
-
-Index: configure
-===================================================================
---- configure (revision 73342)
-+++ configure (revision 73343)
-@@ -446,9 +446,8 @@
- # gcc-4.0 is allowed for Darwin only
- elif [ $cc_maj -lt 4 \
- -o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \
-- -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) \
-- -o $cc_maj -gt 7 ]; then
-- log_failure "gcc version $cc_maj.$cc_min found, expected gcc
4.x...7.x"
-+ -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) ];
then
-+ log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x or
later"
- fail really
- else
- log_success "found version $cc_ver"
-
-------------------------------------------------------------------------
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/849da46a471275fca6ebc5c566287def81048218
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
