virtualbox 6.1.12-1 (znver1;x86_64) 2020-12005
9999

Status published
Submitter benbullard79 [@T] cox.net
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/808149
Packages
virtualbox-6.1.12-1.znver1.binary
virtualbox-6.1.12-1.znver1.source
virtualbox-debuginfo-6.1.12-1.znver1.debuginfo
virtualbox-debugsource-6.1.12-1.znver1.binary
virtualbox-guest-additions-6.1.12-1.znver1.binary
virtualbox-guest-additions-debuginfo-6.1.12-1.znver1.debuginfo
virtualbox-guest-kernel-module-sources-6.1.12-1.znver1.binary
virtualbox-kernel-module-sources-6.1.12-1.znver1.binary
x11-driver-video-vboxvideo-6.1.12-1.znver1.binary
virtualbox-6.1.12-1.x86_64.source
virtualbox-6.1.12-1.x86_64.binary
virtualbox-debuginfo-6.1.12-1.x86_64.debuginfo
virtualbox-debugsource-6.1.12-1.x86_64.binary
virtualbox-guest-additions-6.1.12-1.x86_64.binary
virtualbox-guest-additions-debuginfo-6.1.12-1.x86_64.debuginfo
virtualbox-guest-kernel-module-sources-6.1.12-1.x86_64.binary
virtualbox-kernel-module-sources-6.1.12-1.x86_64.binary
x11-driver-video-vboxvideo-6.1.12-1.x86_64.binary
Build Date 2020-07-16 17:36:27 +0000 UTC
Last Updated 2020-07-17 20:58:37.060217816 +0000 UTC
$ git diff --patch-with-stat --summary 1573a8263ab07a853981deb1a0f0bd811499984f..201f223f6fd435ea343e117991ed4d8bc696a2a2

 .abf.yml                                      |   2 +-
 06-xsession.patch                             |  22 ++--
 VirtualBox-6.1.6-qt-5.15.patch                |  52 --------
 VirtualBox-add-support-for-OpenMandriva.patch | 168 +++++++++++++-------------
 vbox-6.1.10-compile.patch                     |  12 ++
 vbox-6.1.4-gcc10.patch                        |  12 --
 virtualbox.spec                               |  22 +++-
 7 files changed, 123 insertions(+), 167 deletions(-)
 delete mode 100644 VirtualBox-6.1.6-qt-5.15.patch
 create mode 100644 vbox-6.1.10-compile.patch

diff --git a/.abf.yml b/.abf.yml
index ef87567..188ff6a 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -2,4 +2,4 @@ sources:
   os_openmandriva.png: 3c1c957c644369db0009773c895fbbb0617d5785
   os_openmandriva_64.png: 80cce1aee0eea3e7aed9ee36d5829c0f0fa50fd4
   UserManual.pdf: 5e7231cef2eb3a51837bbf373cb20181d6f5b94f
-  VirtualBox-6.1.6.tar.bz2: f078d7d198890b761575cdf70adcec0c8328a7ca
+  VirtualBox-6.1.12.tar.bz2: 3d69ed2b6125c7962794e0da7b210633566abbac
diff --git a/06-xsession.patch b/06-xsession.patch
index 0df7683..f3989d9 100644
--- a/06-xsession.patch
+++ b/06-xsession.patch
@@ -1,20 +1,18 @@
-diff -up VirtualBox-6.0.0/src/VBox/Additions/x11/Installer/98vboxadd-xclient.0103~ VirtualBox-6.0.0/src/VBox/Additions/x11/Installer/98vboxadd-xclient
---- VirtualBox-6.0.0/src/VBox/Additions/x11/Installer/98vboxadd-xclient.0103~	2018-12-19 00:14:55.357130644 +0100
-+++ VirtualBox-6.0.0/src/VBox/Additions/x11/Installer/98vboxadd-xclient	2018-12-19 00:15:40.907908724 +0100
-@@ -30,10 +30,10 @@ elif test -z "${SSH_CONNECTION}"; then
+diff -up VirtualBox-6.1.10/src/VBox/Additions/x11/Installer/98vboxadd-xclient.14~ VirtualBox-6.1.10/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+--- VirtualBox-6.1.10/src/VBox/Additions/x11/Installer/98vboxadd-xclient.14~	2020-06-17 20:49:37.948748754 +0200
++++ VirtualBox-6.1.10/src/VBox/Additions/x11/Installer/98vboxadd-xclient	2020-06-17 20:51:18.716864561 +0200
+@@ -30,9 +30,9 @@ elif test -z "${SSH_CONNECTION}"; then
     # This script can also be triggered by a connection over SSH, which is not
     # what we had in mind, so we do not start VBoxClient in that case.  We do
     # not use "exit" here as this script is "source"d, not executed.
 -  /usr/bin/VBoxClient --clipboard
 -  /usr/bin/VBoxClient --checkhostversion
