1
0
forked from pool/virtualbox

Accepting request 227480 from Virtualization

- Add Virtualbox-xserver-1.16.patch: Compatibility with xserver-1.16 (forwarded request 227479 from saschpe)

OBS-URL: https://build.opensuse.org/request/show/227480
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=83
This commit is contained in:
Stephan Kulow 2014-03-26 15:42:01 +00:00 committed by Git OBS Bridge
commit 8adac49924
3 changed files with 36206 additions and 2 deletions

36196
Virtualbox-xserver-1.16.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 24 12:36:47 UTC 2014 - speilicke@suse.com
- Add Virtualbox-xserver-1.16.patch: Compatibility with xserver-1.16
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 3 14:59:27 UTC 2014 - speilicke@suse.com Mon Mar 3 14:59:27 UTC 2014 - speilicke@suse.com

View File

@ -146,6 +146,8 @@ Patch101: vbox-default-os-type.diff
Patch103: vbox-disable-updates.diff Patch103: vbox-disable-updates.diff
#use pie/fPIE for setuid binaries (bnc#743143) #use pie/fPIE for setuid binaries (bnc#743143)
Patch104: vbox-fpie.diff Patch104: vbox-fpie.diff
# PATCH-FIX-UPSTREAM speilicke@suse.com
Patch105: Virtualbox-xserver-1.16.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils permissions PreReq: pwdutils permissions
Requires: %{name}-host-kmp = %version Requires: %{name}-host-kmp = %version
@ -279,6 +281,7 @@ This package contains icons for guest desktop files that were created on the des
%patch101 -p1 %patch101 -p1
%patch103 %patch103
%patch104 -p1 %patch104 -p1
%patch105 -p0
#copy user manual #copy user manual
%__cp %{S:1} UserManual.pdf %__cp %{S:1} UserManual.pdf
#copy kbuild config #copy kbuild config
@ -434,8 +437,8 @@ pushd out/linux.*/release/bin/additions/
# check the patch https://www.virtualbox.org/changeset/38784, regarding the # check the patch https://www.virtualbox.org/changeset/38784, regarding the
# dropped xorg mouse driver in >= 1130 # dropped xorg mouse driver in >= 1130
%if %suse_version > 1310 %if %suse_version >= 1320
%__install -m 755 vboxvideo_drv_115.so \ %__install -m 755 vboxvideo_drv_116.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else %else
%if %suse_version == 1310 %if %suse_version == 1310