[arch-commits] Commit in virtualbox/trunk (7 files)
Sébastien Luttringer
seblu at archlinux.org
Tue Jul 21 22:28:36 UTC 2015
Date: Wednesday, July 22, 2015 @ 00:28:34
Author: seblu
Revision: 137237
upgpkg: virtualbox 5.0.0-1
Added:
virtualbox/trunk/010-no-update.patch
Modified:
virtualbox/trunk/003-ogl-include-path.patch
virtualbox/trunk/LocalConfig.kmk
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/004-xorg.patch
virtualbox/trunk/008-root-window.patch
virtualbox/trunk/009-fix-smap-crash.patch
----------------------------+
003-ogl-include-path.patch | 23 +++-
004-xorg.patch | 217 -------------------------------------------
008-root-window.patch | 19 ---
009-fix-smap-crash.patch | 107 ---------------------
010-no-update.patch | 99 +++++++++++++++++++
LocalConfig.kmk | 23 ++--
PKGBUILD | 31 ++----
7 files changed, 147 insertions(+), 372 deletions(-)
Modified: 003-ogl-include-path.patch
===================================================================
--- 003-ogl-include-path.patch 2015-07-21 20:08:00 UTC (rev 137236)
+++ 003-ogl-include-path.patch 2015-07-21 22:28:34 UTC (rev 137237)
@@ -1,6 +1,8 @@
---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:55:28.774951223 +0000
-+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:58:06.337193736 +0000
-@@ -63,18 +63,12 @@
+Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
++++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
+@@ -67,18 +67,12 @@
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_INCS += \
@@ -24,3 +26,18 @@
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
+@@ -213,10 +207,10 @@
+
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+ VBoxOGL_LIBS += \
+- $(PATH_STAGE_LIB)/libXcomposite.so \
+- $(PATH_STAGE_LIB)/libXdamage.so \
+- $(PATH_STAGE_LIB)/libXfixes.so \
+- $(PATH_STAGE_LIB)/libXext.so
++ Xcomposite \
++ Xdamage \
++ Xfixes \
++ Xext
+ ifdef VBoxOGL_FAKEDRI
+ ifeq ($(KBUILD_TARGET), freebsd)
+ VBoxOGL_LIBS += \
Deleted: 004-xorg.patch
===================================================================
--- 004-xorg.patch 2015-07-21 20:08:00 UTC (rev 137236)
+++ 004-xorg.patch 2015-07-21 22:28:34 UTC (rev 137237)
@@ -1,217 +0,0 @@
---- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.km 2013-09-04 21:03:47.334749420 +0200
-+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-10-21 00:06:36.418245968 +0200
-@@ -40,8 +40,8 @@
- VBoxGuestR3LibShared
- ifndef VBOX_ONLY_TESTSUITE
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
-- LIBRARIES += \
-- VBoxGuestR3LibXFree86
-+# LIBRARIES += \
-+# VBoxGuestR3LibXFree86
- endif
- endif
- LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
-
---- a/src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000
-+++ b/src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
-@@ -17,6 +17,10 @@
- SUB_DEPTH = ../../../..
- include $(KBUILD_PATH)/subheader.kmk
-
-+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111)
-+ XSERVER_VERSION := 17
-+endif
-+
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
- include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
-
---- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:55:28.818284256 +0000
-+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
-@@ -29,7 +29,6 @@
- # vboxmouse_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxmouse_drv
- vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxmouse_drv_DEFS.linux = linux
- vboxmouse_drv_DEFS.x86 += __i386__
-@@ -69,7 +68,6 @@
- #
- # vboxmouse_drv_70
- #
--DLLS += vboxmouse_drv_70
- vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_70_DEFS = \
- XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
-@@ -85,7 +83,6 @@
- #
- # vboxmouse_drv_71
- #
--DLLS += vboxmouse_drv_71
- vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_71_INCS := \
-@@ -100,7 +97,6 @@
- #
- # vboxmouse_drv_13
- #
--DLLS += vboxmouse_drv_13
- vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_13_INCS := \
-@@ -114,7 +110,6 @@
- #
- # vboxmouse_drv_14
- #
--DLLS += vboxmouse_drv_14
- vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_14_INCS := \
-@@ -128,7 +123,6 @@
- #
- # vboxmouse_drv_15
- #
--DLLS += vboxmouse_drv_15
- vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_15_INCS := \
-@@ -142,7 +136,6 @@
- #
- # vboxmouse_drv_16
- #
--DLLS += vboxmouse_drv_16
- vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_16_INCS := \
-
---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000
-+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
-@@ -53,7 +53,6 @@
- # vboxvideo_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxvideo_drv
- endif # target linux
- vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxvideo_drv_DEFS.linux = linux
-@@ -128,7 +127,6 @@
- # base keywords instead of using .solaris or .linux.
- # Also it is *important* to use := and not = when deriving a property.
- #
--DLLS += vboxvideo_drv_70
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- if1of ($(KBUILD_TARGET), linux)
- vboxvideo_drv_70_CFLAGS += \
-@@ -149,7 +147,6 @@
- #
- # vboxvideo_drv_71
- #
--DLLS += vboxvideo_drv_71
- vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
-@@ -164,7 +161,6 @@
- #
- # vboxvideo_drv_13
- #
--DLLS += vboxvideo_drv_13
- vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
-@@ -178,7 +174,6 @@
- #
- # vboxvideo_drv_14
- #
--DLLS += vboxvideo_drv_14
- vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
-@@ -192,7 +187,6 @@
- #
- # vboxvideo_drv_15
- #
--DLLS += vboxvideo_drv_15
- vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
-@@ -213,7 +207,6 @@
- #
- # vboxvideo_drv_16
- #
--DLLS += vboxvideo_drv_16
- vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
-@@ -227,7 +220,6 @@
- #
- # vboxvideo_drv_17
- #
--DLLS += vboxvideo_drv_17
- vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
-@@ -241,7 +233,6 @@
- #
- # vboxvideo_drv_18
- #
--DLLS += vboxvideo_drv_18
- vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
-@@ -255,7 +246,6 @@
- #
- # vboxvideo_drv_19
- #
--DLLS += vboxvideo_drv_19
- vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
-@@ -269,7 +259,6 @@
- #
- # vboxvideo_drv_110
- #
--DLLS += vboxvideo_drv_110
- vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
-@@ -283,7 +272,6 @@
- #
- # vboxvideo_drv_111
- #
--DLLS += vboxvideo_drv_111
- vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
-@@ -297,7 +285,6 @@
- #
- # vboxvideo_drv_112
- #
--DLLS += vboxvideo_drv_112
- vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
-@@ -341,6 +328,23 @@
- endif
-
-
-+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
-+ /usr/include/xorg \
-+ /usr/include/x11 \
-+ /usr/include/pixman-1 \
-+ /usr/include/X11/dri \
-+ /usr/include/drm \
-+ /usr/include/libdrm
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
-+
-+# required for lenny backports
-+ifeq ($(XSERVER_VERSION),14)
-+ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
-+endif
-+
-+
- # Check the undefined symbols in the X.Org modules against lists of allowed
- # symbols. Not very elegant, but it will catch problems early.
-
Deleted: 008-root-window.patch
===================================================================
--- 008-root-window.patch 2015-07-21 20:08:00 UTC (rev 137236)
+++ 008-root-window.patch 2015-07-21 22:28:34 UTC (rev 137237)
@@ -1,19 +0,0 @@
---- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2015-03-04 00:38:45.381480285 +0100
-+++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2015-03-04 00:40:57.536942966 +0100
-@@ -130,15 +130,7 @@
- #define VBOX_MAX_DRAWABLES 256 /* At random. */
-
- #define VBOXPTR(p) ((VBOXPtr)((p)->driverPrivate))
--
--/** Helper to work round different ways of getting the root window in different
-- * server versions. */
--#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 70000000 \
-- && XORG_VERSION_CURRENT >= 10900000
--# define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root
--#else
--# define ROOT_WINDOW(pScrn) WindowTable[(pScrn)->scrnIndex]
--#endif
-+#define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root
-
- /** Structure containing all virtual monitor-specific information. */
- struct VBoxScreen
Deleted: 009-fix-smap-crash.patch
===================================================================
--- 009-fix-smap-crash.patch 2015-07-21 20:08:00 UTC (rev 137236)
+++ 009-fix-smap-crash.patch 2015-07-21 22:28:34 UTC (rev 137237)
@@ -1,107 +0,0 @@
-# https://www.virtualbox.org/ticket/13961
-
---- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2015-03-20 15:24:13.000000000 +0100
-+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2015-03-20 15:23:51.000000000 +0100
-@@ -48,12 +48,6 @@
- # include <iprt/power.h>
- # define VBOX_WITH_SUSPEND_NOTIFICATION
- #endif
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
--# include <asm/smap.h>
--#else
--static inline void clac(void) { }
--static inline void stac(void) { }
--#endif
-
- #include <linux/sched.h>
- #ifdef CONFIG_DEVFS_FS
---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2015-03-20 15:24:13.000000000 +0100
-+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2015-03-20 15:23:52.000000000 +0100
-@@ -145,6 +145,13 @@
- # include <asm/tlbflush.h>
- #endif
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
-+# include <asm/smap.h>
-+#else
-+static inline void clac(void) { }
-+static inline void stac(void) { }
-+#endif
-+
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
- # ifndef page_to_pfn
- # define page_to_pfn(page) ((page) - mem_map)
---- a/src/VBox/Runtime/r0drv/linux/threadctxhooks-r0drv-linux.c 2015-03-20 15:24:13.000000000 +0100
-+++ b/src/VBox/Runtime/r0drv/linux/threadctxhooks-r0drv-linux.c 2015-03-20 15:23:52.000000000 +0100
-@@ -36,6 +36,9 @@
- #include <iprt/thread.h>
- #include <iprt/err.h>
- #include <iprt/asm.h>
-+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-+# include <iprt/asm-amd64-x86.h>
-+#endif
- #include "internal/thread.h"
-
- /*
-@@ -68,6 +71,11 @@
- struct preempt_ops hPreemptOps;
- /** The reference count for this object. */
- uint32_t volatile cRefs;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 19) && defined(RT_ARCH_AMD64)
-+ /** Starting with 3.1.19, the linux kernel doesn't restore kernel RFLAGS during
-+ * task switch, so we have to do that ourselves. (x86 code is not affected.) */
-+ RTCCUINTREG fSavedRFlags;
-+#endif
- } RTTHREADCTXINT, *PRTTHREADCTXINT;
-
-
-@@ -84,12 +92,24 @@
- static void rtThreadCtxHooksLnxSchedOut(struct preempt_notifier *pPreemptNotifier, struct task_struct *pNext)
- {
- PRTTHREADCTXINT pThis = RT_FROM_MEMBER(pPreemptNotifier, RTTHREADCTXINT, hPreemptNotifier);
-+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-+ RTCCUINTREG fSavedEFlags = ASMGetFlags();
-+ stac();
-+#endif
-+
- AssertPtr(pThis);
- AssertPtr(pThis->pfnThreadCtxHook);
- Assert(pThis->fRegistered);
- Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
-
- pThis->pfnThreadCtxHook(RTTHREADCTXEVENT_PREEMPTING, pThis->pvUser);
-+
-+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-+ ASMSetFlags(fSavedEFlags);
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 19) && defined(RT_ARCH_AMD64)
-+ pThis->fSavedRFlags = fSavedEFlags;
-+# endif
-+#endif
- }
-
-
-@@ -105,11 +125,24 @@
- static void rtThreadCtxHooksLnxSchedIn(struct preempt_notifier *pPreemptNotifier, int iCpu)
- {
- PRTTHREADCTXINT pThis = RT_FROM_MEMBER(pPreemptNotifier, RTTHREADCTXINT, hPreemptNotifier);
-+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-+ RTCCUINTREG fSavedEFlags = ASMGetFlags();
-+ stac();
-+#endif
-+
- AssertPtr(pThis);
- AssertPtr(pThis->pfnThreadCtxHook);
- Assert(pThis->fRegistered);
-
- pThis->pfnThreadCtxHook(RTTHREADCTXEVENT_RESUMED, pThis->pvUser);
-+
-+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 19) && defined(RT_ARCH_AMD64)
-+ fSavedEFlags &= ~RT_BIT_64(18) /*X86_EFL_AC*/;
-+ fSavedEFlags |= pThis->fSavedRFlags & RT_BIT_64(18) /*X86_EFL_AC*/;
-+# endif
-+ ASMSetFlags(fSavedEFlags);
-+#endif
- }
-
-
Added: 010-no-update.patch
===================================================================
--- 010-no-update.patch (rev 0)
+++ 010-no-update.patch 2015-07-21 22:28:34 UTC (rev 137237)
@@ -0,0 +1,99 @@
+Description: Disable "Check for Updates" action.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
+Author: Daniel Hahler <ubuntu at thequod.de>, Felix Geyer <fgeyer at debian.org>
+
+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: LocalConfig.kmk
===================================================================
--- LocalConfig.kmk 2015-07-21 20:08:00 UTC (rev 137236)
+++ LocalConfig.kmk 2015-07-21 22:28:34 UTC (rev 137237)
@@ -1,9 +1,9 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS = 1
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
+# do not build test cases
+VBOX_WITH_TESTCASES :=
+VBOX_WITH_TESTSUITE :=
+VBOX_WITH_VALIDATIONKIT :=
+
+# archlinux path
VBOX_WITH_ORIGIN :=
VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
@@ -11,11 +11,18 @@
VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
VBOX_BLD_PYTHON = python2
VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
+
+# do not fail on warning
VBOX_GCC_WERR =
VBOX_GCC_WARN =
+
# fix gsoap missing zlib include and produce errors with --as-needed
VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
+
+# use system xorg
+VBOX_USE_SYSTEM_XORG_HEADERS = 1
+
+# no update request. update are handled via pacman
+VBOX_WITH_UPDATE_REQUEST := 0
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-07-21 20:08:00 UTC (rev 137236)
+++ PKGBUILD 2015-07-21 22:28:34 UTC (rev 137237)
@@ -10,7 +10,7 @@
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
-pkgver=4.3.28
+pkgver=5.0.0
pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
@@ -62,17 +62,17 @@
'001-vboxdrv-reference.patch'
'002-dri-driver-path.patch'
'003-ogl-include-path.patch'
- '004-xorg.patch'
'005-gsoap-build.patch'
'006-rdesktop-vrdp-keymap-path.patch'
'007-python2-path.patch'
- '008-root-window.patch')
-md5sums=('53dcfb7d1cf13716410f7a5de6a75fba'
+ '010-no-update.patch'
+ )
+md5sums=('1f43c53b49c50bd7700a86000ca85dda'
'984412a63aa9c07ddc3cfd970381d5df'
'4833c8e0524fd2272b24ba0d94aef006'
'6e2722bfd7013c1b0174382626ac1b8d'
'ed1341881437455d9735875ddf455fbe'
- '864f268375a10f54c4daf46787e0fcf2'
+ '043c9dc0e403f1be8d57737d64141d00'
'8ba9179c4a3516904417d773816dd992'
'fcf6bcef98b16849d5c9f048592739c0'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
@@ -79,12 +79,11 @@
'177c0e849790a825480cb9fba785f11b'
'5ebaaf351419a58db6fdddbc19c58c5e'
'9be7e2703afeee1fca9368bd8750e710'
- '1ca474b3c236bd1ffd53ec125cdf3680'
- 'a585770c6652f259c50958478b7ee735'
+ '9e49bbaa2192b141c27ee43cef8cbab7'
'ecfd13297d7753ebe7b8763ca5b792d9'
'd82a6f19be739341ed7f1cf4ee8070ca'
'188ea65918309f737ce28216c2b07c3b'
- '7495960c8fd0ac5867b6fa9cd87a64bb')
+ 'dfa08dc682c7668c8a6f0ffc3f44fece')
prepare() {
cd "VirtualBox-$pkgver"
@@ -122,14 +121,10 @@
kmk
msg2 'Build rdesktop-vrdp'
- pushd src/VBox/RDP/client-1.8.3 >/dev/null
- kmk
- popd >/dev/null
+ kmk -C src/VBox/RDP/client-1.8.3
msg2 'Build VNC extension pack'
- pushd src/VBox/ExtPacks/VNC >/dev/null
- kmk packing
- popd >/dev/null
+ kmk -C src/VBox/ExtPacks/VNC packing
}
package_virtualbox() {
@@ -166,7 +161,7 @@
# libraries
install -dm755 "$pkgdir/usr/lib/virtualbox"
install -m755 *.so "$pkgdir/usr/lib/virtualbox"
- install -m644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
+ install -m644 *.rc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
## setuid root binaries
install -m4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox"
## other binaries
@@ -199,12 +194,12 @@
# icons
install -Dm644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
- pushd icons
+ pushd icons >/dev/null
for i in *; do
install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
done
- popd
+ popd >/dev/null
#desktop
install -Dm644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
@@ -306,7 +301,7 @@
"$pkgdir"/usr/bin/VBoxClient-all
install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
"$pkgdir"/etc/xdg/autostart/vboxclient.desktop
- install -D vboxvideo_drv.so \
+ install -D vboxvideo_drv_system.so \
"$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
install -d "$pkgdir/usr/lib/xorg/modules/dri"
install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
More information about the arch-commits
mailing list