--  /usr/bin/VBoxClient --display
 -  /usr/bin/VBoxClient --seamless
 -  /usr/bin/VBoxClient --draganddrop
--  /usr/bin/VBoxClient --vmsvga-x11  # In case VMSVGA emulation is enabled
-+  /usr/bin/VBoxClient --clipboard || true
-+  /usr/bin/VBoxClient --checkhostversion || true
-+  /usr/bin/VBoxClient --display || true
-+  /usr/bin/VBoxClient --seamless || true
-+  /usr/bin/VBoxClient --draganddrop || true
-+  /usr/bin/VBoxClient --vmsvga-x11 || true  # In case VMSVGA emulation is enabled
+-  /usr/bin/VBoxClient --vmsvga  # In case VMSVGA emulation is enabled
++  /usr/bin/VBoxClient --clipboard || :
++  /usr/bin/VBoxClient --checkhostversion || :
++  /usr/bin/VBoxClient --seamless || :
++  /usr/bin/VBoxClient --draganddrop || :
++  /usr/bin/VBoxClient --vmsvga || : # In case VMSVGA emulation is enabled
  fi
diff --git a/VirtualBox-6.1.6-qt-5.15.patch b/VirtualBox-6.1.6-qt-5.15.patch
deleted file mode 100644
index 74ed4ee..0000000
--- a/VirtualBox-6.1.6-qt-5.15.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -up VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp.omv~ VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
---- VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp.omv~	2020-04-15 21:19:58.339606055 +0200
-+++ VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp	2020-04-15 21:20:04.781621130 +0200
-@@ -17,6 +17,7 @@
- 
- /* Qt includes: */
- #include <QPainter>
-+#include <QPainterPath>
- 
- /* GUI include */
- #include "UIImageTools.h"
-diff -up VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp.omv~ VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
---- VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp.omv~	2020-04-15 21:24:40.142572000 +0200
-+++ VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp	2020-04-15 21:24:45.077593575 +0200
-@@ -19,6 +19,7 @@
- #include <QApplication>
- #include <QHBoxLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyle>
- #include <QToolButton>
- 
-diff -up VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp.omv~ VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
---- VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp.omv~	2020-04-15 21:23:26.515266604 +0200
-+++ VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp	2020-04-15 21:23:35.275301242 +0200
-@@ -21,6 +21,7 @@
- #include <QMenu>
- #include <QMoveEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStateMachine>
- #include <QStyle>
- #include <QTimer>
-diff -up VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h.omv~ VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
---- VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h.omv~	2020-04-15 21:21:57.783944433 +0200
-+++ VirtualBox-6.1.6/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h	2020-04-15 21:22:05.707970951 +0200
-@@ -24,6 +24,7 @@
- /* Qt includes: */
- #include <QIcon>
- #include <QWidget>
-+#include <QPainterPath>
- 
- /* GUI includes: */
- #include "UILibraryDefs.h"
-@@ -34,7 +35,6 @@ class QIcon;
- class QLabel;
- class QMouseEvent;
- class QObject;
--class QPainterPath;
- class QPaintEvent;
- class QResizeEvent;
- class QString;
diff --git a/VirtualBox-add-support-for-OpenMandriva.patch b/VirtualBox-add-support-for-OpenMandriva.patch
index 132b5bd..f53abd6 100644
--- a/VirtualBox-add-support-for-OpenMandriva.patch
+++ b/VirtualBox-add-support-for-OpenMandriva.patch
@@ -1,7 +1,7 @@
-diff -Naur VirtualBox-6.1.0/include/VBox/ostypes.h VirtualBox-6.1.0.tpg/include/VBox/ostypes.h
---- VirtualBox-6.1.0/include/VBox/ostypes.h	2019-12-10 17:43:11.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/include/VBox/ostypes.h	2019-12-20 09:17:11.477008533 +0000
-@@ -100,8 +100,8 @@
+diff -up VirtualBox-6.1.8/include/VBox/ostypes.h.23~ VirtualBox-6.1.8/include/VBox/ostypes.h
+--- VirtualBox-6.1.8/include/VBox/ostypes.h.23~	2020-05-14 20:31:32.000000000 +0200
++++ VirtualBox-6.1.8/include/VBox/ostypes.h	2020-05-16 23:10:43.690369196 +0200
+@@ -100,8 +100,8 @@ typedef enum VBOXOSTYPE
      VBOXOSTYPE_FedoraCore_x64   = 0x57100,
      VBOXOSTYPE_Gentoo           = 0x58000,
      VBOXOSTYPE_Gentoo_x64       = 0x58100,
