From 77d132861642f7e7f57b02ebf4eba78daee584a5bce1dc9e3a69243b47d32360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 11 Jul 2015 11:43:54 +0000 Subject: [PATCH] - Version bump to 5.0.0: * Major bump from 4 series with tons of changes. * Read upstream changelog for in-depth informations - Obsoleted patches: * gcc5-support.patch * gcc51-support.patch - Refreshed patches: * gcc5-real-support.patch * vbox-disable-updates.diff * virtualbox-system-x.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=206 --- UserManual.pdf | 4 +-- VirtualBox-4.3.28-patched.tar.bz2 | 3 --- VirtualBox-5.0.0-patched.tar.bz2 | 3 +++ gcc5-real-support.patch | 21 +++++++--------- gcc5-support.patch | 16 ------------ gcc51-support.patch | 16 ------------ vbox-disable-updates.diff | 29 +++++++++++----------- virtualbox-system-x.patch | 41 ++++++++++++++----------------- virtualbox.changes | 14 +++++++++++ virtualbox.spec | 15 +++++------ 10 files changed, 66 insertions(+), 96 deletions(-) delete mode 100644 VirtualBox-4.3.28-patched.tar.bz2 create mode 100644 VirtualBox-5.0.0-patched.tar.bz2 delete mode 100644 gcc5-support.patch delete mode 100644 gcc51-support.patch diff --git a/UserManual.pdf b/UserManual.pdf index 7efd6ce..5962ffa 100644 --- a/UserManual.pdf +++ b/UserManual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8756f3cfdc4b3e0d5eb10c13271d62e0489a5fc3beecbf31084b73ad66c6a2cc -size 6314596 +oid sha256:26951845eebbee76a4a62b28687e74ad318ba1e790d1d8486cb8b37cf04d3cd0 +size 3446131 diff --git a/VirtualBox-4.3.28-patched.tar.bz2 b/VirtualBox-4.3.28-patched.tar.bz2 deleted file mode 100644 index f296461..0000000 --- a/VirtualBox-4.3.28-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:460211302e71885b376338b2cffb61f5fc274b681424b9a7427eaa6836d7d9a9 -size 74638986 diff --git a/VirtualBox-5.0.0-patched.tar.bz2 b/VirtualBox-5.0.0-patched.tar.bz2 new file mode 100644 index 0000000..abe6612 --- /dev/null +++ b/VirtualBox-5.0.0-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9de1c7b7a4a0dc28aa61960e3f15c3f094d9a0e7c86c7fb5c0bb3baf81cf9fa +size 75420734 diff --git a/gcc5-real-support.patch b/gcc5-real-support.patch index f4dbb73..abea36b 100644 --- a/gcc5-real-support.patch +++ b/gcc5-real-support.patch @@ -1,22 +1,19 @@ ---- - Config.kmk | 2 +- - configure | 9 +++++++-- - 2 files changed, 8 insertions(+), 3 deletions(-) - ---- a/Config.kmk -+++ b/Config.kmk -@@ -2292,7 +2292,7 @@ else +diff -urN VirtualBox-5.0.0.old/Config.kmk VirtualBox-5.0.0/Config.kmk +--- VirtualBox-5.0.0.old/Config.kmk 2015-07-11 13:17:27.273698360 +0200 ++++ VirtualBox-5.0.0/Config.kmk 2015-07-11 13:36:31.958812088 +0200 +@@ -2344,7 +2344,7 @@ # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)). # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`. VBOX_GCC_VERSION = $(shell \ - $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, \2), $$(firstword \3 0))|' ) -+ $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' ) ++ $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' ) endif # Find MinGW cross compilers for EFI on non-windows systems. We need to probe ---- a/configure -+++ b/configure -@@ -409,8 +409,13 @@ check_gcc() +diff -urN VirtualBox-5.0.0.old/configure VirtualBox-5.0.0/configure +--- VirtualBox-5.0.0.old/configure 2015-07-11 13:17:27.273698360 +0200 ++++ VirtualBox-5.0.0/configure 2015-07-11 13:37:30.457915488 +0200 +@@ -410,8 +410,13 @@ log_failure "cannot execute '$CXX -dumpversion'" fail really fi diff --git a/gcc5-support.patch b/gcc5-support.patch deleted file mode 100644 index 282c2df..0000000 --- a/gcc5-support.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: configure -=================================================================== ---- configure (revision 55371) -+++ configure (revision 55372) -@@ -422,8 +422,9 @@ - -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ - -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ - -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \ -- -o $cc_maj -gt 4 ]; then -- log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 01 or gcc 4.x with 01 or gcc 4.x with 01 or gcc 4.x with 0isChecked()) { m_pComboBoxUpdatePeriod->setCurrentIndex(m_cache.m_periodIndex); -Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -=================================================================== ---- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig -+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -@@ -359,15 +359,6 @@ UISettingsDialogGlobal::UISettingsDialog +diff -urN VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +--- VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2015-07-11 13:17:27.885699492 +0200 ++++ VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2015-07-11 13:23:13.230338850 +0200 +@@ -106,16 +106,6 @@ + iPageIndex, "#input", pSettingsPage); break; } - #ifdef VBOX_GUI_WITH_NETWORK_MANAGER +-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER - /* Update page: */ - case GlobalSettingsPageType_Update: - { - pSettingsPage = new UIGlobalSettingsUpdate; -- addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png", -- ":/refresh_16px.png", ":/refresh_disabled_16px.png", +- addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png", - iPageIndex, "#update", pSettingsPage); - break; - } - #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ +-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ /* Language page: */ case GlobalSettingsPageType_Language: -@@ -498,8 +489,6 @@ void UISettingsDialogGlobal::retranslate + { +@@ -254,8 +244,6 @@ m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input")); #ifdef VBOX_GUI_WITH_NETWORK_MANAGER diff --git a/virtualbox-system-x.patch b/virtualbox-system-x.patch index c93b529..7c4cf93 100644 --- a/virtualbox-system-x.patch +++ b/virtualbox-system-x.patch @@ -1,24 +1,7 @@ -Description: Build the X.Org driver only for the selected system X Server version. -Author: Michael Meskes , Felix Geyer - -Index: virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -=================================================================== ---- virtualbox.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500 -+++ virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-11-19 04:36:33.913630598 -0500 -@@ -40,8 +40,6 @@ - VBoxGuestR3LibShared - ifndef VBOX_ONLY_TESTSUITE - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) -- LIBRARIES += \ -- VBoxGuestR3LibXFree86 - endif - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) - LIBRARIES += \ -Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk -=================================================================== ---- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500 -+++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500 -@@ -74,18 +74,12 @@ +diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-5.0.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk +--- VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-07-11 13:17:27.581698930 +0200 ++++ VirtualBox-5.0.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-07-11 13:19:09.146886862 +0200 +@@ -67,18 +67,12 @@ VBoxOGL_INCS = . if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_INCS += \ @@ -42,8 +25,8 @@ Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif -@@ -215,10 +209,10 @@ - $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) +@@ -213,10 +207,10 @@ + if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_LIBS += \ - $(PATH_STAGE_LIB)/libXcomposite.so \ @@ -57,3 +40,15 @@ Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk ifdef VBoxOGL_FAKEDRI ifeq ($(KBUILD_TARGET), freebsd) VBoxOGL_LIBS += \ +diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-5.0.0/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +--- VirtualBox-5.0.0.old/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2015-07-11 13:17:27.580698928 +0200 ++++ VirtualBox-5.0.0/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2015-07-11 13:19:09.146886862 +0200 +@@ -40,8 +40,6 @@ + VBoxGuestR3LibShared + ifndef VBOX_ONLY_VALIDATIONKIT + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) +- LIBRARIES += \ +- VBoxGuestR3LibXFree86 + endif + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) + LIBRARIES += \ diff --git a/virtualbox.changes b/virtualbox.changes index c0afd2f..fe6edbf 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Jul 11 11:41:26 UTC 2015 - tchvatal@suse.com + +- Version bump to 5.0.0: + * Major bump from 4 series with tons of changes. + * Read upstream changelog for in-depth informations +- Obsoleted patches: + * gcc5-support.patch + * gcc51-support.patch +- Refreshed patches: + * gcc5-real-support.patch + * vbox-disable-updates.diff + * virtualbox-system-x.patch + ------------------------------------------------------------------- Mon Jul 6 09:19:54 UTC 2015 - alarrosa@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index d433285..bdb6b78 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,7 +1,7 @@ # # spec file for package virtualbox # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir %{_libexecdir}/udev/rules.d Name: virtualbox -Version: 4.3.28 +Version: 5.0.0 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0+ @@ -75,9 +75,8 @@ Patch103: vbox-disable-updates.diff Patch104: vbox-fpie.diff #smap issues on Haswell or Broadwell (boo#931461) Patch105: smap.diff -Patch106: gcc5-support.patch -Patch107: gcc51-support.patch -Patch108: gcc5-real-support.patch +# Patch to build with Factory gcc5 +Patch106: gcc5-real-support.patch BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel BuildRequires: acpica @@ -298,12 +297,10 @@ This package contains icons for guest desktop files that were created on the des %patch99 -p1 %patch100 %patch101 -p1 -%patch103 +%patch103 -p1 %patch104 -p1 %patch105 -p1 -%patch106 -%patch107 -%patch108 -p1 +%patch106 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf #copy kbuild config