[Pkg-virtualbox-commits] [virtualbox] 01/01: Add 18-system-xorg again, or part of it

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit 0cdbffcbaf0ea57b82ddd9e955b9107745cdec58
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Oct 19 12:15:37 2017 +0200

    Add 18-system-xorg again, or part of it
---
 debian/changelog                    |  7 +++++++
 debian/patches/18-system-xorg.patch | 18 ++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0489416..922bd36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (5.2.0-dfsg-1~exp2) experimental; urgency=medium
+
+  * Re-add part of 18-system-xorg.patch, this should fix
+    part of the i386 failure
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 19 Oct 2017 12:14:57 +0200
+
 virtualbox (5.2.0-dfsg-1~exp1) experimental; urgency=medium
 
   * New upstream version 5.2.0-dfsg
diff --git a/debian/patches/18-system-xorg.patch b/debian/patches/18-system-xorg.patch
new file mode 100644
index 0000000..0630698
--- /dev/null
+++ b/debian/patches/18-system-xorg.patch
@@ -0,0 +1,18 @@
+Description: Build the X.Org driver only for the selected system X Server version.
+Author: Michael Meskes <meskes at debian.org>, Felix Geyer <fgeyer at debian.org>
+
+diff --git a/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk
+index 8cf43e8fe..6ee1d415e 100644
+--- a/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk
++++ b/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk
+@@ -39,10 +39,6 @@ LIBRARIES += \
+ 	VBoxGuestR3Lib \
+ 	VBoxGuestR3LibShared
+ ifndef VBOX_ONLY_VALIDATIONKIT
+- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
+-  LIBRARIES += \
+-  	VBoxGuestR3LibXFree86
+- endif
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+   LIBRARIES += \
+   	VBoxGuestR3LibXOrg
diff --git a/debian/patches/series b/debian/patches/series
index 4badabe..b9151bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@
 12-make-module.patch
 13-module-mismatch.patch
 16-no-update.patch
+18-system-xorg.patch
 23-remove-invalid-chars-check.patch
 27-hide-host-cache-warning.patch
 28-no-selinux-fedora.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git