From: Jan Palus <jan.palus@gmail.com>
Date: Sat, 30 Nov 2013 12:07:12 +0000 (+0100)
Subject: - up to 4.3.4
X-Git-Tag: auto/th/VirtualBox-4.3.4-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=commitdiff_plain;h=0190f7b9c5d97d6fecb214dc68f4df95c6d4c25a

- up to 4.3.4
---

diff --git a/16-no-update.patch b/16-no-update.patch
index e8487fb..5cd2a04 100644
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -17,23 +17,23 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
 --- 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_WebSite] = new UIActionSimpleWebSite(this);
      m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
 -    m_pool[UIActionIndex_Simple_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_WebSite,
      UIActionIndex_Simple_ResetWarnings,
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      UIActionIndex_Simple_NetworkAccessManager,
 -    UIActionIndex_Simple_CheckForUpdates,
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      UIActionIndex_Simple_About,
  
-     /* Maximum index: */
 --- 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
@@ -46,17 +46,17 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
 -        pMenu->addAction(m_pUpdateAction);
 -    else
 -        m_pUpdateAction->setEnabled(false);
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
  #ifndef Q_WS_MAC
      pMenu->addSeparator();
- #endif /* !Q_WS_MAC */
 @@ -1443,7 +1437,6 @@ void UISelectorWindow::prepareConnection
-     connect(m_pWebAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpWebDialog()));
      connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages()));
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show()));
 -    connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
  
-     /* Status-bar connections: */
 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-dri.patch b/VirtualBox-dri.patch
index 6d914cc..bd237b9 100644
--- a/VirtualBox-dri.patch
+++ b/VirtualBox-dri.patch
@@ -4,7 +4,7 @@
  #  define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
  #  define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
  # else
--#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
+-#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
 -#  define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
 +#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/xorg/modules/dri:/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/x86_64-linux-gnu/dri"
 +#  define DRI_XORG_DRV_DIR "/usr/lib64/xorg/modules/drivers/"
@@ -14,7 +14,7 @@
  #  define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
  #  define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
  # else
--#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
+-#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
 +#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/i386-linux-gnu/dri"
  #  define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
  # endif
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 21be83a..2472acf 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -57,14 +57,14 @@ exit 1
 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.2
+Version:	4.3.4
 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:	bf986354bf7ee3b2e0251af821b33d7c
+# Source0-md5:	065c713bb691929179f1649d5118a340
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5:	80d30f8f16a402faa0436d7f330a2ddd
+# Source1-md5:	528f6af69954a1d12fb1125c466d7948
 Source2:	vboxservice.init
 Source3:	vboxservice.service
 Source4:	%{pname}.sh