initial update to 5.0.0

- updated patches
- configure-spaces.patch no longer needed
- new no-scrextend patch to remove scrextend package ref from
  docbook2latex (not present in PLD)
- new version-error patch to remove awkward #error preprocessor rule for
  seemingly valid scenario
- introduce new bcond all_langs used for enabling all doc translations,
  disable by default as fr_FR manual is incomplete
- provide docbook dtd location which is now required for doc validation
- rel 0.1 but builds and seems to work

diff --git a/16-no-update.patch b/16-no-update.patch
index 5cd2a0407ea18228537b8c99260fbdde6150d0d4..68bd6f64cd898bafb0ac3fa170384833c448ae03 100644 (file)
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -14,49 +14,55 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      /* Force call for new version check: */
      sltCheckIfUpdateIsNecessary(true /* force call */);
  }
---- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
-@@ -538,7 +538,6 @@ void UIActionPool::createActions()
-     m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp.orig 2015-07-09 20:11:53.129742315 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp      2015-07-09 20:12:02.136424394 +0200
+@@ -991,7 +991,6 @@
+     m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this);
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-     m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
--    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
+     m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
+-    m_pool[UIActionIndex_M_Application_S_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-     m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
- }
---- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
-+++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
-@@ -47,7 +47,6 @@ enum UIActionIndex
-     UIActionIndex_Simple_ResetWarnings,
+     m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+     m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
+@@ -1033,8 +1033,6 @@
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-     UIActionIndex_Simple_NetworkAccessManager,
--    UIActionIndex_Simple_CheckForUpdates,
- #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-     UIActionIndex_Simple_About,
- 
---- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1301,12 +1301,6 @@ void UISelectorWindow::prepareMenuHelp(Q
-     pMenu->addSeparator();
-     m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager);
-     pMenu->addAction(m_pNetworkAccessManager);
--    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
--    CVirtualBox vbox = vboxGlobal().virtualBox();
--    if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
--        pMenu->addAction(m_pUpdateAction);
--    else
--        m_pUpdateAction->setEnabled(false);
+     connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), SIGNAL(triggered()),
+             gNetworkManager, SLOT(show()), Qt::UniqueConnection);
+-    connect(action(UIActionIndex_M_Application_S_CheckForUpdates), SIGNAL(triggered()),
+-            gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection);
  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- #ifndef Q_WS_MAC
-     pMenu->addSeparator();
-@@ -1443,7 +1437,6 @@ void UISelectorWindow::prepareConnection
-     connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages()));
+     connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()),
+             &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h.orig   2015-07-09 20:13:36.439757556 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h        2015-07-09 20:13:40.446396985 +0200
+@@ -62,7 +62,6 @@
+     UIActionIndex_M_Application_S_Preferences,
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-     connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show()));
--    connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
+     UIActionIndex_M_Application_S_NetworkAccessManager,
+-    UIActionIndex_M_Application_S_CheckForUpdates,
  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-     connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
- 
+     UIActionIndex_M_Application_S_ResetWarnings,
+     UIActionIndex_M_Application_S_Close,
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/selector/UISelectorWindow.cpp.orig    2015-07-09 20:09:22.239478146 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2015-07-09 20:17:20.635207663 +0200
+@@ -1211,8 +1211,6 @@
+     /* 'About' action goes to Application menu: */
+     pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+-    /* 'Check for Updates' action goes to Application menu: */
+-    pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+     /* 'Network Access Manager' action goes to Application menu: */
+     pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+ # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+@@ -1255,8 +1253,6 @@
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     /* 'Network Access Manager' action goes to 'File' menu: */
+     pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+-    /* 'Check for Updates' action goes to 'File' menu: */
+-    pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+ # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+     /* 'Reset Warnings' action goes 'File' menu: */
+     pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
 diff a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

diff --git a/VirtualBox-configure-spaces.patch b/VirtualBox-configure-spaces.patch
deleted file mode 100644 (file)
index f123e16..0000000
--- a/VirtualBox-configure-spaces.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN VirtualBox-2.0.0.orig/configure VirtualBox-2.0.0/configure
---- VirtualBox-2.0.0.orig/configure    2008-09-04 20:08:30.000000000 +0200
-+++ VirtualBox-2.0.0/configure 2008-09-04 20:10:55.000000000 +0200
-@@ -1738,7 +1738,7 @@
- #
- 
- # scan command line options
--for option in $*; do
-+for option in "$@"; do
-   case "$option" in
-     --help|-help|-h)
-       show_help