@@ -12,10 +12,10 @@ diff -Naur VirtualBox-6.1.0/include/VBox/ostypes.h VirtualBox-6.1.0.tpg/include/
      VBOXOSTYPE_RedHat           = 0x5A000,
      VBOXOSTYPE_RedHat_x64       = 0x5A100,
      VBOXOSTYPE_Turbolinux       = 0x5B000,
-diff -Naur VirtualBox-6.1.0/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-6.1.0.tpg/src/VBox/Additions/linux/installer/vboxadd-x11.sh
---- VirtualBox-6.1.0/src/VBox/Additions/linux/installer/vboxadd-x11.sh	2019-12-10 17:45:30.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Additions/linux/installer/vboxadd-x11.sh	2019-12-20 09:18:02.379008827 +0000
-@@ -94,11 +94,11 @@
+diff -up VirtualBox-6.1.8/src/VBox/Additions/linux/installer/vboxadd-x11.sh.23~ VirtualBox-6.1.8/src/VBox/Additions/linux/installer/vboxadd-x11.sh
+--- VirtualBox-6.1.8/src/VBox/Additions/linux/installer/vboxadd-x11.sh.23~	2020-05-14 20:33:48.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Additions/linux/installer/vboxadd-x11.sh	2020-05-16 23:10:43.690369196 +0200
+@@ -94,11 +94,11 @@ install_x11_startup_app() {
      x11_autostart="/etc/xdg/autostart"
      kde_autostart="/usr/share/autostart"
      redhat_dir=/etc/X11/Xsession.d
@@ -30,10 +30,10 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Additions/linux/installer/vboxadd-x11.sh Vi
          found=1
      fi
      if [ -d "$x11_autostart" -a -w "$x11_autostart" -a -x "$x11_autostart" ]
-diff -Naur VirtualBox-6.1.0/src/VBox/Devices/VMMDev/VMMDev.cpp VirtualBox-6.1.0.tpg/src/VBox/Devices/VMMDev/VMMDev.cpp
---- VirtualBox-6.1.0/src/VBox/Devices/VMMDev/VMMDev.cpp	2019-12-10 17:51:26.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Devices/VMMDev/VMMDev.cpp	2019-12-20 09:18:29.667008984 +0000
-@@ -200,7 +200,7 @@
+diff -up VirtualBox-6.1.8/src/VBox/Devices/VMMDev/VMMDev.cpp.23~ VirtualBox-6.1.8/src/VBox/Devices/VMMDev/VMMDev.cpp
+--- VirtualBox-6.1.8/src/VBox/Devices/VMMDev/VMMDev.cpp.23~	2020-05-14 20:39:36.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Devices/VMMDev/VMMDev.cpp	2020-05-16 23:10:43.691369206 +0200
+@@ -200,7 +200,7 @@ static void vmmdevLogGuestOsInfo(VBoxGue
          case VBOXOSTYPE_OpenSUSE:                         pszOs = "openSUSE";       break;
          case VBOXOSTYPE_FedoraCore:                       pszOs = "Fedora";         break;
          case VBOXOSTYPE_Gentoo:                           pszOs = "Gentoo";         break;
@@ -42,24 +42,10 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Devices/VMMDev/VMMDev.cpp VirtualBox-6.1.0.
          case VBOXOSTYPE_RedHat:                           pszOs = "RedHat";         break;
          case VBOXOSTYPE_Turbolinux:                       pszOs = "TurboLinux";     break;
          case VBOXOSTYPE_Ubuntu:                           pszOs = "Ubuntu";         break;
-diff -Naur VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-6.1.0.tpg/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
---- VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2019-12-10 17:52:03.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2019-12-20 09:26:48.461011860 +0000
-@@ -65,8 +65,8 @@
-         <file alias="os_linux_64.png">images/os_linux_64.png</file>
-         <file alias="os_macosx.png">images/os_macosx.png</file>
-         <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
--        <file alias="os_mandriva.png">images/os_mandriva.png</file>
--        <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
-+        <file alias="os_openmandriva.png">images/os_openmandriva.png</file>
-+        <file alias="os_openmandriva_64.png">images/os_openmandriva_64.png</file>
-         <file alias="os_netbsd.png">images/os_netbsd.png</file>
-         <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file>
-         <file alias="os_netware.png">images/os_netware.png</file>
-diff -Naur VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-6.1.0.tpg/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
---- VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	2019-12-10 17:52:23.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	2019-12-20 09:19:07.526009202 +0000
-@@ -326,8 +326,8 @@
+diff -up VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp.23~ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
+--- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp.23~	2020-05-14 20:40:35.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	2020-05-16 23:10:43.691369206 +0200
+@@ -326,8 +326,8 @@ UIIconPoolGeneral::UIIconPoolGeneral()
      m_guestOSTypeIconNames.insert("Fedora_64",       ":/os_fedora_64.png");
      m_guestOSTypeIconNames.insert("Gentoo",          ":/os_gentoo.png");
      m_guestOSTypeIconNames.insert("Gentoo_64",       ":/os_gentoo_64.png");
@@ -70,10 +56,10 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool
      m_guestOSTypeIconNames.insert("RedHat",          ":/os_redhat.png");
      m_guestOSTypeIconNames.insert("RedHat_64",       ":/os_redhat_64.png");
      m_guestOSTypeIconNames.insert("Turbolinux",      ":/os_turbolinux.png");
-diff -Naur VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp VirtualBox-6.1.0.tpg/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
---- VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	2019-12-10 17:52:31.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	2019-12-20 09:21:24.293009991 +0000
-@@ -276,15 +276,15 @@
+diff -up VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp.23~ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+--- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp.23~	2020-05-14 20:40:44.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	2020-05-16 23:10:43.691369206 +0200
+@@ -306,15 +306,15 @@ void UINameAndSystemEditor::sltFamilyCha
          if (iIndexWin7 != -1)
              m_pComboType->setCurrentIndex(iIndexWin7);
      }
@@ -94,7 +80,7 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndS
      }
      /* Else simply select the first one present: */
      else
