diff --git a/app-emulation/virtualbox-guest-additions/patches/virtualbox_guest_additions-4.3.53_svn.patchset b/app-emulation/virtualbox-guest-additions/patches/virtualbox_guest_additions-4.3.40.patchset similarity index 98% rename from app-emulation/virtualbox-guest-additions/patches/virtualbox_guest_additions-4.3.53_svn.patchset rename to app-emulation/virtualbox-guest-additions/patches/virtualbox_guest_additions-4.3.40.patchset index 3880e39ab..05cfd798b 100644 --- a/app-emulation/virtualbox-guest-additions/patches/virtualbox_guest_additions-4.3.53_svn.patchset +++ b/app-emulation/virtualbox-guest-additions/patches/virtualbox_guest_additions-4.3.40.patchset @@ -1,14 +1,14 @@ -From ddbf13536ae03b14c3c8b985b7ebbcafd41fe6d5 Mon Sep 17 00:00:00 2001 +From d1ae4e6f3770e637953d92b49787476b4d8d5f50 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Tue, 2 Dec 2014 14:59:12 +0300 -Subject: Haiku support +Date: Mon, 4 Dec 2017 12:57:21 +0300 +Subject: Add Haiku support diff --git a/Config.kmk b/Config.kmk -index 738c808..8a4d0af 100644 +index 4fc332c..781a7e5 100644 --- a/Config.kmk +++ b/Config.kmk -@@ -1372,7 +1372,7 @@ ifndef VBOX_GCC_TOOL +@@ -1357,7 +1357,7 @@ ifndef VBOX_GCC_TOOL VBOX_GCC_TOOL := GXX4MACHO else ifeq ($(KBUILD_TARGET),haiku) # Haiku shouldn't pass '-r' to the linker by default @@ -17,7 +17,7 @@ index 738c808..8a4d0af 100644 else ifeq ($(KBUILD_TARGET),solaris) VBOX_GCC_TOOL := GXX3PLAIN VBOX_GCC32_TOOL := GXX3PLAIN -@@ -1513,8 +1513,14 @@ VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long +@@ -1498,8 +1498,14 @@ VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long ifdef VBOX_WITH_MASOCHISTIC_WARNINGS VBOX_GCC_WARN_PEDANTIC += -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter endif @@ -34,7 +34,7 @@ index 738c808..8a4d0af 100644 ifeq ($(KBUILD_TARGET),win) VBOX_C_CXX_FLAGS_NO_UNUSED_PARAMETERS = #-Wdxxxx else -@@ -2842,17 +2848,18 @@ ifeq ($(KBUILD_HOST),haiku) +@@ -2895,17 +2901,18 @@ ifeq ($(KBUILD_HOST),haiku) # @param 1 The file to add resources to. # @param 2 The resource files. # @param 3 The target name. @@ -62,7 +62,7 @@ index 738c808..8a4d0af 100644 VBOX_HAIKU_XRES_SETVER_CMDS ?= $(if $(eq $(tool_do),LINK_PROGRAM),$(call VBOX_HAIKU_XRES_SETVER_FN,$(out),$($(target)_RSRCS),$(target)),) endif -@@ -3598,7 +3605,7 @@ endif # FreeBSD +@@ -3647,7 +3654,7 @@ endif # FreeBSD ifeq ($(KBUILD_TARGET),haiku) ## The Haiku include directories @@ -71,24 +71,26 @@ index 738c808..8a4d0af 100644 TEMPLATE_VBOXR0DRV_TOOL = $(VBOX_GCC_TOOL) TEMPLATE_VBOXR0DRV_LDTOOL = $(VBOX_GCC_TOOL) -@@ -3609,13 +3616,13 @@ TEMPLATE_VBOXR0DRV_LDFLAGS = -shared -no-undefined -dc -dy -lroot -r - TEMPLATE_VBOXR0DRV_CFLAGS = -fno-PIC \ +@@ -3658,13 +3665,15 @@ TEMPLATE_VBOXR0DRV_LDFLAGS = -shared -no-undefined -dc -dy -nostdlib + TEMPLATE_VBOXR0DRV_CFLAGS = -no-fpic \ $(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare \ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow +#TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -mno-sse -mno-mmx -mno-sse2 -mno-3dnow ++#TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow +TEMPLATE_VBOXR0DRV_CFLAGS.x86 = ++ TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \ -fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \ -Wno-sign-compare -Wdeclaration-after-statement - TEMPLATE_VBOXR0DRV_CXXFLAGS = -fno-PIC -Wpointer-arith \ + TEMPLATE_VBOXR0DRV_CXXFLAGS = -no-fpic -Wpointer-arith \ - -Wshadow -Wuninitialized -Wunused-function -Wunused-label -Wunused-value -Wunused-variable \ + -Wshadow -Wuninitialized \ -Wformat \ -O2 -nodefaultlibs -fno-omit-frame-pointer -fno-strict-aliasing -fno-common -fno-exceptions -fno-rtti TEMPLATE_VBOXR0DRV_CXXFLAGS.x86 = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86) -fno-exceptions -fno-rtti -@@ -3723,7 +3730,9 @@ ifeq ($(KBUILD_TARGET),win) +@@ -3772,7 +3781,9 @@ ifeq ($(KBUILD_TARGET),win) else # the gcc guys TEMPLATE_VBOXR3EXE_TOOL = $(VBOX_GCC_TOOL) TEMPLATE_VBOXR3EXE_CXXFLAGS = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) @@ -98,7 +100,7 @@ index 738c808..8a4d0af 100644 TEMPLATE_VBOXR3EXE_CXXFLAGS.amd64 = -m64 TEMPLATE_VBOXR3EXE_CXXFLAGS.sparc32 = -m32 TEMPLATE_VBOXR3EXE_CXXFLAGS.sparc64 = -m64 -@@ -3745,7 +3754,9 @@ TEMPLATE_VBOXR3EXE_OBJCXXFLAGS.x86 = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.x86) +@@ -3794,7 +3805,9 @@ TEMPLATE_VBOXR3EXE_OBJCXXFLAGS.x86 = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.x86) TEMPLATE_VBOXR3EXE_OBJCXXFLAGS.amd64 = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.amd64) TEMPLATE_VBOXR3EXE_OBJCXXFLAGS.debug = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.debug) TEMPLATE_VBOXR3EXE_OBJCXXFLAGS.kprofile= $(TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile) @@ -108,7 +110,7 @@ index 738c808..8a4d0af 100644 TEMPLATE_VBOXR3EXE_LDFLAGS.amd64 = -m64 TEMPLATE_VBOXR3EXE_LDFLAGS.sparc32 = -m32 TEMPLATE_VBOXR3EXE_LDFLAGS.sparc64 = -m64 -@@ -3771,9 +3782,11 @@ TEMPLATE_VBOXR3EXE_LDFLAGS.darwin.x86 = -read_only_relocs suppress +@@ -3820,9 +3833,11 @@ TEMPLATE_VBOXR3EXE_LDFLAGS.darwin.x86 = -read_only_relocs suppress TEMPLATE_VBOXR3EXE_CXXFLAGS := $(filter-out -pedantic,$(TEMPLATE_VBOXR3EXE_CXXFLAGS)) -fdollars-in-identifiers # annoying gcc option precedence. endif else ifeq ($(KBUILD_TARGET),haiku) @@ -122,7 +124,7 @@ index 738c808..8a4d0af 100644 TEMPLATE_VBOXR3EXE_LIBPATH += \ /boot/common/lib # Haiku uses PIC by default... -@@ -5024,7 +5037,9 @@ else +@@ -5090,7 +5105,9 @@ else # (gcc of some kind ) TEMPLATE_VBoxBldProg_TOOL = GXX3 TEMPLATE_VBoxBldProg_CFLAGS = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) @@ -132,7 +134,7 @@ index 738c808..8a4d0af 100644 TEMPLATE_VBoxBldProg_CFLAGS.sparc32 = -m32 TEMPLATE_VBoxBldProg_CFLAGS.amd64 = -m64 TEMPLATE_VBoxBldProg_CFLAGS.sparc64 = -m64 -@@ -5032,7 +5047,9 @@ TEMPLATE_VBoxBldProg_CFLAGS.release = -O2 -fno-omit-frame-pointer -fno-stri +@@ -5098,7 +5115,9 @@ TEMPLATE_VBoxBldProg_CFLAGS.release = -O2 -fno-omit-frame-pointer -fno-stri TEMPLATE_VBoxBldProg_CFLAGS.profile = $(TEMPLATE_VBoxBldProg_CXXFLAGS.profile) TEMPLATE_VBoxBldProg_CFLAGS.kprofile = $(TEMPLATE_VBoxBldProg_CXXFLAGS.kprofile) TEMPLATE_VBoxBldProg_CXXFLAGS = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) @@ -142,7 +144,7 @@ index 738c808..8a4d0af 100644 TEMPLATE_VBoxBldProg_CXXFLAGS.sparc32 = -m32 TEMPLATE_VBoxBldProg_CXXFLAGS.amd64 = -m64 TEMPLATE_VBoxBldProg_CXXFLAGS.sparc64 = -m64 -@@ -5051,7 +5068,9 @@ TEMPLATE_VBoxBldProg_OBJCXXFLAGS.amd64 = $(TEMPLATE_VBoxBldProg_CXXFLAGS.amd64 +@@ -5117,7 +5136,9 @@ TEMPLATE_VBoxBldProg_OBJCXXFLAGS.amd64 = $(TEMPLATE_VBoxBldProg_CXXFLAGS.amd64 TEMPLATE_VBoxBldProg_OBJCXXFLAGS.release = $(TEMPLATE_VBoxBldProg_CXXFLAGS.release) TEMPLATE_VBoxBldProg_OBJCXXFLAGS.profile = $(TEMPLATE_VBoxBldProg_CXXFLAGS.profile) TEMPLATE_VBoxBldProg_OBJCXXFLAGS.kprofile= $(TEMPLATE_VBoxBldProg_CXXFLAGS.kprofile) @@ -152,7 +154,7 @@ index 738c808..8a4d0af 100644 TEMPLATE_VBoxBldProg_LDFLAGS.sparc32 = -m32 TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64 TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64 -@@ -5093,7 +5112,7 @@ TEMPLATE_VBoxBldProg_LDFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) +@@ -5159,7 +5180,7 @@ TEMPLATE_VBoxBldProg_LDFLAGS.darwin = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) endif TEMPLATE_VBoxBldProg_LIBS = else ifeq ($(KBUILD_HOST),haiku) @@ -162,7 +164,7 @@ index 738c808..8a4d0af 100644 TEMPLATE_VBoxBldProg_LIBPATH += \ /boot/common/lib diff --git a/configure b/configure -index e8415ac..cb46f77 100755 +index e892b27..6531dbd 100755 --- a/configure +++ b/configure @@ -417,6 +417,9 @@ check_gcc() @@ -175,7 +177,7 @@ index e8415ac..cb46f77 100755 elif [ $cc_maj -lt 3 \ -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ -@@ -2652,6 +2655,12 @@ if [ $OSE -ge 1 ]; then +@@ -2598,6 +2601,12 @@ if [ $OSE -ge 1 ]; then else cnf_append "VBOX_WITH_LINUX_ADDITIONS" "" fi @@ -189,7 +191,7 @@ index e8415ac..cb46f77 100755 fi diff --git a/include/iprt/cdefs.h b/include/iprt/cdefs.h -index c1f7cf0..efb98bf 100644 +index 27f87af..c85df64 100644 --- a/include/iprt/cdefs.h +++ b/include/iprt/cdefs.h @@ -1142,7 +1142,7 @@ @@ -215,7 +217,7 @@ index 0edad23..217d555 100644 { return NIL_RTFILE; diff --git a/include/iprt/types.h b/include/iprt/types.h -index a58e072..31ab2a3 100644 +index dee2257..741da61 100644 --- a/include/iprt/types.h +++ b/include/iprt/types.h @@ -150,6 +150,13 @@ RT_C_DECLS_END @@ -1616,7 +1618,7 @@ index 0000000..2ab0b73 +endef + diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxDev-haiku.c b/src/VBox/Additions/common/VBoxGuest/VBoxDev-haiku.c -index 4d344e8..9486778 100644 +index 8216332..c17cbcd 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxDev-haiku.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxDev-haiku.c @@ -191,11 +191,14 @@ static status_t VBoxGuestHaikuFree(void *cookie) @@ -1708,7 +1710,7 @@ index 4d344e8..9486778 100644 { pSession->u32MousePosChangedSeq = u32CurSeq; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c -index b3617b9..847c334 100644 +index a35329b..fb5a05d 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c @@ -69,6 +69,7 @@ @@ -1744,7 +1746,7 @@ index b3617b9..847c334 100644 /* diff --git a/src/VBox/Additions/haiku/SharedFolders/lock.h b/src/VBox/Additions/haiku/SharedFolders/lock.h -index b2f428a..c86d6ab 100644 +index c4cb31b..e652ceb 100644 --- a/src/VBox/Additions/haiku/SharedFolders/lock.h +++ b/src/VBox/Additions/haiku/SharedFolders/lock.h @@ -64,7 +64,7 @@ typedef struct rw_lock { @@ -1757,7 +1759,7 @@ index b2f428a..c86d6ab 100644 int16 active_readers; // Only > 0 while a writer is waiting: number diff --git a/src/VBox/Additions/haiku/SharedFolders/vboxsf.c b/src/VBox/Additions/haiku/SharedFolders/vboxsf.c -index c4eec30..012f66b 100644 +index edffcba..4327e4f 100644 --- a/src/VBox/Additions/haiku/SharedFolders/vboxsf.c +++ b/src/VBox/Additions/haiku/SharedFolders/vboxsf.c @@ -55,6 +55,7 @@ static fs_vnode_ops vboxsf_vnode_ops; @@ -2087,7 +2089,7 @@ index c4eec30..012f66b 100644 free(target); free(linkpath); diff --git a/src/VBox/Additions/haiku/VBoxMouse/Makefile.kmk b/src/VBox/Additions/haiku/VBoxMouse/Makefile.kmk -index 0423daa..6b88540 100644 +index b206923..5abe0e8 100644 --- a/src/VBox/Additions/haiku/VBoxMouse/Makefile.kmk +++ b/src/VBox/Additions/haiku/VBoxMouse/Makefile.kmk @@ -52,7 +52,7 @@ include $(KBUILD_PATH)/subheader.kmk @@ -2109,7 +2111,7 @@ index 0423daa..6b88540 100644 VBoxMouseFilter_DEFS += LOG_ENABLED VBoxMouseFilter_INCS = ../include diff --git a/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk b/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk -index a79a82e..130cfd9 100644 +index 1ef1842..7862bc7 100644 --- a/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk +++ b/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk @@ -51,7 +51,7 @@ include $(KBUILD_PATH)/subheader.kmk @@ -2122,7 +2124,7 @@ index a79a82e..130cfd9 100644 VBoxTray_DEFS += LOG_ENABLED VBoxTray_INCS = ../include diff --git a/src/VBox/Additions/haiku/VBoxTray/VBoxGuestApplication.cpp b/src/VBox/Additions/haiku/VBoxTray/VBoxGuestApplication.cpp -index 0690ff3..6cdee5a 100644 +index 53d16e3..a7e15b4 100644 --- a/src/VBox/Additions/haiku/VBoxTray/VBoxGuestApplication.cpp +++ b/src/VBox/Additions/haiku/VBoxTray/VBoxGuestApplication.cpp @@ -75,6 +75,7 @@ void VBoxGuestApplication::ReadyToRun() @@ -2134,7 +2136,7 @@ index 0690ff3..6cdee5a 100644 exit(0); } diff --git a/src/VBox/Additions/haiku/VBoxTray/VBoxGuestDeskbarView.cpp b/src/VBox/Additions/haiku/VBoxTray/VBoxGuestDeskbarView.cpp -index 1da72bc..56246a2 100644 +index 4f4ae9e..fdc9435 100644 --- a/src/VBox/Additions/haiku/VBoxTray/VBoxGuestDeskbarView.cpp +++ b/src/VBox/Additions/haiku/VBoxTray/VBoxGuestDeskbarView.cpp @@ -47,6 +47,7 @@ @@ -2244,7 +2246,7 @@ index 1da72bc..56246a2 100644 - +} // C diff --git a/src/VBox/Additions/haiku/VBoxTray/VBoxGuestDeskbarView.h b/src/VBox/Additions/haiku/VBoxTray/VBoxGuestDeskbarView.h -index 2bd4bc5..d4842d9 100644 +index 778c576..e70ac71 100644 --- a/src/VBox/Additions/haiku/VBoxTray/VBoxGuestDeskbarView.h +++ b/src/VBox/Additions/haiku/VBoxTray/VBoxGuestDeskbarView.h @@ -88,6 +88,7 @@ class VBoxGuestDeskbarView : public BView @@ -2256,7 +2258,7 @@ index 2bd4bc5..d4842d9 100644 VBoxDisplayService *fDisplayService; }; diff --git a/src/VBox/Runtime/VBox/log-vbox.cpp b/src/VBox/Runtime/VBox/log-vbox.cpp -index dc10c4a..9010890 100644 +index ef53798..d271b03 100644 --- a/src/VBox/Runtime/VBox/log-vbox.cpp +++ b/src/VBox/Runtime/VBox/log-vbox.cpp @@ -423,7 +423,7 @@ RTDECL(PRTLOGGER) RTLogDefaultInit(void) @@ -2268,20 +2270,20 @@ index dc10c4a..9010890 100644 # endif /* IN_GUEST */ #else /* IN_RING0 */ -@@ -492,6 +492,11 @@ RTDECL(PRTLOGGER) RTLogDefaultInit(void) +@@ -491,6 +491,11 @@ RTDECL(PRTLOGGER) RTLogDefaultInit(void) + RTLogGroupSettings(pLogger, "all=~0 -default.l6.l5.l4.l3"); RTLogFlags(pLogger, "enabled unbuffered tid"); pLogger->fDestFlags |= RTLOGDEST_DEBUGGER | RTLOGDEST_STDOUT; - # endif ++# endif +# if 1 /* vboxdrv logging - ATTENTION: this is what we're referring to guys! Change to '# if 1'. */ + RTLogGroupSettings(pLogger, "+all"); + RTLogFlags(pLogger, "enabled unbuffered tid"); + pLogger->fDestFlags |= RTLOGDEST_DEBUGGER | RTLOGDEST_STDOUT; -+# endif + # endif } #endif /* IN_RING0 */ - return g_pLogger = RT_SUCCESS(rc) ? pLogger : NULL; diff --git a/src/VBox/Runtime/r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c -index e301aa8..d47e7c6 100644 +index 7d67906..0d4528e 100644 --- a/src/VBox/Runtime/r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c +++ b/src/VBox/Runtime/r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c @@ -36,6 +36,7 @@ @@ -2293,7 +2295,7 @@ index e301aa8..d47e7c6 100644 return; } diff --git a/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c -index 7617aaf..d1fae9a 100644 +index 58c7203..2483ef3 100644 --- a/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c +++ b/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c @@ -44,10 +44,12 @@ @@ -2343,7 +2345,7 @@ index 7617aaf..d1fae9a 100644 delete_area(area); else diff --git a/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c -index 83dac1d..984e973 100644 +index 8c27a26..a4a0742 100644 --- a/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c +++ b/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c @@ -153,13 +153,15 @@ int rtR0MemObjNativeFree(RTR0MEMOBJ pMem) @@ -2420,7 +2422,7 @@ index 83dac1d..984e973 100644 rc = get_memory_map_etc(TeamId, pb, B_PAGE_SIZE, aPhysMap, &cPhysMap); if (rc < B_OK || cPhysMap < 1) diff --git a/src/VBox/Runtime/r0drv/haiku/semevent-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/semevent-r0drv-haiku.c -index 9000aef..b94af77 100644 +index 9914262..667fe6e 100644 --- a/src/VBox/Runtime/r0drv/haiku/semevent-r0drv-haiku.c +++ b/src/VBox/Runtime/r0drv/haiku/semevent-r0drv-haiku.c @@ -66,12 +66,15 @@ RTDECL(int) RTSemEventCreate(PRTSEMEVENT phEventSem) @@ -2441,7 +2443,7 @@ index 9000aef..b94af77 100644 return VERR_NO_MEMORY; diff --git a/src/VBox/Runtime/r0drv/haiku/semeventmulti-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/semeventmulti-r0drv-haiku.c -index 2e4fc31..b0cf6ce 100644 +index 3179fc9..524e6d2 100644 --- a/src/VBox/Runtime/r0drv/haiku/semeventmulti-r0drv-haiku.c +++ b/src/VBox/Runtime/r0drv/haiku/semeventmulti-r0drv-haiku.c @@ -76,7 +76,7 @@ RTDECL(int) RTSemEventMultiCreateEx(PRTSEMEVENTMULTI phEventMultiSem, uint32_t @@ -2454,7 +2456,7 @@ index 2e4fc31..b0cf6ce 100644 set_sem_owner(pThis->SemId, B_SYSTEM_TEAM); *phEventMultiSem = pThis; diff --git a/src/VBox/Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c -index 3b28b1a..1c66df5 100644 +index c34189c..9c96529 100644 --- a/src/VBox/Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c +++ b/src/VBox/Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c @@ -57,10 +57,13 @@ typedef struct RTSEMFASTMUTEXINTERNAL @@ -2473,7 +2475,7 @@ index 3b28b1a..1c66df5 100644 return VERR_NO_MEMORY; diff --git a/src/VBox/Runtime/r0drv/haiku/semmutex-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/semmutex-r0drv-haiku.c -index 9e8f3ba..5d238d4 100644 +index 4f4f68a..00b8d91 100644 --- a/src/VBox/Runtime/r0drv/haiku/semmutex-r0drv-haiku.c +++ b/src/VBox/Runtime/r0drv/haiku/semmutex-r0drv-haiku.c @@ -65,16 +65,19 @@ typedef struct RTSEMMUTEXINTERNAL @@ -2508,7 +2510,7 @@ index 9e8f3ba..5d238d4 100644 return VINF_SUCCESS; diff --git a/src/VBox/Runtime/r0drv/haiku/spinlock-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/spinlock-r0drv-haiku.c -index d60e8cc..cd044cf 100644 +index 6ffed17..e97a712 100644 --- a/src/VBox/Runtime/r0drv/haiku/spinlock-r0drv-haiku.c +++ b/src/VBox/Runtime/r0drv/haiku/spinlock-r0drv-haiku.c @@ -66,14 +66,15 @@ typedef struct RTSPINLOCKINTERNAL @@ -2530,7 +2532,7 @@ index d60e8cc..cd044cf 100644 return VERR_NO_MEMORY; diff --git a/src/VBox/Runtime/r3/haiku/rtProcInitExePath-haiku.cpp b/src/VBox/Runtime/r3/haiku/rtProcInitExePath-haiku.cpp -index ca7d829..99afe4e 100644 +index 7a41e9f..7dd0c0c 100644 --- a/src/VBox/Runtime/r3/haiku/rtProcInitExePath-haiku.cpp +++ b/src/VBox/Runtime/r3/haiku/rtProcInitExePath-haiku.cpp @@ -31,6 +31,7 @@ @@ -2550,7 +2552,7 @@ index ca7d829..99afe4e 100644 int rc = rtPathFromNativeCopy(pszPath, MIN(cchPath, MAXPATHLEN), ImageInfo.name, NULL); AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhxs\n", rc, pszPath, MIN(cchPath, MAXPATHLEN), pszPath), rc); diff --git a/src/VBox/Runtime/r3/posix/utf8-posix.cpp b/src/VBox/Runtime/r3/posix/utf8-posix.cpp -index c5c1607..f3e6d59 100644 +index cb723eb..c4c4d71 100644 --- a/src/VBox/Runtime/r3/posix/utf8-posix.cpp +++ b/src/VBox/Runtime/r3/posix/utf8-posix.cpp @@ -173,7 +173,7 @@ static int rtstrConvertCached(const void *pvInput, size_t cbInput, const char *p @@ -2597,5 +2599,5 @@ index 0f2215f..064d62d 100644 # define K_OS K_OS_LINUX # elif defined(__NetBSD__) /*??*/ -- -1.8.3.4 +2.15.0 diff --git a/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe b/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.40.recipe similarity index 91% rename from app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe rename to app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.40.recipe index 8d3460e25..305c54b9e 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe +++ b/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.40.recipe @@ -11,11 +11,13 @@ COPYRIGHT="2003-2014 Oracle Corporation." #TODO:check user manual for full list LICENSE="GNU GPL v2 CDDL v1" -REVISION="5" -SOURCE_URI="svn+http://www.virtualbox.org/svn/vbox/trunk#53373" +REVISION="1" +SOURCE_URI="http://download.virtualbox.org/virtualbox/$portVersion/VirtualBox-$portVersion.tar.bz2" +SOURCE_DIR="VirtualBox-$portVersion" +CHECKSUM_SHA256="4bbea49ee1eaa600db7af64b05c8ce6a1f7585de08f4f85cd7b6f0f7a798bcc6" PATCHES="virtualbox_guest_additions-$portVersion.patchset" -ARCHITECTURES="x86_gcc2 x86 !x86_64" +ARCHITECTURES="x86_gcc2" PROVIDES=" virtualbox_guest_additions$secondaryArchSuffix = $portVersion