diff --git a/common/shlibs b/common/shlibs index f1e825819fb..df0384d3b21 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4246,3 +4246,4 @@ libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1 libplayerctl.so.2 playerctl-2.4.1_1 libwireplumber-0.4.so.0 wireplumber-0.4.14_1 libjodycode.so.2 libjodycode-2.0.1_1 +libgsoapssl++-2.8.124.so gsoap-2.8.124_1 diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk index b60eb09c0f5..151892b353b 100644 --- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk +++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk @@ -2,15 +2,17 @@ VBOX_WITH_ADDITION_DRIVERS = VBOX_WITH_INSTALLER = 1 VBOX_WITH_LINUX_ADDITIONS = 1 VBOX_WITH_X11_ADDITIONS = 1 -VBOX_WITH_TESTCASES = -VBOX_WITH_TESTSUITE = +VBOX_WITH_TESTCASES := +VBOX_WITH_TESTSUITE := +VBOX_WITH_VALIDATIONKIT := VBOX_WITH_VIRTIO = 1 VBOX_WITH_ORIGIN := VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox -VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS) +VBOX_PATH_PACKAGE_DOCS := /usr/share/doc/virtualbox +VBOX_PATH_APP_DOCS := $(VBOX_PATH_PACKAGE_DOCS) VBOX_WITH_REGISTRATION_REQUEST = VBOX_WITH_UPDATE_REQUEST = VBOX_USE_SYSTEM_XORG_HEADERS = 1 @@ -18,12 +20,16 @@ VBOX_NO_LEGACY_XORG_X11 = 1 PATH_SDK_QT5_INC := /usr/include/qt5 PATH_SDK_QT6 := /usr PATH_SDK_QT6_INC := /usr/include/qt6 +VBOX_WITH_QT5 := 1 # Enable it when vnc pkg is available. #VBOX_WITH_VNC := 1 VBOX_GCC_WERR = #VBOX_GCC_WARN = USERNAME = builder@void +KBUILD_VERBOSE := 2 # fix gsoap missing zlib include and produce errors with --as-needed VBOX_GSOAP_CXX_LIBS := gsoapssl++ z VBOX_USE_SYSTEM_GL_HEADERS=true +VBOX_WITH_DOCS := +VBOX_WITH_DOCS_PACKING := diff --git a/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch b/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch index b7700e1bd98..35fa223ab52 100644 --- a/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch +++ b/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch @@ -1,11 +1,11 @@ --- a/src/VBox/Main/webservice/Makefile.kmk +++ b/src/VBox/Main/webservice/Makefile.kmk -@@ -848,7 +848,7 @@ $(if-expr !defined(VBOX_WITHOUT_NOINLINE - $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) +@@ -848,7 +848,7 @@ ifdef VBOX_GSOAP_INSTALLED + $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT)) $(RM) -f $@ - $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) + $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) - ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround. + ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround. $(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp" $(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp" diff --git a/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch index 7838fb4e635..79502012cbc 100644 --- a/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch +++ b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch @@ -7,5 +7,5 @@ - DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system + DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) - vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod vboxvideo_drv_system_CFLAGS := \ diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch new file mode 100644 index 00000000000..12ee94908c9 --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch @@ -0,0 +1,104 @@ + +Description: Disable "Check for Updates" action. +Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212 +Author: Daniel Hahler , Felix Geyer , Gianfranco Costamagna + +--- a/doc/manual/en_US/user_Introduction.xml ++++ b/doc/manual/en_US/user_Introduction.xml +@@ -6090,14 +6090,14 @@ + . + + +- ++ + + + Language. Enables you to +--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +@@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB + bool UIExtraDataManager::applicationUpdateEnabled() + { + /* 'True' unless 'restriction' feature allowed: */ +- return !isFeatureAllowed(GUI_PreventApplicationUpdate); ++ return false; + } + + QString UIExtraDataManager::applicationUpdateData() +--- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp ++++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +@@ -47,10 +47,10 @@ + #ifdef VBOX_WS_WIN + # include "UIGlobalSettingsInterface.h" + #endif +-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER +-# include "UIGlobalSettingsProxy.h" +-# include "UIGlobalSettingsUpdate.h" +-#endif ++//#ifdef VBOX_GUI_WITH_NETWORK_MANAGER ++//# include "UIGlobalSettingsProxy.h" ++//# include "UIGlobalSettingsUpdate.h" ++//#endif + + /* GUI includes: Machine Settings: */ + #include "UIMachineSettingsAudio.h" +@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate + + #ifdef VBOX_GUI_WITH_NETWORK_MANAGER + /* Update page: */ +- m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update")); ++ //m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update")); + #endif + + /* Language page: */ +@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate + + #ifdef VBOX_GUI_WITH_NETWORK_MANAGER + /* Proxy page: */ +- m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy")); ++ //m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy")); + #endif + + #ifdef VBOX_WS_WIN +@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare() + } + #ifdef VBOX_GUI_WITH_NETWORK_MANAGER + /* Update page: */ +- case GlobalSettingsPageType_Update: ++ /*case GlobalSettingsPageType_Update: + { + pSettingsPage = new UIGlobalSettingsUpdate; + addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png", + iPageIndex, "#update", pSettingsPage); + addPageHelpKeyword(iPageIndex, "preferences"); + break; +- } ++ }*/ + #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + /* Language page: */ + case GlobalSettingsPageType_Language: +@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare() + } + #ifdef VBOX_GUI_WITH_NETWORK_MANAGER + /* Proxy page: */ +- case GlobalSettingsPageType_Proxy: ++ /*case GlobalSettingsPageType_Proxy: + { + pSettingsPage = new UIGlobalSettingsProxy; + addItem(":/proxy_32px.png", ":/proxy_24px.png", ":/proxy_16px.png", + iPageIndex, "#proxy", pSettingsPage); + addPageHelpKeyword(iPageIndex, "preferences"); + break; +- } ++ }*/ + #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + #ifdef VBOX_WS_WIN + /* Interface page: */ diff --git a/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch b/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch index 36952e8321d..1b65c8bae06 100644 --- a/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch +++ b/srcpkgs/virtualbox-ose/patches/051-file-prefix-map.patch @@ -1,10 +1,8 @@ Technically -ffile-prefix-map is not OPTimisation flags, but it's the easiest flags to be plugged in for all objects -Index: virtualbox-ose-7.0.4/Config.kmk -=================================================================== ---- virtualbox-ose-7.0.4.orig/Config.kmk -+++ virtualbox-ose-7.0.4/Config.kmk -@@ -3680,7 +3680,7 @@ else +--- a/Config.kmk ++++ b/Config.kmk +@@ -3721,7 +3721,7 @@ else # We should use -fomit-frame-pointer for GCC / -Oy for VCC. # -funwind-tables provides support for backtraces in gdb then. VBOX_GCC_FP ?= -fno-omit-frame-pointer diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch new file mode 100644 index 00000000000..81f93ba7a5e --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/052-xml.patch @@ -0,0 +1,163 @@ +Fix ftbfs +From: nezos@hotmail.com +--- a/doc/manual/en_US/user_VBoxManage.xml ++++ b/doc/manual/en_US/user_VBoxManage.xml +@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V + on your particular host. + + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + +- ++ + + + Each time VBoxManage is invoked, only one diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index 4efc26f7da0..c4bc1aa0289 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,14 +1,14 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -version=7.0.6 +version=7.0.8a revision=1 short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Orphaned " license="GPL-2.0-only, CDDL-1.0" homepage="https://www.virtualbox.org" changelog="https://www.virtualbox.org/wiki/Changelog" -distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2" -checksum=f146d9a86a35af0abb010e628636fd800cb476cc2ce82f95b0c0ca876e1756ff +distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2" +checksum=7de37359518d467b7f888235175cd388f66e9f16bd9359dd6265fbc95933c1e6 nopie=yes lib32disabled=yes @@ -33,24 +33,22 @@ system_groups="vboxusers" do_configure() { cp ${FILESDIR}/LocalConfig.kmk . - ln -s /bin/echo makeself - ./configure --disable-docs --disable-java --enable-vde \ + ./configure \ + --disable-docs --disable-java --enable-vde \ + --with-makeself="/bin/echo" \ --disable-python --disable-kmods --nofatal --enable-webservice } do_build() { export USERNAME="builder@void" vsed -i src/VBox/Main/webservice/Makefile.kmk \ - -e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \ - -e "/vboxwebsrv_LIBS/,/^vboxwebsrv_/s/.*LIB_.*/\0 z/" + -e '/webtest_LIBS/,/^webtest_/{/ z$/!s/.*LIB_.*/& z/ }' \ + -e '/vboxwebsrv_LIBS/,/^vboxwebsrv_/{/ z$/!s/.*LIB_.*/& z/}' source ./env.sh - kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT5=1 all - # kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT6=1 all + kmk ${makejobs} all } do_install() { - local f _osedir _guestdir - source ./env.sh # # virtualbox-ose. @@ -129,15 +127,14 @@ virtualbox-ose-dkms_package() { source ${wrksrc}/env.sh cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src - local _osedir=${PKGDESTDIR}/usr/src/${sourcepkg}-${version} - install -d ${_osedir} - cp -a . ${_osedir} - cp -a ${wrksrc}/include ${_osedir} - rm -f ${_osedir}/do_dkms - install -m644 ${FILESDIR}/${sourcepkg}-dkms.dkms ${_osedir}/dkms.conf - vinstall ${FILESDIR}/${sourcepkg}-dkms.udev 644 \ - usr/lib/udev/rules.d 60-virtualbox-ose-dkms.rules + rm -f do_dkms + sed -s "s/#MODULE_VERSION#/$version/" ${FILESDIR}/${pkgname}.dkms >dkms.conf + vmkdir "usr/src/${pkgname%-dkms}-${version}" + vcopy . "usr/src/${pkgname%-dkms}-${version}" + vcopy ${wrksrc}/include "usr/src/${pkgname%-dkms}-${version}" + vinstall ${FILESDIR}/${pkgname}.udev 644 \ + usr/lib/udev/rules.d 60-${pkgname}.rules } } virtualbox-ose-guest_package() { @@ -176,14 +173,12 @@ virtualbox-ose-guest-dkms_package() { source ${wrksrc}/env.sh cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src - local _guestdir=${PKGDESTDIR}/usr/src/${sourcepkg}-guest-${version} - install -d ${_guestdir} - cp -a . ${_guestdir} - rm -f ${_guestdir}/do_dkms - install -m644 ${FILESDIR}/${sourcepkg}-guest-dkms.dkms \ - ${_guestdir}/dkms.conf - vinstall ${FILESDIR}/${sourcepkg}-guest-dkms.udev 644 \ - usr/lib/udev/rules.d 60-virtualbox-ose-guest-dkms.rules + sed -s "s/#MODULE_VERSION#/$version/" ${FILESDIR}/${pkgname}.dkms >dkms.conf + rm -f do_dkms + vmkdir "usr/src/${pkgname%-dkms}-${version}" + vcopy . "usr/src/${pkgname%-dkms}-${version}" + vinstall ${FILESDIR}/${pkgname}.udev 644 \ + usr/lib/udev/rules.d 60-${pkgname}.rules } }