Date: Thu, 8 Dec 2011 21:58:09 +0100 (CET) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: vbox@FreeBSD.org Subject: ports/163134: [PATCH] emulators/virtualbox-ose: fix additions ISO download path Message-ID: <201112082058.pB8Kw9f4027585@backoffice.colby.local> Resent-Message-ID: <201112082100.pB8L0SGC085150@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163134 >Category: ports >Synopsis: [PATCH] emulators/virtualbox-ose: fix additions ISO download path >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Dec 08 21:00:28 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jimmy Olgeni >Release: FreeBSD 9.0-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD backoffice 9.0-PRERELEASE FreeBSD 9.0-PRERELEASE #2: Mon Nov 28 18:00:16 CET 2011 >Description: VirtualBox 4.0.14 is not able to download the guest additions ISO because it appends "_OSE" to the version number. I found a patch by Thomas Backlund that fixes the filename generation: http://svnweb.mageia.org/packages/updates/1/virtualbox/current/SOURCES/VirtualBox-4.0.14_OSE-fix-GuestAdditions-download-versioning.patch?revision=157419&view=co Added file(s): - files/patch-src_VBox_Frontends_VirtualBox_src_runtime_UIMachineLogic.cpp Port maintainer (vbox@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- virtualbox-ose-4.0.14.patch begins here --- Index: files/patch-src_VBox_Frontends_VirtualBox_src_runtime_UIMachineLogic.cpp =================================================================== RCS file: files/patch-src_VBox_Frontends_VirtualBox_src_runtime_UIMachineLogic.cpp diff -N files/patch-src_VBox_Frontends_VirtualBox_src_runtime_UIMachineLogic.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src_VBox_Frontends_VirtualBox_src_runtime_UIMachineLogic.cpp 8 Dec 2011 20:44:01 -0000 @@ -0,0 +1,32 @@ + +$FreeBSD$ + +--- src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp.orig ++++ src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp +@@ -46,6 +46,8 @@ + + /* Global includes */ + #include <iprt/path.h> ++/* needed for VBOX_VERSION_STRING_RAW */ ++#include <VBox/version.h> + + #ifdef VBOX_WITH_DEBUGGER_GUI + # include <iprt/ldr.h> +@@ -1590,7 +1592,7 @@ + + /* Check for the already registered image */ + CVirtualBox vbox = vboxGlobal().virtualBox(); +- const QString &name = QString("VBoxGuestAdditions_%1.iso").arg(vboxGlobal().vboxVersionStringNormalized()); ++ const QString &name = QString("VBoxGuestAdditions_") + VBOX_VERSION_STRING_RAW + QString(".iso"); + + CMediumVector vec = vbox.GetDVDImages(); + for (CMediumVector::ConstIterator it = vec.begin(); it != vec.end(); ++ it) +@@ -1606,7 +1608,7 @@ + int result = msgCenter().cannotFindGuestAdditions(QDir::toNativeSeparators(strSrc1), QDir::toNativeSeparators(strSrc2)); + if (result == QIMessageBox::Yes) + { +- const QString &source = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vboxGlobal().vboxVersionStringNormalized()) + name; ++ const QString &source = QString("http://download.virtualbox.org/virtualbox/") + VBOX_VERSION_STRING_RAW + QString("/") + name; + const QString &target = QDir(vboxGlobal().virtualBox().GetHomeFolder()).absoluteFilePath(name); + + UIDownloaderAdditions *pDl = UIDownloaderAdditions::create(); --- virtualbox-ose-4.0.14.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112082058.pB8Kw9f4027585>