[VirtualBox] Join 2 patches in one and stop building vboxvideo_drv.so

[Sérgio M. Basto]

commit 4dac8c3662aa604ae4345a8072524e58bb517c60
Author: Sérgio M. Basto <sergio at serjux.com>
Date:   Tue Oct 11 14:30:24 2016 +0100

    Join 2 patches in one and stop building vboxvideo_drv.so
    
    vboxvideo_drv.so is not used since 5.0.18 and vboxvideo_drv.so doesn't build
    with X.Org version 1.19, so simple skip vboxvideo_drv.so from the build to fix
    all package build.
    VirtualBox-4.3.0-VBoxGuestLib.patch moved into
    VirtualBox-4.3.10-xserver_guest.patch and rename to
    VirtualBox-5.0.18-xserver_guest.patch

 VirtualBox-4.3.0-VBoxGuestLib.patch                | 16 -------------
 ....patch => VirtualBox-5.0.18-xserver_guest.patch | 26 ++++++++++++++++++++++
 VirtualBox.spec                                    | 11 ++++-----
 3 files changed, 32 insertions(+), 21 deletions(-)
---
diff --git a/VirtualBox-4.3.10-xserver_guest.patch b/VirtualBox-5.0.18-xserver_guest.patch
similarity index 54%
rename from VirtualBox-4.3.10-xserver_guest.patch
rename to VirtualBox-5.0.18-xserver_guest.patch
index 7e107d6..72c0b93 100644
--- a/VirtualBox-4.3.10-xserver_guest.patch
+++ b/VirtualBox-5.0.18-xserver_guest.patch
@@ -1,3 +1,4 @@
+We also should use VBOX_USE_SYSTEM_XORG_HEADERS here:
 Just compile with X11 system source and we may remove bundle X11 source code.
 
 --- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa	2012-09-13 09:26:18.000000000 +0100
@@ -41,3 +42,28 @@ Just compile with X11 system source and we may remove bundle X11 source code.
   ifdef VBoxOGL_FAKEDRI
    ifeq ($(KBUILD_TARGET), freebsd)
      VBoxOGL_LIBS += \
+--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig	2014-10-11 13:03:35.000000000 +0100
++++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2014-10-12 00:11:00.925507543 +0100
+@@ -40,9 +40,11 @@ LIBRARIES += \
+ 	VBoxGuestR3LibShared
+ ifndef VBOX_ONLY_VALIDATIONKIT
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
++ ifndef VBOX_USE_SYSTEM_XORG_HEADERS
+   LIBRARIES += \
+   	VBoxGuestR3LibXFree86
+  endif
++ endif
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+   LIBRARIES += \
+   	VBoxGuestR3LibXOrg
+--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2016-10-11 02:49:23.184986182 +0100
++++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2016-10-11 02:49:39.879176964 +0100
+@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
+ 
+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
+- DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
++ DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS))
+  SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
+  vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+  vboxvideo_drv_system_CFLAGS := \
diff --git a/VirtualBox.spec b/VirtualBox.spec
index d82249f..be7f73b 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -15,7 +15,7 @@
 %global prereltag %{?prerel:-%(awk 'BEGIN {print toupper("%{prerel}")}')}
 
 %bcond_without webservice
-%if 0%{?rhel}
+%if 0%{?rhel} || 0%{?fedora} > 25
     %bcond_with docs
 %else
     %bcond_without docs
@@ -44,14 +44,13 @@ Patch1:     VirtualBox-OSE-4.1.4-noupdate.patch
 Patch2:     VirtualBox-5.1.0-strings.patch
 Patch18:    VirtualBox-OSE-4.0.2-aiobug.patch
 Patch22:    VirtualBox-OSE-4.1.12-gsoap.patch
-Patch23:    VirtualBox-4.3.10-xserver_guest.patch
-Patch24:    VirtualBox-4.3.0-VBoxGuestLib.patch
+Patch23:    VirtualBox-5.0.18-xserver_guest.patch
 Patch26:    VirtualBox-4.3.0-no-bundles.patch
 Patch27:    VirtualBox-gcc.patch
 # from Debian
 Patch28:    02-gsoap-build-fix.patch
 Patch29:    29-fix-ftbfs-as-needed.patch
-# Patch34 just applied to Fedora 25+
+# glibc is just applied to Fedora 25+ but Oracle opt by another fix
 Patch34:    VirtualBox-5.0.16-glibc.patch
 Patch35:    VirtualBox-5.0.22-guest_soname.patch
 Patch37:    smap.diff
@@ -265,7 +264,6 @@ rm -r src/libs/zlib-1.2.8/
 %patch22 -p1 -b .gsoap
 %endif
 %patch23 -p1 -b .xserver_guest
-%patch24 -p1 -b .guestlib
 %patch26 -p1 -b .nobundles
 #patch27 -p1 -b .gcc
 %if 0%{?fedora} > 20
@@ -300,6 +298,7 @@ sed -i 's/\r//' COPYING
 #--disable-java
 #--disable-xpcom
 . ./env.sh
+umask 0022
 
 #TODO fix publisher in copr
 %global publisher _%{?vendor:%(echo "%{vendor}" | \
@@ -762,6 +761,8 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
   expect). Also is more simple deal with dependencies.
 - Add vboxpci to rmmod instructions.
 - Remove one line that belongs to akmods process.
+- Just building kernel driver for X.Org Server fix building with X.Org Server
+  1.19 (guest-additions).
 
 * Thu Sep 15 2016 Sérgio Basto <sergio at serjux.com> - 5.1.6-2
 - Packaging:Scriptlets review Systemd, Icon Cache, mimeinfo and desktop-database