commit virtualbox-ose for openSUSE:Factory
Hello community, here is the log from the commit of package virtualbox-ose for openSUSE:Factory checked in at Fri Mar 19 09:40:19 CET 2010. -------- --- virtualbox-ose/virtualbox-ose.changes 2010-02-27 01:02:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2010-03-18 17:06:08.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 18 11:16:17 UTC 2010 - mseben@novell.com + +- added vbox-x_crash.diff to fix X crash caused by guest additions + see:http://www.virtualbox.org/ticket/6198 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- vbox-x_crash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox-ose.spec ++++++ --- /var/tmp/diff_new_pack.of43RX/_old 2010-03-19 09:39:37.000000000 +0100 +++ /var/tmp/diff_new_pack.of43RX/_new 2010-03-19 09:39:37.000000000 +0100 @@ -51,7 +51,7 @@ ExclusiveArch: %ix86 x86_64 %define version_label 3.1.4 Version: 3.1.4 -Release: 3 +Release: 4 Summary: VirtualBox OSE is an Emulator License: GPLv2+ Group: System/Emulators/PC @@ -85,6 +85,8 @@ #fix post build checks, could be dropped when we switch to newer gcc Patch20: vbox-ret-in-nonvoid-fnc.diff Patch21: virtualbox-ose-system-xorg17.patch +#fix issues with guest additions see:http://www.virtualbox.org/ticket/6198 (fix already in upstream SVN) +Patch22: vbox-x_crash.diff # BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils permissions @@ -176,6 +178,7 @@ %patch19 -p1 %patch20 -p1 %patch21 +%patch22 %__cp %{SOURCE7} . %build ++++++ vbox-x_crash.diff ++++++ Index: src/VBox/Additions/linux/drm/vboxvideo_drm.c =================================================================== --- src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 27247) +++ src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 27248) @@ -87,7 +87,13 @@ .owner = THIS_MODULE, .open = drm_open, .release = drm_release, + /* This was changed with Linux 2.6.33 but Fedora backported this + * change to their 2.6.32 kernel. */ +#if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 33) + .unlocked_ioctl = drm_ioctl, +#else .ioctl = drm_ioctl, +#endif .mmap = drm_mmap, .poll = drm_poll, .fasync = drm_fasync, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de