diff --git a/VirtualBox-no-scrextend.patch b/VirtualBox-no-scrextend.patch
new file mode 100644 (file)
index 0000000..4965612
--- /dev/null
+++ b/VirtualBox-no-scrextend.patch
@@ -0,0 +1,10 @@
+--- VirtualBox-5.0.0/doc/manual/docbook2latex.xsl.orig 2015-07-09 22:40:10.126159489 +0200
++++ VirtualBox-5.0.0/doc/manual/docbook2latex.xsl      2015-07-09 22:40:24.342836635 +0200
+@@ -117,7 +117,6 @@
+ \usepackage{fancyvrb}
+ \usepackage{alltt}
+ \usepackage{color}
+-\usepackage{scrextend}
+ \definecolor{darkgreen}{rgb}{0,0.6,0}
+ 
+ </xsl:text>

diff --git a/VirtualBox-version-error.patch b/VirtualBox-version-error.patch
new file mode 100644 (file)
index 0000000..601459a
--- /dev/null
+++ b/VirtualBox-version-error.patch
@@ -0,0 +1,10 @@
+--- VirtualBox-5.0.0/include/VBox/version.h.orig       2015-07-09 21:39:54.770845993 +0200
++++ VirtualBox-5.0.0/include/VBox/version.h    2015-07-09 21:40:05.787518864 +0200
+@@ -143,7 +143,6 @@
+ #  define VBOX_RC_MORE_STRINGS          VALUE "PrivateBuild", VBOX_PRIVATE_BUILD_DESC "\0"
+ # else
+ #  define VBOX_RC_MORE_STRINGS          VALUE "PrivateBuild", "r" RT_XSTR(VBOX_SVN_REV) "\0"
+-# error
+ # endif
+ #endif
+ #define VBOX_RC_FILE_FLAGS              (VBOX_RC_FILE_FLAGS_DEBUG | VBOX_RC_FILE_FLAGS_PRERELEASE | VBOX_RC_FILE_FLAGS_BUILD)

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 1511ac0f1634155d931f20f7807b308bee88bc23..65a5c894fae9c12638441d231c64ef3a6c827a8e 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -11,6 +11,7 @@
 # - fix desc for dkms packages (proper wording needed), kernel modules desc is mess as well
 #
 # Conditional build:
+%bcond_with    all_langs       # build with all manual translations
 %bcond_without doc             # don't build the documentation
 %bcond_without debuginfo               # disable debuginfo creation (to save space when compiling)
 %bcond_without kernel          # don't build kernel module
@@ -39,19 +40,19 @@ exit 1
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel             2
+%define                rel             0.1
 %define                pname           VirtualBox
 Summary:       VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       4.3.28
+Version:       5.0.0
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: 53dcfb7d1cf13716410f7a5de6a75fba
+# Source0-md5: 1f43c53b49c50bd7700a86000ca85dda
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: ed0796a1ec2cfc75eae20e3b1211ab73
+# Source1-md5: 8d9f1d600ff65d1230b9b4e386f2ad48
 Source2:       vboxservice.init
 Source3:       vboxservice.service
 Source5:       mount.vdi
@@ -60,7 +61,7 @@ Source7:      %{pname}-virtualbox-host-modules-load.conf
 Source8:       %{pname}-virtualbox-guest-modules-load.conf
 Source9:       vboxautostart.init
 Source10:      autostart.cfg
-Patch0:                %{pname}-configure-spaces.patch
+Patch0:                %{pname}-version-error.patch
 Patch1:                %{pname}-VBoxSysInfo.patch
 Patch2:                %{pname}-warning_workaround.patch
 Patch3:                %{pname}-dri.patch
@@ -74,6 +75,7 @@ Patch10:      16-no-update.patch
 Patch11:       18-system-xorg.patch
 Patch12:       %{pname}-all-translations.patch
 Patch13:       x32.patch
+Patch14:       %{pname}-no-scrextend.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -509,8 +511,11 @@ cd ../..\
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%if %{with all_langs}
 %patch12 -p0
+%endif
 %patch13 -p1
+%patch14 -p1
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
        -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -565,6 +570,7 @@ VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_WITH_ORIGIN :=
 VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
 #VBOX_PATH_APP_DOCS := %{_docdir}/%{pname}-doc-%{version}
+VBOX_PATH_DOCBOOK_DTD := %{_datadir}/sgml/docbook/xml-dtd-4.4
 
 # don't build testcases to save time, they are not needed for the package
 VBOX_WITH_TESTCASES :=
