Accepting request 58412 from home:mseben:branches:Virtualization
reworked vbox-disable-updates.diff for virtualbox 4.0.0 OBS-URL: https://build.opensuse.org/request/show/58412 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=20
This commit is contained in:
Michal Seben
Git OBS Bridge
parent
dcc81d5a34
commit
438401675b
@ -1,65 +1,44 @@
|
||||
Index: src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp.orig
|
||||
+++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||
@@ -45,7 +45,8 @@ void VBoxGLSettingsUpdate::getFrom (cons
|
||||
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||
@@ -63,7 +63,7 @@ void UIGlobalSettingsUpdate::loadToCache
|
||||
void UIGlobalSettingsUpdate::getFromCache()
|
||||
{
|
||||
VBoxUpdateData data (vboxGlobal().virtualBox().GetExtraData (VBoxDefs::GUI_UpdateDate));
|
||||
|
||||
- mCbCheck->setChecked (!data.isNoNeedToCheck());
|
||||
+ mCbCheck->setChecked (false);
|
||||
+
|
||||
if (mCbCheck->isChecked())
|
||||
/* Apply internal variables data to QWidget(s): */
|
||||
- m_pEnableUpdateCheckbox->setChecked(m_cache.m_fCheckEnabled);
|
||||
+ m_pEnableUpdateCheckbox->setChecked(false);
|
||||
if (m_pEnableUpdateCheckbox->isChecked())
|
||||
{
|
||||
mCbOncePer->setCurrentIndex (data.periodIndex());
|
||||
Index: src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
|
||||
m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex);
|
||||
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp.orig
|
||||
+++ src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
|
||||
@@ -5115,6 +5115,9 @@ void VBoxGlobal::showRegistrationDialog
|
||||
*/
|
||||
void VBoxGlobal::showUpdateDialog (bool aForce)
|
||||
{
|
||||
+ // Disable update dialog for openSUSE
|
||||
+ return;
|
||||
+
|
||||
/* Silently check in one day after current time-stamp */
|
||||
QTimer::singleShot (24 /* hours */ * 60 /* minutes */ *
|
||||
60 /* seconds */ * 1000 /* milliseconds */,
|
||||
Index: src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp.orig 2009-03-13 11:38:50.000000000 +0100
|
||||
+++ src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2009-04-15 17:03:52.000000000 +0200
|
||||
@@ -87,8 +87,8 @@
|
||||
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
|
||||
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
|
||||
@@ -91,8 +91,7 @@ void VBoxHelpActions::addTo (QMenu *aMen
|
||||
#endif
|
||||
|
||||
aMenu->addAction (updateAction);
|
||||
- updateAction->setEnabled (vboxGlobal().virtualBox().
|
||||
- GetExtraData (VBoxDefs::GUI_UpdateDlgWinID).isEmpty());
|
||||
+ updateAction->setDisabled( true );
|
||||
+
|
||||
+ updateAction->setDisabled ( true );
|
||||
|
||||
#ifndef Q_WS_MAC
|
||||
aMenu->addSeparator();
|
||||
Index: src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsUpdate.ui
|
||||
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.ui
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsUpdate.ui.orig
|
||||
+++ src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsUpdate.ui
|
||||
@@ -18,6 +18,9 @@
|
||||
</comment>
|
||||
<class>VBoxGLSettingsUpdate</class>
|
||||
<widget class="QWidget" name="VBoxGLSettingsUpdate" >
|
||||
+ <property name="enabled" >
|
||||
+ <bool>false</bool>
|
||||
+ </property>
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
@@ -48,7 +51,7 @@
|
||||
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.ui
|
||||
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.ui
|
||||
@@ -50,8 +50,11 @@
|
||||
<property name="text">
|
||||
<string>&Check for updates</string>
|
||||
</property>
|
||||
<property name="checked" >
|
||||
- <property name="checked">
|
||||
- <bool>true</bool>
|
||||
+ <property name="enabled" >
|
||||
+ <bool>false</bool>
|
||||
+ </property>
|
||||
+ <property name="checked">
|
||||
+ <bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
|
||||
SUBSYSTEM=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",NAME="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers"
|
||||
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",NAME="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers"
|
||||
#these two lines give access to usb for vboxusers (enable usb support), but could be security risk !! bnc#664520
|
||||
#SUBSYSTEM=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",NAME="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers"
|
||||
#SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{devnum}=="?*", ATTR{busnum}=="?*",NAME="vboxusb/$attr{busnum}/$attr{devnum}", GROUP="vboxusers"
|
||||
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 13 14:34:52 UTC 2011 - mseben@gmail.com
|
||||
Fri Jan 14 21:58:00 UTC 2011 - mseben@gmail.com
|
||||
|
||||
- added new rule to virtualbox-60-vboxdrv.rules to access usb device
|
||||
from vboxusers group
|
||||
- reworked vbox-disable-updates.diff for virtualbox 4.0.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 12 13:29:36 UTC 2011 - mseben@gmail.com
|
||||
|
||||
@ -73,8 +73,6 @@ Source99: %{name}-patch-source.sh
|
||||
#rework init script
|
||||
Patch1: vbox-vboxdrv-init-script.diff
|
||||
Patch2: vbox-vboxadd-init-script.diff
|
||||
#disable update in vbox gui
|
||||
##Patch3: vbox-disable-updates.diff
|
||||
#fix return values which trigger post build checks and coused build error - should goes to upstream
|
||||
Patch4: vbox-ret-in-nonvoid-fnc.diff
|
||||
#fix rpath
|
||||
@ -90,6 +88,8 @@ Patch99: vbox-permissions_warning.diff
|
||||
#PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes build-compare happier
|
||||
Patch100: vbox-no-build-dates.diff
|
||||
Patch101: vbox-default-os-type.diff
|
||||
#disable update in vbox gui
|
||||
Patch102: vbox-disable-updates.diff
|
||||
#
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: pwdutils permissions
|
||||
@ -198,13 +198,13 @@ Development file for %{name}
|
||||
%setup -q -n VirtualBox-%{version}_OSE
|
||||
%patch1
|
||||
%patch2
|
||||
##%patch3
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch99 -p1
|
||||
%patch100
|
||||
%patch101
|
||||
%patch102 -p1
|
||||
#copy user manual
|
||||
%__cp %{S:1} ./UserManual.pdf
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user