-@@ -504,6 +504,10 @@
+@@ -534,6 +534,10 @@ void UINameAndSystemEditor::prepareFamil
  
      /* Choose the 1st item to be the current: */
      m_pComboFamily->setCurrentIndex(0);
@@ -105,10 +91,10 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndS
      /* And update the linked widgets accordingly: */
      sltFamilyChanged(m_pComboFamily->currentIndex());
  }
-diff -Naur VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-6.1.0.tpg/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
---- VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2019-12-10 17:52:34.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2019-12-20 09:26:17.862011684 +0000
-@@ -137,8 +137,8 @@
+diff -up VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp.23~ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+--- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp.23~	2020-05-14 20:40:46.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2020-05-16 23:10:43.691369206 +0200
+@@ -137,8 +137,8 @@ static const osTypePattern gs_OSTypePatt
      { QRegExp("Fe.*32",                            Qt::CaseInsensitive), "Fedora" },
      { QRegExp("((Gen)|(Sab)).*64",                 Qt::CaseInsensitive), "Gentoo_64" },
      { QRegExp("((Gen)|(Sab)).*32",                 Qt::CaseInsensitive), "Gentoo" },
@@ -119,41 +105,36 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWi
      { QRegExp("((Red)|(rhel)|(cen)).*64",          Qt::CaseInsensitive), "RedHat_64" },
      { QRegExp("((Red)|(rhel)|(cen)).*32",          Qt::CaseInsensitive), "RedHat" },
      { QRegExp("Tur.*64",                           Qt::CaseInsensitive), "Turbolinux_64" },