@@ -736,9 +742,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{pname}/src $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{
 
 %if %{with doc}
 ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual.pdf $RPM_BUILD_ROOT%{_libdir}/%{pname}/UserManual.pdf
+%if %{with all_langs}
 ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual_fr_FR.pdf $RPM_BUILD_ROOT%{_libdir}/%{pname}/UserManual_fr_FR.pdf
 %endif
 %endif
+%endif
 
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT{/etc/modules-load.d,/sbin}
@@ -857,13 +865,15 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %attr(755,root,root) %{_bindir}/VBox
 %attr(755,root,root) %{_bindir}/VBoxAutostart
 %attr(755,root,root) %{_bindir}/VBoxBalloonCtrl
+%attr(755,root,root) %{_bindir}/VBoxDTrace
 %attr(755,root,root) %{_bindir}/VBoxHeadless
 %attr(755,root,root) %{_bindir}/VBoxManage
 %attr(755,root,root) %{_bindir}/VBoxSDL
 %attr(755,root,root) %{_bindir}/VBoxTunctl
+%attr(755,root,root) %{_bindir}/vbox-img
 %dir %{_libdir}/%{pname}
 # libraries
-%attr(755,root,root) %{_libdir}/%{pname}/DBGCPlugInDiggers.so
+%attr(755,root,root) %{_libdir}/%{pname}/DbgPlugInDiggers.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxAuth.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxAuthSimple.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDD.so
@@ -910,6 +920,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
 %endif
 %dir %{_libdir}/%{pname}/tools
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTDbgSymCache
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTLdrFlt
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTManifest
@@ -917,25 +928,34 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTShutdown
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTSignTool
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTTar
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTUnzip
+%attr(755,root,root) %{_libdir}/%{pname}/tools/scm
 
 %dir %{_libdir}/%{pname}/ExtensionPacks
 %{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack.xml
 %dir %{_libdir}/%{pname}/ExtensionPacks/VNC
 %dir %{_libdir}/%{pname}/ExtensionPacks/VNC/linux*
 %attr(755,root,root) %{_libdir}/%{pname}/ExtensionPacks/VNC/linux*/VBoxVNC*.so
-
-%{_libdir}/%{pname}/VBoxDD2GC.debug
-%{_libdir}/%{pname}/VBoxDD2GC.gc
+%dir %{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+%{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/ExtPack.xml
+%dir %{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*
+%attr(755,root,root) %{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*/VBoxDTrace*.so
+%{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*/VBoxDTraceR0.debug
+%{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*/VBoxDTraceR0.r0
+
+%{_libdir}/%{pname}/VBoxCpuReport
 %{_libdir}/%{pname}/VBoxDD2R0.debug
 %{_libdir}/%{pname}/VBoxDD2R0.r0
-%{_libdir}/%{pname}/VBoxDDGC.debug
-%{_libdir}/%{pname}/VBoxDDGC.gc
+%{_libdir}/%{pname}/VBoxDD2RC.debug
+%{_libdir}/%{pname}/VBoxDD2RC.rc
+%{_libdir}/%{pname}/VBoxDDRC.debug
+%{_libdir}/%{pname}/VBoxDDRC.rc
 %{_libdir}/%{pname}/VBoxDDR0.debug
 %{_libdir}/%{pname}/VBoxDDR0.r0
 %{_libdir}/%{pname}/VBoxEFI32.fd
 %{_libdir}/%{pname}/VBoxEFI64.fd
-%{_libdir}/%{pname}/VMMGC.debug
-%{_libdir}/%{pname}/VMMGC.gc
+%{_libdir}/%{pname}/VMMRC.debug
+%{_libdir}/%{pname}/VMMRC.rc
 %{_libdir}/%{pname}/VMMR0.debug
 %{_libdir}/%{pname}/VMMR0.r0
 
@@ -1043,11 +1063,15 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %defattr(644,root,root,755)
 # this is a symlink...
 %doc %{_libdir}/%{pname}/UserManual.pdf
+%if %{with all_langs}
 %lang(fr) %doc %{_libdir}/%{pname}/UserManual_fr_FR.pdf
+%endif
 # ..to this file
 %doc %{outdir}/UserManual.pdf
+%if %{with all_langs}
 %lang(fr) %doc %{outdir}/UserManual_fr_FR.pdf
 %endif
+%endif
 
 %files -n xorg-driver-video-vboxvideo
 %defattr(644,root,root,755)

diff --git a/pld-guest.patch b/pld-guest.patch
index c6b464c15924685cdcc5ceed96201407ef279e0c..a4b965a13ce77a5276b68ba2bee65484aa9f3577 100644 (file)
--- a/pld-guest.patch
+++ b/pld-guest.patch
@@ -8,43 +8,32 @@
      { "netbsd", "NetBSD" },
      { "netware", "Netware" },
      { "solaris", "Solaris" },
---- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc~ 2013-04-12 13:37:50.000000000 +0300
-+++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc  2013-05-13 15:51:14.323890458 +0300
+--- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox1.qrc~ 2013-04-12 13:37:50.000000000 +0300
++++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox1.qrc  2013-05-13 15:51:14.323890458 +0300
 @@ -26,6 +26,8 @@
          <file alias="os_netware.png">images/os_netware.png</file>
          <file alias="os_openbsd.png">images/os_openbsd.png</file>
          <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
 +        <file alias="os_pld.png">images/os_pld.png</file>
 +        <file alias="os_pld_64.png">images/os_pld_64.png</file>
-         <file alias="os_oraclesolaris.png">images/os_oraclesolaris.png</file>
-         <file alias="os_oraclesolaris_64.png">images/os_oraclesolaris_64.png</file>
          <file alias="os_opensuse.png">images/os_opensuse.png</file>
---- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp~      2013-04-12 13:37:59.000000000 +0300
-+++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp       2013-05-13 15:51:51.668860824 +0300
-@@ -4445,6 +4445,8 @@
-         {"FreeBSD_64",      ":/os_freebsd_64.png"},
-         {"OpenBSD",         ":/os_openbsd.png"},
-         {"OpenBSD_64",      ":/os_openbsd_64.png"},
-+        {"PLD",             ":/os_pld.png"},
-+        {"PLD_64",          ":/os_pld_64.png"},
-         {"NetBSD",          ":/os_netbsd.png"},
-         {"NetBSD_64",       ":/os_netbsd_64.png"},
-         {"Solaris",         ":/os_solaris.png"},
---- VirtualBox-4.3.8/src/VBox/Main/src-all/Global.cpp~ 2014-02-25 19:09:14.000000000 +0200
-+++ VirtualBox-4.3.8/src/VBox/Main/src-all/Global.cpp  2014-02-28 09:50:05.965655744 +0200
-@@ -245,6 +245,14 @@
+         <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file>
+         <file alias="os_oracle.png">images/os_oracle.png</file>
+--- VirtualBox-5.0.0/src/VBox/Main/src-all/Global.cpp.orig     2015-07-09 20:03:19.222109749 +0200
++++ VirtualBox-5.0.0/src/VBox/Main/src-all/Global.cpp  2015-07-09 20:07:27.142600892 +0200
+@@ -253,6 +253,14 @@
        VBOXOSTYPE_Linux_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
 +    { "Linux",   "Linux",             "PLD",                "PLD Linux (32 bit)",
 +      VBOXOSTYPE_Linux26,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
 +    { "Linux",   "Linux",             "PLD_64",             "PLD Linux (64 bit)",
 +      VBOXOSTYPE_Linux26_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       896,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-     { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier (32 bit)",
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+     { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier (32-bit)",
        VBOXOSTYPE_Solaris,         VBOXOSHINT_NONE,
         768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 --- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp~       2014-02-25 19:09:15.000000000 +0200
@@ -80,3 +69,14 @@
      { QRegExp("Knoppix",                           Qt::CaseInsensitive), "Linux26" },
      { QRegExp("Dsl",                               Qt::CaseInsensitive), "Linux24" },
      { QRegExp("((Lin)|(lnx)).*2.?2",               Qt::CaseInsensitive), "Linux22" },
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig   2015-07-09 20:00:01.339965485 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp        2015-07-09 20:00:40.670058835 +0200
+@@ -332,6 +332,8 @@
+     m_guestOSTypeIconNames.insert("FreeBSD_64",      ":/os_freebsd_64.png");
+     m_guestOSTypeIconNames.insert("OpenBSD",         ":/os_openbsd.png");
+     m_guestOSTypeIconNames.insert("OpenBSD_64",      ":/os_openbsd_64.png");
++    m_guestOSTypeIconNames.insert("PLD",             ":/os_pld.png");
++    m_guestOSTypeIconNames.insert("PLD_64",          ":/os_pld_64.png");
+     m_guestOSTypeIconNames.insert("NetBSD",          ":/os_netbsd.png");
+     m_guestOSTypeIconNames.insert("NetBSD_64",       ":/os_netbsd_64.png");
+     m_guestOSTypeIconNames.insert("Solaris",         ":/os_solaris.png");