Date: Thursday, July 14, 2016 @ 19:49:23 Author: seblu Revision: 182913
upgpkg: virtualbox 5.1.0-1 Added: virtualbox/trunk/virtualbox-guest-dkms.conf virtualbox/trunk/virtualbox-host-dkms.conf Modified: virtualbox/trunk/PKGBUILD Deleted: virtualbox/trunk/010-no-update.patch ----------------------------+ 010-no-update.patch | 99 ------------------------------------------- PKGBUILD | 41 +++++++++++------ virtualbox-guest-dkms.conf | 31 +++++++++++++ virtualbox-host-dkms.conf | 35 +++++++++++++++ 4 files changed, 92 insertions(+), 114 deletions(-) Deleted: 010-no-update.patch =================================================================== --- 010-no-update.patch 2016-07-14 19:15:35 UTC (rev 182912) +++ 010-no-update.patch 2016-07-14 19:49:23 UTC (rev 182913) @@ -1,99 +0,0 @@ -Description: Disable "Check for Updates" action. -Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212 -Author: Daniel Hahler <[email protected]>, Felix Geyer <[email protected]> - -diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp -Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp -=================================================================== ---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp 2015-04-02 15:44:20.879669066 +0200 -+++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp 2015-04-02 15:44:20.879669066 +0200 -@@ -428,6 +428,8 @@ - - void UIUpdateManager::sltForceCheck() - { -+ return; -+ - /* Force call for new version check: */ - sltCheckIfUpdateIsNecessary(true /* force call */); - } -diff a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp -Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp -=================================================================== ---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp -+++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp -@@ -991,7 +991,6 @@ void UIActionPool::preparePool() - m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this); - #ifdef VBOX_GUI_WITH_NETWORK_MANAGER - 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_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this); - m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this); -@@ -1034,8 +1033,6 @@ void UIActionPool::prepareConnections() - #ifdef VBOX_GUI_WITH_NETWORK_MANAGER - 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 */ - connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()), - &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection); -@@ -1110,7 +1107,7 @@ void UIActionPool::updateConfiguration() - if (!fUpdateAllowed) - { - m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::MenuApplicationActionType) -- (m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates); -+ (m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base]); - } - #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ - -diff a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h -Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h -=================================================================== ---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h -+++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h -@@ -62,7 +62,6 @@ enum UIActionIndex - UIActionIndex_M_Application_S_Preferences, - #ifdef VBOX_GUI_WITH_NETWORK_MANAGER - UIActionIndex_M_Application_S_NetworkAccessManager, -- UIActionIndex_M_Application_S_CheckForUpdates, - #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ - UIActionIndex_M_Application_S_ResetWarnings, - UIActionIndex_M_Application_S_Close, -Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -=================================================================== ---- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2015-04-02 15:44:20.879669066 +0200 -+++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2015-04-02 15:44:20.879669066 +0200 -@@ -310,6 +310,10 @@ - #endif /* !VBOX_WITH_NETFLT */ - break; - } -+ case GlobalSettingsPageType_Update: -+ { -+ return false; -+ } - default: - break; - } -diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp -index 752afd4..0438cef 100644 ---- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp -@@ -1211,8 +1211,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu) - /* '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 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu) - # 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)); Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-07-14 19:15:35 UTC (rev 182912) +++ PKGBUILD 2016-07-14 19:49:23 UTC (rev 182913) @@ -10,7 +10,7 @@ 'virtualbox-guest-utils' 'virtualbox-guest-utils-nox' 'virtualbox-ext-vnc') -pkgver=5.0.24 +pkgver=5.1.0 pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' @@ -41,9 +41,12 @@ 'linux-headers' 'mesa' 'python2' - 'qt4' + 'qt5-base' + 'qt5-x11extras' + 'qt5-tools' 'sdl' 'sdl_ttf' + 'sed' 'vde2' 'xalan-c' 'xf86driproto' @@ -50,6 +53,8 @@ 'xorg-server-devel') makedepends_x86_64=('gcc-multilib' 'lib32-glibc') source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"; + 'virtualbox-host-dkms.conf' + 'virtualbox-guest-dkms.conf' 'virtualbox.sysusers' 'virtualbox-guest-utils.sysusers' '60-vboxdrv.rules' @@ -64,9 +69,10 @@ '005-gsoap-build.patch' '006-rdesktop-vrdp-keymap-path.patch' '007-python2-path.patch' - '010-no-update.patch' ) -md5sums=('2701f423f2828cab4405098982f4f446' +md5sums=('81d14a921cf58357b956aaa46ad2ffc5' + 'a19774e8c56f2c4d12c528992525c444' + '331f69783ea9d4e762f7103954c500a3' '984412a63aa9c07ddc3cfd970381d5df' '4833c8e0524fd2272b24ba0d94aef006' '6e2722bfd7013c1b0174382626ac1b8d' @@ -80,8 +86,7 @@ '9e49bbaa2192b141c27ee43cef8cbab7' 'ecfd13297d7753ebe7b8763ca5b792d9' 'd82a6f19be739341ed7f1cf4ee8070ca' - '188ea65918309f737ce28216c2b07c3b' - 'dfa08dc682c7668c8a6f0ffc3f44fece') + '188ea65918309f737ce28216c2b07c3b') prepare() { cd "VirtualBox-$pkgver" @@ -134,7 +139,7 @@ 'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib' 'libxcursor' 'libxinerama' 'libx11' 'libxext' 'libxmu' 'libxt' 'VIRTUALBOX-HOST-MODULES') - optdepends=('qt4: GUI support' + optdepends=('qt5-x11extras: GUI support' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-guest-iso: Guest Additions CD image' 'virtualbox-ext-vnc: VNC server support' @@ -267,10 +272,13 @@ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # module loading - install -Dm644 /dev/null \ - "$pkgdir/usr/lib/modules-load.d/$pkgname.conf" - printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" > \ - "$pkgdir/usr/lib/modules-load.d/$pkgname.conf" + local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf" + install -Dm644 /dev/null "$_p" + printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" > "$_p" + # starting vbox 5.1, dkms.conf file was dropped + local _p="$pkgdir/usr/src/vboxhost-${pkgver}_OSE/dkms.conf" + install -Dm644 "$srcdir/$pkgname.conf" "$_p" + sed -i "s,@VERSION@,$pkgver," "$_p" } package_virtualbox-guest-dkms() { @@ -294,10 +302,13 @@ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # module loading - install -Dm644 /dev/null \ - "$pkgdir/usr/lib/modules-load.d/$pkgname.conf" - printf "vboxguest\nvboxsf\nvboxvideo\n" > \ - "$pkgdir/usr/lib/modules-load.d/$pkgname.conf" + local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf" + install -Dm644 /dev/null "$_p" + printf "vboxguest\nvboxsf\nvboxvideo\n" > "$_p" + # starting vbox 5.1, dkms.conf file was dropped + local _p="$pkgdir/usr/src/vboxguest-${pkgver}_OSE/dkms.conf" + install -Dm644 "$srcdir/$pkgname.conf" "$_p" + sed -i "s,@VERSION@,$pkgver," "$_p" } package_virtualbox-guest-utils() { Added: virtualbox-guest-dkms.conf =================================================================== --- virtualbox-guest-dkms.conf (rev 0) +++ virtualbox-guest-dkms.conf 2016-07-14 19:49:23 UTC (rev 182913) @@ -0,0 +1,31 @@ +## @file +# Linux DKMS config script for the VirtualBox guest kernel modules +# + +# +# Copyright (C) 2006-2015 Oracle Corporation +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + +PACKAGE_NAME="vboxguest" +PACKAGE_VERSION=@VERSION@_OSE +AUTOINSTALL=yes + +BUILT_MODULE_NAME[0]="vboxguest" +BUILT_MODULE_LOCATION[0]="vboxguest" +DEST_MODULE_LOCATION[0]="/kernel/misc" + +BUILT_MODULE_NAME[1]="vboxsf" +BUILT_MODULE_LOCATION[1]="vboxsf" +DEST_MODULE_LOCATION[1]="/kernel/misc" + +BUILT_MODULE_NAME[2]="vboxvideo" +BUILT_MODULE_LOCATION[2]="vboxvideo" +DEST_MODULE_LOCATION[2]="/kernel/misc" Added: virtualbox-host-dkms.conf =================================================================== --- virtualbox-host-dkms.conf (rev 0) +++ virtualbox-host-dkms.conf 2016-07-14 19:49:23 UTC (rev 182913) @@ -0,0 +1,35 @@ +## @file +# Linux DKMS config script for the VirtualBox guest kernel modules +# + +# +# Copyright (C) 2006-2015 Oracle Corporation +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + +PACKAGE_NAME="vboxhost" +PACKAGE_VERSION=@VERSION@_OSE +AUTOINSTALL=yes + +BUILT_MODULE_NAME[0]="vboxdrv" +BUILT_MODULE_LOCATION[0]="vboxdrv" +DEST_MODULE_LOCATION[0]="/kernel/misc" + +BUILT_MODULE_NAME[1]="vboxnetflt" +BUILT_MODULE_LOCATION[1]="vboxnetflt" +DEST_MODULE_LOCATION[1]="/kernel/misc" + +BUILT_MODULE_NAME[2]="vboxnetadp" +BUILT_MODULE_LOCATION[2]="vboxnetadp" +DEST_MODULE_LOCATION[2]="/kernel/misc" + +BUILT_MODULE_NAME[3]="vboxpci" +BUILT_MODULE_LOCATION[3]="vboxpci" +DEST_MODULE_LOCATION[3]="/kernel/misc"
