virtualbox-libre: updating revision

2 files changed, 4 insertions, 338 deletions

diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 4cf483641..cf2a4e4d4 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89632 2013-04-30 16:22:22Z foutrelis $
+# $Id: PKGBUILD 90797 2013-05-14 00:31:45Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -14,7 +14,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
 pkgver=4.2.12
-pkgrel=2.1
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -108,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800'
          'c7951fe6888d939f3a7d0dafe477e82b'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
-         '7c5eca076af3d0601f5321f99b815b9c'
+         'a757fa81ccf64788952c69dc5e6e43ff'
          '50387fba578646a9d29de3f917a199d2')
 
 prepare() {
@@ -318,8 +318,7 @@ package_virtualbox-libre-guest-utils(){
     source "VirtualBox-$pkgver/env.sh"
     pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
     install -d "$pkgdir"/{usr/bin,sbin}
-    install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
-    install -m755 mount.vboxsf "$pkgdir/sbin"
+    install -m755 VBoxClient VBoxControl VBoxService mount.vboxsf "$pkgdir/usr/bin"
     install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
         "$pkgdir"/usr/bin/VBoxClient-all
     install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index c3e2e4ad4..ec40c0692 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -1001,339 +1001,6 @@
  else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS
  
   #
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	2013-04-12 07:37:59.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	2013-05-10 16:26:44.137679260 -0300
-@@ -1829,166 +1829,12 @@
-                 "available on this virtual machine, and shared folders "
-                 "cannot be used without them. To use shared folders inside "
-                 "the virtual machine, please install the Guest Additions "
--                "if they are not installed, or re-install them if they are "
--                "not working correctly, by selecting <b>Install Guest Additions</b> "
--                "from the <b>Devices</b> menu. "
-+                "if they are not installed."
-                 "If they are installed but the machine is not yet fully started "
-                 "then shared folders will be available once it is.</p>"),
-              "remindAboutGuestAdditionsAreNotActive");
- }
- 
--bool UIMessageCenter::cannotFindGuestAdditions()
--{
--    return messageYesNo(mainMachineWindowShown(), Question,
--                    tr("<p>Could not find the VirtualBox Guest Additions "
--                       "CD image file.</nobr></p><p>Do you wish to "
--                       "download this CD image from the Internet?</p>"));
--}
--
--void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName)
--{
--    message(mainMachineWindowShown(), Error,
--             tr("<p>Could not insert the VirtualBox Guest Additions "
--                "installer CD image into the virtual machine <b>%1</b>, as the machine "
--                "has no CD/DVD-ROM drives. Please add a drive using the "
--                "storage page of the virtual machine settings dialog.</p>")
--                 .arg(strMachineName));
--}
--
--bool UIMessageCenter::confirmDownloadAdditions(const QString &strUrl, qulonglong uSize)
--{
--    QLocale loc(VBoxGlobal::languageId());
--    return messageOkCancel(networkManagerOrMainMachineWindowShown(), Question,
--                           tr("<p>Are you sure you want to download the VirtualBox "
--                              "Guest Additions CD image from "
--                              "<nobr><a href=\"%1\">%2</a></nobr> "
--                              "(size %3 bytes)?</p>").arg(strUrl).arg(strUrl).arg(loc.toString(uSize)),
--                           0, /* pcszAutoConfirmId */
--                           tr("Download", "additions"));
--}
--
--bool UIMessageCenter::confirmMountAdditions(const QString &strUrl, const QString &strSrc)
--{
--    return messageOkCancel(networkManagerOrMainMachineWindowShown(), Question,
--                           tr("<p>The VirtualBox Guest Additions CD image has been "
--                              "successfully downloaded from "
--                              "<nobr><a href=\"%1\">%2</a></nobr> "
--                              "and saved locally as <nobr><b>%3</b>.</nobr></p>"
--                              "<p>Do you wish to register this CD image and mount it "
--                              "on the virtual CD/DVD drive?</p>")
--                               .arg(strUrl).arg(strUrl).arg(strSrc),
--                           0, /* pcszAutoConfirmId */
--                           tr("Mount", "additions"));
--}
--
--void UIMessageCenter::warnAboutAdditionsCantBeSaved(const QString &strTarget)
--{
--    message(networkManagerOrMainMachineWindowShown(), Error,
--            tr("<p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p>")
--               .arg(QDir::toNativeSeparators(strTarget)));
--}
--
--bool UIMessageCenter::askAboutUserManualDownload(const QString &strMissedLocation)
--{
--    return messageOkCancel(mainWindowShown(), Question,
--                           tr("<p>Could not find the VirtualBox User Manual "
--                              "<nobr><b>%1</b>.</nobr></p><p>Do you wish to "
--                              "download this file from the Internet?</p>")
--                              .arg(strMissedLocation),
--                           0, /* Auto-confirm Id */
--                           tr("Download", "additions"));
--}
--
--bool UIMessageCenter::confirmUserManualDownload(const QString &strURL, qulonglong uSize)
--{
--    QLocale loc(VBoxGlobal::languageId());
--    return messageOkCancel(networkManagerOrMainWindowShown(), Question,
--                           tr("<p>Are you sure you want to download the VirtualBox "
--                              "User Manual from "
--                              "<nobr><a href=\"%1\">%2</a></nobr> "
--                              "(size %3 bytes)?</p>").arg(strURL).arg(strURL).arg(loc.toString(uSize)),
--                           0, /* Auto-confirm Id */
--                           tr("Download", "additions"));
--}
--
--void UIMessageCenter::warnAboutUserManualDownloaded(const QString &strURL, const QString &strTarget)
--{
--    message(networkManagerOrMainWindowShown(), Warning,
--            tr("<p>The VirtualBox User Manual has been "
--               "successfully downloaded from "
--               "<nobr><a href=\"%1\">%2</a></nobr> "
--               "and saved locally as <nobr><b>%3</b>.</nobr></p>")
--               .arg(strURL).arg(strURL).arg(strTarget));
--}
--
--void UIMessageCenter::warnAboutUserManualCantBeSaved(const QString &strURL, const QString &strTarget)
--{
--    message(networkManagerOrMainWindowShown(), Error,
--            tr("<p>The VirtualBox User Manual has been "
--               "successfully downloaded from "
--               "<nobr><a href=\"%1\">%2</a></nobr> "
--               "but can't be saved locally as <nobr><b>%3</b>.</nobr></p>"
--               "<p>Please choose another location for that file.</p>")
--               .arg(strURL).arg(strURL).arg(strTarget));
--}
--
--bool UIMessageCenter::proposeDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion)
--{
--    return messageOkCancel(mainWindowShown(),
--                           Question,
--                           tr("<p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p>"
--                              "<p>Do you wish to download latest one from the Internet?</p>")
--                              .arg(strExtPackVersion).arg(strExtPackName),
--                           0, /* Auto-confirm Id */
--                           tr("Download", "extension pack"));
--}
--
--bool UIMessageCenter::requestUserDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion, const QString &strVBoxVersion)
--{
--    return message(mainWindowShown(), Info,
--                   tr("<p>You have version %1 of the <b><nobr>%2</nobr></b> installed.</p>"
--                      "<p>You should download and install version %3 of this extension pack from Oracle!</p>")
--                      .arg(strExtPackVersion).arg(strExtPackName).arg(strVBoxVersion),
--                      0, /* Auto-confirm Id */
--                      QIMessageBox::Ok | QIMessageBox::Default,
--                      0,
--                      0,
--                      tr("Ok", "extension pack"));
--}
--
--bool UIMessageCenter::confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize)
--{
--    QLocale loc(VBoxGlobal::languageId());
--    return messageOkCancel(networkManagerOrMainWindowShown(), Question,
--                           tr("<p>Are you sure you want to download the <b><nobr>%1</nobr></b> "
--                              "from <nobr><a href=\"%2\">%2</a></nobr> (size %3 bytes)?</p>")
--                              .arg(strExtPackName, strURL, loc.toString(uSize)),
--                           0, /* Auto-confirm Id */
--                           tr("Download", "extension pack"));
--}
--
--bool UIMessageCenter::proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo)
--{
--    return messageOkCancel(networkManagerOrMainWindowShown(), Question,
--                           tr("<p>The <b><nobr>%1</nobr></b> has been "
--                              "successfully downloaded from <nobr><a href=\"%2\">%2</a></nobr> "
--                              "and saved locally as <nobr><b>%3</b>.</nobr></p>"
--                              "<p>Do you wish to install this extension pack?</p>")
--                              .arg(strExtPackName, strFrom, strTo),
--                           0, /* Auto-confirm Id */
--                           tr ("Install", "extension pack"));
--}
--
--void UIMessageCenter::warnAboutExtentionPackCantBeSaved(const QString &strExtPackName, const QString &strFrom, const QString &strTo)
--{
--    message(networkManagerOrMainWindowShown(), Error,
--            tr("<p>The <b><nobr>%1</nobr></b> has been "
--               "successfully downloaded from <nobr><a href=\"%2\">%2</a></nobr> "
--               "but can't be saved locally as <nobr><b>%3</b>.</nobr></p>"
--               "<p>Please choose another location for that file.</p>")
--               .arg(strExtPackName, strFrom, strTo));
--}
--
- void UIMessageCenter::cannotConnectRegister(QWidget *pParent,
-                                             const QString &strUrl,
-                                             const QString &strReason)
-@@ -2572,162 +2418,6 @@
-             formatErrorInfo(progress.GetErrorInfo()));
- }
- 
--void UIMessageCenter::cannotUpdateGuestAdditions(const CProgress &progress,
--                                                 QWidget *pParent /* = NULL */) const
--{
--    AssertWrapperOk(progress);
--
--    message(pParent ? pParent : mainWindowShown(),
--            Error,
--            tr("Failed to update Guest Additions. The Guest Additions installation image will be mounted to provide a manual installation."),
--            formatErrorInfo(progress.GetErrorInfo()));
--}
--
--void UIMessageCenter::cannotOpenExtPack(const QString &strFilename,
--                                        const CExtPackManager &extPackManager,
--                                        QWidget *pParent)
--{
--    message(pParent ? pParent : mainWindowShown(),
--            Error,
--            tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename),
--            formatErrorInfo(extPackManager));
--}
--
--void UIMessageCenter::badExtPackFile(const QString &strFilename,
--                                     const CExtPackFile &extPackFile,
--                                     QWidget *pParent)
--{
--    message(pParent ? pParent : mainWindowShown(),
--            Error,
--            tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename),
--            "<!--EOM-->" + extPackFile.GetWhyUnusable());
--}
--
--void UIMessageCenter::cannotInstallExtPack(const QString &strFilename,
--                                           const CExtPackFile &extPackFile,
--                                           const CProgress &progress,
--                                           QWidget *pParent)
--{
--    if (!pParent)
--        pParent = mainWindowShown();
--    QString strErrInfo = !extPackFile.isOk() || progress.isNull()
--                       ? formatErrorInfo(extPackFile) : formatErrorInfo(progress.GetErrorInfo());
--    message(pParent,
--            Error,
--            tr("Failed to install the Extension Pack <b>%1</b>.").arg(strFilename),
--            strErrInfo);
--}
--
--void UIMessageCenter::cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager,
--                                             const CProgress &progress, QWidget *pParent)
--{
--    if (!pParent)
--        pParent = mainWindowShown();
--    QString strErrInfo = !extPackManager.isOk() || progress.isNull()
--                       ? formatErrorInfo(extPackManager) : formatErrorInfo(progress.GetErrorInfo());
--    message(pParent,
--            Error,
--            tr("Failed to uninstall the Extension Pack <b>%1</b>.").arg(strPackName),
--            strErrInfo);
--}
--
--bool UIMessageCenter::confirmInstallingPackage(const QString &strPackName, const QString &strPackVersion,
--                                               const QString &strPackDescription, QWidget *pParent)
--{
--    return messageOkCancel(pParent ? pParent : mainWindowShown(),
--                           Question,
--                           tr("<p>You are about to install a VirtualBox extension pack. "
--                              "Extension packs complement the functionality of VirtualBox and can contain system level software "
--                              "that could be potentially harmful to your system. Please review the description below and only proceed "
--                              "if you have obtained the extension pack from a trusted source.</p>"
--                              "<p><table cellpadding=0 cellspacing=0>"
--                              "<tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%1</td></tr>"
--                              "<tr><td><b>Version:&nbsp;&nbsp;</b></td><td>%2</td></tr>"
--                              "<tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%3</td></tr>"
--                              "</table></p>")
--                           .arg(strPackName).arg(strPackVersion).arg(strPackDescription),
--                           0,
--                           tr("&Install"));
--}
--
--bool UIMessageCenter::confirmReplacePackage(const QString &strPackName, const QString &strPackVersionNew,
--                                            const QString &strPackVersionOld, const QString &strPackDescription,
--                                            QWidget *pParent)
--{
--    if (!pParent)
--        pParent = pParent ? pParent : mainWindowShown(); /* this is boring stuff that messageOkCancel should do! */
--
--    QString strBelehrung = tr("Extension packs complement the functionality of VirtualBox and can contain "
--                              "system level software that could be potentially harmful to your system. "
--                              "Please review the description below and only proceed if you have obtained "
--                              "the extension pack from a trusted source.");
--
--    QByteArray  ba1     = strPackVersionNew.toUtf8();
--    QByteArray  ba2     = strPackVersionOld.toUtf8();
--    int         iVerCmp = RTStrVersionCompare(ba1.constData(), ba2.constData());
--
--    bool fRc;
--    if (iVerCmp > 0)
--        fRc = messageOkCancel(pParent,
--                              Question,
--                              tr("<p>An older version of the extension pack is already installed, would you like to upgrade? "
--                                 "<p>%1</p>"
--                                 "<p><table cellpadding=0 cellspacing=0>"
--                                 "<tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr>"
--                                 "<tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr>"
--                                 "<tr><td><b>Current Version:&nbsp;&nbsp;</b></td><td>%4</td></tr>"
--                                 "<tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%5</td></tr>"
--                                 "</table></p>")
--                              .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription),
--                              0,
--                              tr("&Upgrade"));
--    else if (iVerCmp < 0)
--        fRc = messageOkCancel(pParent,
--                              Question,
--                              tr("<p>An newer version of the extension pack is already installed, would you like to downgrade? "
--                                 "<p>%1</p>"
--                                 "<p><table cellpadding=0 cellspacing=0>"
--                                 "<tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr>"
--                                 "<tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr>"
--                                 "<tr><td><b>Current Version:&nbsp;&nbsp;</b></td><td>%4</td></tr>"
--                                 "<tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%5</td></tr>"
--                                 "</table></p>")
--                              .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription),
--                              0,
--                              tr("&Downgrade"));
--    else
--        fRc = messageOkCancel(pParent,
--                              Question,
--                              tr("<p>The extension pack is already installed with the same version, would you like reinstall it? "
--                                 "<p>%1</p>"
--                                 "<p><table cellpadding=0 cellspacing=0>"
--                                 "<tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr>"
--                                 "<tr><td><b>Version:&nbsp;&nbsp;</b></td><td>%3</td></tr>"
--                                 "<tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%4</td></tr>"
--                                 "</table></p>")
--                              .arg(strBelehrung).arg(strPackName).arg(strPackVersionOld).arg(strPackDescription),
--                              0,
--                              tr("&Reinstall"));
--    return fRc;
--}
--
--bool UIMessageCenter::confirmRemovingPackage(const QString &strPackName, QWidget *pParent)
--{
--    return messageOkCancel(pParent ? pParent : mainWindowShown(),
--                            Question,
--                            tr("<p>You are about to remove the VirtualBox extension pack <b>%1</b>.</p>"
--                               "<p>Are you sure you want to proceed?</p>").arg(strPackName),
--                            0,
--                            tr("&Remove"));
--}
--
--void UIMessageCenter::notifyAboutExtPackInstalled(const QString &strPackName, QWidget *pParent)
--{
--    message(pParent ? pParent : mainWindowShown(),
--             Info,
--             tr("The extension pack <br><nobr><b>%1</b><nobr><br> was installed successfully.").arg(strPackName));
--}
--
- void UIMessageCenter::warnAboutIncorrectPort(QWidget *pParent) const
- {
-     message(pParent, Error,
 --- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp	2013-04-12 07:38:01.000000000 -0300
 +++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp		2013-05-10 17:03:11.087825690 -0300
 @@ -650,27 +650,6 @@