-diff -Naur VirtualBox-6.1.0/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-6.1.0.tpg/src/VBox/Installer/linux/VBoxSysInfo.sh
---- VirtualBox-6.1.0/src/VBox/Installer/linux/VBoxSysInfo.sh	2019-12-10 17:52:42.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Installer/linux/VBoxSysInfo.sh	2019-12-20 09:28:55.240012591 +0000
-@@ -44,11 +44,11 @@
-         # Debian-based system
-         release=`cat /etc/debian_version`
-         print_linux_info "Debian" $release
--    elif [ -r /etc/mandriva-release ]
-+    elif [ -r /etc/openmandriva-release ]
-     then
--        # Mandriva-based system
--        release=`cat /etc/mandriva-release | sed -e 's/[A-Za-z ]* release //'`
--        print_linux_info "Mandriva" $release
-+        # OpenMandriva-based system
-+        release=`cat /etc/openmandriva-release | sed -e 's/[A-Za-z ]* release //'`
-+        print_linux_info "OpenMandriva" $release
-     elif [ -r /etc/fedora-release ]
-     then
-         # Fedora-based
-diff -Naur VirtualBox-6.1.0/src/VBox/Installer/linux/distributions_rpm VirtualBox-6.1.0.tpg/src/VBox/Installer/linux/distributions_rpm
---- VirtualBox-6.1.0/src/VBox/Installer/linux/distributions_rpm	2019-12-10 17:52:43.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Installer/linux/distributions_rpm	2019-12-20 09:27:07.753011971 +0000
-@@ -7,6 +7,9 @@
+diff -up VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc.23~ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
+--- VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc.23~	2020-05-14 20:40:13.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2020-05-16 23:10:43.691369206 +0200
+@@ -64,8 +64,8 @@
+         <file alias="os_linux_64.png">images/os_linux_64.png</file>
+         <file alias="os_macosx.png">images/os_macosx.png</file>
+         <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
+-        <file alias="os_mandriva.png">images/os_mandriva.png</file>
+-        <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
++        <file alias="os_openmandriva.png">images/os_openmandriva.png</file>
++        <file alias="os_openmandriva_64.png">images/os_openmandriva_64.png</file>
+         <file alias="os_netbsd.png">images/os_netbsd.png</file>
+         <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file>
+         <file alias="os_netware.png">images/os_netware.png</file>
+diff -up VirtualBox-6.1.8/src/VBox/Installer/linux/distributions_rpm.23~ VirtualBox-6.1.8/src/VBox/Installer/linux/distributions_rpm
+--- VirtualBox-6.1.8/src/VBox/Installer/linux/distributions_rpm.23~	2020-05-16 23:10:43.691369206 +0200
++++ VirtualBox-6.1.8/src/VBox/Installer/linux/distributions_rpm	2020-05-16 23:29:37.732039278 +0200
+@@ -8,6 +8,9 @@ openSUSE113     = OPENSUSE_11_3
  sles11.0        = SLES_11_0
  sles10.1        = SLES_10_1
  mdv2011.0       = MANDRIVA_2011_0
 +omv2014.0       = OPENMANDRIVA_2014_0
 +omv2015.0       = OPENMANDRIVA_Lx3
 +omv4000         = OPENMANDRIVA_Lx4
+ fedora32        = FEDORA_32
  fedora31        = FEDORA_31
  fedora29        = FEDORA_29
- fedora26        = FEDORA_26
-diff -Naur VirtualBox-6.1.0/src/VBox/Installer/linux/rpm/rules VirtualBox-6.1.0.tpg/src/VBox/Installer/linux/rpm/rules
---- VirtualBox-6.1.0/src/VBox/Installer/linux/rpm/rules	2019-12-10 17:52:43.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Installer/linux/rpm/rules	2019-12-20 09:28:11.628012340 +0000
+diff -up VirtualBox-6.1.8/src/VBox/Installer/linux/rpm/rules.23~ VirtualBox-6.1.8/src/VBox/Installer/linux/rpm/rules
+--- VirtualBox-6.1.8/src/VBox/Installer/linux/rpm/rules.23~	2020-05-14 20:40:56.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Installer/linux/rpm/rules	2020-05-16 23:10:43.691369206 +0200
 @@ -47,6 +47,9 @@
  ifeq ($(wildcard rpm/rules),)
  $(error call rpm/rules from src/VBox/Installer/linux)
@@ -164,10 +145,29 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Installer/linux/rpm/rules VirtualBox-6.1.0.
  
  verpkg   := VirtualBox-6.1
  current  := $(shell pwd)
