[VirtualBox] Some improvements based on new virtualbox-guest-additions for Fedora rhbz #1481630 and rfbz #4617

commit d6a941e2451e23fa882577d672740af0b448b098 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Thu Aug 24 18:25:34 2017 +0100 Some improvements based on new virtualbox-guest-additions for Fedora rhbz #1481630 and rfbz #4617 VMSVGA3D from Config.kmk is windows only VBOX_WITH_EXTPACK_VBOXDTRACE fails to build with glibc >= 2.26-2.fc27 VirtualBox-5.0.18-xserver_guest.patch | 4 ++-- VirtualBox.spec | 17 +++++++++++++---- vboxservice.service | 2 -- 3 files changed, 15 insertions(+), 8 deletions(-) --- diff --git a/VirtualBox-5.0.18-xserver_guest.patch b/VirtualBox-5.0.18-xserver_guest.patch index 300f09a..ad226cb 100644 --- a/VirtualBox-5.0.18-xserver_guest.patch +++ b/VirtualBox-5.0.18-xserver_guest.patch @@ -56,13 +56,13 @@ xf86_ansic.h doesn't exist anymore. $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ @@ -81,6 +82,7 @@ if1of ($(KBUILD_TARGET), linux solaris f + $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \ $(VBOX_MESA_INCS) \ $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 - VBoxOGL_DEFS += VBOX_NO_NATIVEGL + endif + VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif - ifdef VBoxOGL_DRI @@ -213,11 +215,15 @@ VBoxOGL_LIBS.win += \ $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB) diff --git a/VirtualBox.spec b/VirtualBox.spec index a47979e..76212ed 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -26,7 +26,7 @@ Name: VirtualBox Version: 5.1.26 #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general-purpose full virtualizer for PC hardware License: GPLv2 or (GPLv2 and CDDL) @@ -57,12 +57,12 @@ Patch26: VirtualBox-4.3.0-no-bundles.patch Patch27: VirtualBox-gcc.patch # from Debian Patch28: 02-gsoap-build-fix.patch +# from RPMFusion Patch35: VirtualBox-5.0.22-guest_soname.patch # from Mageia Patch50: VirtualBox-5.1.0-add-Mageia-support.patch Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch - BuildRequires: kBuild >= 0.1.9998 BuildRequires: SDL-devel xalan-c-devel BuildRequires: openssl-devel @@ -104,8 +104,11 @@ BuildRequires: makeself # for 32bit on 64 %ifarch x86_64 -BuildRequires: libstdc++-static(x86-32) glibc(x86-32) glibc-devel(x86-32) libgcc(x86-32) +BuildRequires: libstdc++-static(x86-32) libgcc(x86-32) BuildRequires: libstdc++-static(x86-64) +BuildRequires: glibc-devel(x86-32) +# Quick fix for https://pagure.io/releng/issue/6958 and https://bugzilla.redhat.com/show_bug.cgi?id=1484849 +BuildRequires: nss-softokn-freebl(x86-32) %else BuildRequires: libstdc++-static %endif @@ -302,9 +305,9 @@ kmk %{_smp_mflags} \ VBOX_PATH_APP_DOCS=%{_docdir}/VirtualBox \ VBOX_WITH_TESTCASES= \ VBOX_WITH_VALIDATIONKIT= \ + VBOX_WITH_EXTPACK_VBOXDTRACE= \ VBOX_WITH_VBOX_IMG=1 \ VBOX_WITH_SYSFS_BY_DEFAULT=1 \ - VBOX_WITH_VMSVGA3D=1 \ VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \ VBOX_USE_SYSTEM_XORG_HEADERS=1 \ %if %{with docs} @@ -746,6 +749,12 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1 %{_datadir}/%{name}-kmod-%{version} %changelog +* Sun Aug 06 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.26-2 +- Some improvements based on new virtualbox-guest-additions for Fedora + rhbz #1481630 and rfbz #4617 +- VMSVGA3D from Config.kmk is windows only +- VBOX_WITH_EXTPACK_VBOXDTRACE fails to build with glibc >= 2.26-2.fc27 + * Thu Jul 27 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.26-1 - Update VBox to 5.1.26 diff --git a/vboxservice.service b/vboxservice.service index 8caa696..e5ca5ec 100644 --- a/vboxservice.service +++ b/vboxservice.service @@ -4,10 +4,8 @@ Description=VirtualBox guest services ConditionVirtualization=|kvm ConditionVirtualization=|oracle - [Service] ExecStart=/usr/sbin/VBoxService -f [Install] WantedBy=multi-user.target -