-diff -Naur VirtualBox-6.1.0/src/VBox/Main/include/ovfreader.h VirtualBox-6.1.0.tpg/src/VBox/Main/include/ovfreader.h
---- VirtualBox-6.1.0/src/VBox/Main/include/ovfreader.h	2019-12-10 17:52:48.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Main/include/ovfreader.h	2019-12-20 09:29:09.031012671 +0000
-@@ -156,8 +156,8 @@
+diff -up VirtualBox-6.1.8/src/VBox/Installer/linux/VBoxSysInfo.sh.23~ VirtualBox-6.1.8/src/VBox/Installer/linux/VBoxSysInfo.sh
+--- VirtualBox-6.1.8/src/VBox/Installer/linux/VBoxSysInfo.sh.23~	2020-05-14 20:40:55.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Installer/linux/VBoxSysInfo.sh	2020-05-16 23:10:43.691369206 +0200
+@@ -44,11 +44,11 @@ get_linux_info () {
+         # Debian-based system
+         release=`cat /etc/debian_version`
+         print_linux_info "Debian" $release
+-    elif [ -r /etc/mandriva-release ]
++    elif [ -r /etc/openmandriva-release ]
+     then
+-        # Mandriva-based system
+-        release=`cat /etc/mandriva-release | sed -e 's/[A-Za-z ]* release //'`
+-        print_linux_info "Mandriva" $release
++        # OpenMandriva-based system
++        release=`cat /etc/openmandriva-release | sed -e 's/[A-Za-z ]* release //'`
++        print_linux_info "OpenMandriva" $release
+     elif [ -r /etc/fedora-release ]
+     then
+         # Fedora-based
+diff -up VirtualBox-6.1.8/src/VBox/Main/include/ovfreader.h.23~ VirtualBox-6.1.8/src/VBox/Main/include/ovfreader.h
+--- VirtualBox-6.1.8/src/VBox/Main/include/ovfreader.h.23~	2020-05-14 20:41:01.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Main/include/ovfreader.h	2020-05-16 23:10:43.691369206 +0200
+@@ -156,8 +156,8 @@ enum CIMOSType_T
      CIMOSType_CIMOS_NovellOES   = 86,
      CIMOSType_CIMOS_NovellLinuxDesktop  = 87,
      CIMOSType_CIMOS_SunJavaDesktopSystem    = 88,
@@ -178,10 +178,10 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Main/include/ovfreader.h VirtualBox-6.1.0.t
      CIMOSType_CIMOS_TurboLinux  = 91,
      CIMOSType_CIMOS_TurboLinux_64   = 92,
      CIMOSType_CIMOS_Ubuntu  = 93,
-diff -Naur VirtualBox-6.1.0/src/VBox/Main/src-all/Global.cpp VirtualBox-6.1.0.tpg/src/VBox/Main/src-all/Global.cpp
---- VirtualBox-6.1.0/src/VBox/Main/src-all/Global.cpp	2019-12-10 17:52:48.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Main/src-all/Global.cpp	2019-12-20 09:32:25.213013802 +0000
-@@ -249,15 +249,15 @@
+diff -up VirtualBox-6.1.8/src/VBox/Main/src-all/Global.cpp.23~ VirtualBox-6.1.8/src/VBox/Main/src-all/Global.cpp
+--- VirtualBox-6.1.8/src/VBox/Main/src-all/Global.cpp.23~	2020-05-14 20:41:01.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Main/src-all/Global.cpp	2020-05-16 23:10:43.691369206 +0200
+@@ -249,15 +249,15 @@ const Global::OSType Global::sOSTypes[]
        1024,  16,  8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
  
@@ -203,10 +203,10 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Main/src-all/Global.cpp VirtualBox-6.1.0.tp
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
  
      { "Linux",   "Linux",             "Oracle",             "Oracle (32-bit)",
-diff -Naur VirtualBox-6.1.0/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-6.1.0.tpg/src/VBox/Main/src-server/ApplianceImpl.cpp
---- VirtualBox-6.1.0/src/VBox/Main/src-server/ApplianceImpl.cpp	2019-12-10 17:52:50.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Main/src-server/ApplianceImpl.cpp	2019-12-20 09:33:19.133014113 +0000
-@@ -138,8 +138,8 @@
+diff -up VirtualBox-6.1.8/src/VBox/Main/src-server/ApplianceImpl.cpp.23~ VirtualBox-6.1.8/src/VBox/Main/src-server/ApplianceImpl.cpp
+--- VirtualBox-6.1.8/src/VBox/Main/src-server/ApplianceImpl.cpp.23~	2020-05-14 20:41:03.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Main/src-server/ApplianceImpl.cpp	2020-05-16 23:10:43.692369217 +0200
+@@ -138,8 +138,8 @@ static struct
      { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem,                 VBOXOSTYPE_Linux },
      { ovf::CIMOSType_CIMOS_TurboLinux,                           VBOXOSTYPE_Turbolinux },
      { ovf::CIMOSType_CIMOS_TurboLinux_64,                        VBOXOSTYPE_Turbolinux_x64 },
@@ -217,7 +217,7 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBo
      { ovf::CIMOSType_CIMOS_Ubuntu,                               VBOXOSTYPE_Ubuntu },
      { ovf::CIMOSType_CIMOS_Ubuntu_64,                            VBOXOSTYPE_Ubuntu_x64 },
      { ovf::CIMOSType_CIMOS_Debian,                               VBOXOSTYPE_Debian },
-@@ -218,7 +218,7 @@
+@@ -218,7 +218,7 @@ static const osTypePattern g_aOsTypesPat
      {"SUSE",          VBOXOSTYPE_OpenSUSE},
      {"Novell",        VBOXOSTYPE_OpenSUSE},
      {"Red Hat",       VBOXOSTYPE_RedHat},
@@ -226,7 +226,7 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBo
      {"Ubuntu",        VBOXOSTYPE_Ubuntu},
      {"Debian",        VBOXOSTYPE_Debian},
      {"QNX",           VBOXOSTYPE_QNX},
-@@ -254,7 +254,7 @@
+@@ -254,7 +254,7 @@ static const osTypePattern g_aOsTypesPat
      {"SUSE",          VBOXOSTYPE_OpenSUSE_x64},
      {"Novell",        VBOXOSTYPE_OpenSUSE_x64},
      {"Red Hat",       VBOXOSTYPE_RedHat_x64},
@@ -235,10 +235,10 @@ diff -Naur VirtualBox-6.1.0/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBo
      {"Ubuntu",        VBOXOSTYPE_Ubuntu_x64},
      {"Debian",        VBOXOSTYPE_Debian_x64},
      {"Linux 2.4",     VBOXOSTYPE_Linux24_x64},
-diff -Naur VirtualBox-6.1.0/src/VBox/Main/xml/Settings.cpp VirtualBox-6.1.0.tpg/src/VBox/Main/xml/Settings.cpp
---- VirtualBox-6.1.0/src/VBox/Main/xml/Settings.cpp	2019-12-10 17:52:54.000000000 +0000
-+++ VirtualBox-6.1.0.tpg/src/VBox/Main/xml/Settings.cpp	2019-12-20 09:33:35.984014210 +0000
-@@ -5670,7 +5670,7 @@
+diff -up VirtualBox-6.1.8/src/VBox/Main/xml/Settings.cpp.23~ VirtualBox-6.1.8/src/VBox/Main/xml/Settings.cpp
+--- VirtualBox-6.1.8/src/VBox/Main/xml/Settings.cpp.23~	2020-05-14 20:41:07.000000000 +0200
++++ VirtualBox-6.1.8/src/VBox/Main/xml/Settings.cpp	2020-05-16 23:10:43.692369217 +0200
+@@ -5672,7 +5672,7 @@ const struct {
      { "opensuse", "OpenSUSE" },
      { "fedoracore", "Fedora" },
      { "gentoo", "Gentoo" },
diff --git a/vbox-6.1.10-compile.patch b/vbox-6.1.10-compile.patch
new file mode 100644
index 0000000..cd6591a
--- /dev/null
+++ b/vbox-6.1.10-compile.patch
@@ -0,0 +1,12 @@
+diff -up VirtualBox-6.1.10/include/iprt/formats/mach-o.h.omv~ VirtualBox-6.1.10/include/iprt/formats/mach-o.h
+--- VirtualBox-6.1.10/include/iprt/formats/mach-o.h.omv~	2020-06-17 20:54:54.306253661 +0200
++++ VirtualBox-6.1.10/include/iprt/formats/mach-o.h	2020-06-17 20:55:04.837370415 +0200
+@@ -38,7 +38,7 @@
+ /* cputype */
+ #define CPU_ARCH_MASK               INT32_C(0xff000000)
+ #define CPU_ARCH_ABI64              INT32_C(0x01000000)
+-#define CPU_TYPE_ANY                INT32_C(0xffffffff)
++#define CPU_TYPE_ANY                INT32_C((int)0xffffffff)
+ #define CPU_TYPE_VAX                INT32_C(1)
+ #define CPU_TYPE_MC680x0            INT32_C(6)
+ #define CPU_TYPE_X86                INT32_C(7)
diff --git a/vbox-6.1.4-gcc10.patch b/vbox-6.1.4-gcc10.patch
index b87ff6b..43877a2 100644
--- a/vbox-6.1.4-gcc10.patch
+++ b/vbox-6.1.4-gcc10.patch
@@ -1,15 +1,3 @@
-diff -up VirtualBox-6.1.4/Config.kmk.omv~ VirtualBox-6.1.4/Config.kmk
---- VirtualBox-6.1.4/Config.kmk.omv~	2020-02-20 15:25:17.524276588 +0100
-+++ VirtualBox-6.1.4/Config.kmk	2020-02-20 15:25:44.484277776 +0100
-@@ -2685,7 +2685,7 @@ else
-  # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
-  # gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
-  VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \
--    $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
-+    $(SED_EXT) 's|\([0-9]*\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
- endif
- 
- # YASM macros
 diff -up VirtualBox-6.1.4/Makefile.kmk.omv~ VirtualBox-6.1.4/Makefile.kmk
 diff -up VirtualBox-6.1.4/include/iprt/formats/mach-o.h.omv~ VirtualBox-6.1.4/include/iprt/formats/mach-o.h
 --- VirtualBox-6.1.4/include/iprt/formats/mach-o.h.omv~	2020-02-20 15:30:56.072291516 +0100
diff --git a/virtualbox.spec b/virtualbox.spec
index b01a97a..be34896 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -27,12 +27,14 @@
 # error: Missing # define COM __gnu_lto_v1
 %define _disable_lto 1
 
+%bcond_with clang
+
 Summary:	A general-purpose full virtualizer for x86 hardware
 Name:		virtualbox
 # WARNING: WHEN UPDATING THIS PACKAGE, ALWAYS REBUILD THE
 # kernel-release AND kernel-rc PACKAGES TO MAKE SURE MODULES
 # AND USERSPACE ARE IN SYNC
-Version:	6.1.6
+Version:	6.1.12
 Release:	1
 License:	GPLv2
 Group:		Emulators
@@ -71,7 +73,7 @@ Patch8:		101-vboxsf-automount.patch
 # - mkisofs: we're not going to build the additions .iso file
 # - makeself: we're not going to create the stanalone .run installers
 Patch9:		VirtualBox-5.0.0_BETA3-dont-check-for-mkisofs-or-makeself.patch
-Patch10:	VirtualBox-6.1.6-qt-5.15.patch
+Patch11:	vbox-6.1.10-compile.patch
 
 Patch18:	VirtualBox-5.1.8-gsoap-2.8.13.patch
 Patch22:	virtualbox-no-prehistoric-xfree86.patch
@@ -308,10 +310,14 @@ VBOX_PRODUCT=VirtualBox
 EOF
 
 # (tpg) 2019-10-16 vbox is not ready for LLVM/clang
-sed -i -e 's#CC="gcc"#CC="gcc"#g' configure
-sed -i -e 's#CXX="g++"#CXX="g++ -std=gnu++14"#g' configure
+%if %{with clang}
+sed -i -e 's#CC="gcc"#CC="clang"#g' configure
+sed -i -e 's#CXX="g++"#CXX="clang++"#g' configure
+sed -i -e 's,-mpreferred-stack-boundary=2,,g' Config.kmk src/VBox/Devices/PC/ipxe/Makefile.kmk src/VBox/Devices/PC/ipxe/src/arch/i386/Makefile
+%endif
 sed -i -e 's#/usr/lib/virtualbox#%{vboxlibdir}#g' src/VBox/Installer/linux/VBox.sh
-sed -i -e 's#-fpermissive##g' -e 's#-finline-limit=8000##g' -e 's#-mpreferred-stack-boundary=2##g' Config.kmk
+sed -i -e 's#-fpermissive##g' -e 's#-finline-limit=8000##g' Config.kmk
+
 
 %build
 # FIXME: gold linker dies with internal error in segment_precedes, at ../../gold/layout.cc:3250
@@ -335,9 +341,13 @@ export LIBPATH_LIB="%{_lib}"
 	--enable-pulse || (cat configure.log && exit 1)
 
 # remove fPIC to avoid causing issues
+%if %{with clang}
+echo VBOX_GCC_OPT="$(echo %{optflags} $(pkg-config --cflags pixman-1) | sed -e 's/-fPIC//' -e 's/-Werror=format-security//') -rtlib=libgcc" >> LocalConfig.kmk
+%else
 echo VBOX_GCC_OPT="$(echo %{optflags} $(pkg-config --cflags pixman-1) | sed -e 's/-fPIC//' -e 's/-Werror=format-security//')" >> LocalConfig.kmk
-%global ldflags %{ldflags} -fuse-ld=bfd
+%endif
 echo TOOL_GCC_LDFLAGS="%{ldflags}" >> LocalConfig.kmk
+sed -i -e 's,^VBOX_WITH_CLOUD_NET,# VBOX_WITH_CLOUD_NET,g' Config.kmk
 
 %if %{with additions}
 echo XSERVER_VERSION=%{x11_server_majorver} >>LocalConfig.kmk
Not Available

benbullard79 [@T] cox.netNo Comment.1349d 20hrs
benbullard79 [@T] cox.netNo Comment.1349d 20hrs