summaryrefslogtreecommitdiff
path: root/libre/virtualbox-libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre/virtualbox-libre')
-rw-r--r--libre/virtualbox-libre/003-gcc-48.patch39
-rw-r--r--libre/virtualbox-libre/004-system-xorg.patch (renamed from libre/virtualbox-libre/18-system-xorg.patch)0
-rw-r--r--libre/virtualbox-libre/PKGBUILD27
-rw-r--r--libre/virtualbox-libre/free-distros.patch91
4 files changed, 107 insertions, 50 deletions
diff --git a/libre/virtualbox-libre/003-gcc-48.patch b/libre/virtualbox-libre/003-gcc-48.patch
new file mode 100644
index 000000000..3039ea2c6
--- /dev/null
+++ b/libre/virtualbox-libre/003-gcc-48.patch
@@ -0,0 +1,39 @@
+Index: configure
+===================================================================
+--- a/configure (revision 45449)
++++ a/configure (revision 45450)
+@@ -416,7 +416,7 @@
+ 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" \) \
+- -o \( $cc_maj -eq 4 -a $cc_min -gt 7 \) \
++ -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \
+ -o $cc_maj -gt 4 ]; then
+ log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
+ fail really
+Index: Config.kmk
+===================================================================
+--- a/Config.kmk (revision 45449)
++++ a/Config.kmk (revision 45450)
+@@ -1503,7 +1503,7 @@
+ #
+ # Compiler optimization flags.
+ #
+-VBOX_GCC_WARN ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option)
++VBOX_GCC_WARN ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_no-unused-parameter)
+ 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
+@@ -2285,6 +2285,12 @@
+ $(QUIET)$(APPEND) '$@' ' endif'
+ $(QUIET)$(APPEND) '$@' 'endif'
+ endif
++# Prevent warnings about unused parameters as of gcc-4.8 as this warning is now very verbose
++ $(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
++ $(QUIET)$(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40800),)'
++ $(QUIET)$(APPEND) '$@' ' VBOX_GCC_no-unused-parameter ?= -Wno-unused-parameter'
++ $(QUIET)$(APPEND) '$@' ' endif'
++ $(QUIET)$(APPEND) '$@' 'endif'
+ ifeq ($(KBUILD_TARGET),solaris)
+ $(QUIET)$(APPEND) '$@' 'VBOX_GCC_msave-args ?= $(call VBOX_GCC_CHECK_CXX,-msave-args,)'
+ # Detect the solaris assembler. It is used by the the 4.x gcc compilers,
diff --git a/libre/virtualbox-libre/18-system-xorg.patch b/libre/virtualbox-libre/004-system-xorg.patch
index c527f7f20..c527f7f20 100644
--- a/libre/virtualbox-libre/18-system-xorg.patch
+++ b/libre/virtualbox-libre/004-system-xorg.patch
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 3619c0c1b..42a7f8b15 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -12,8 +12,8 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-guest-dkms'
'virtualbox-libre-sdk'
'virtualbox-libre-guest-utils')
-pkgver=4.2.10
-pkgrel=2
+pkgver=4.2.12
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -22,12 +22,15 @@ makedepends=('alsa-lib'
'cdrkit'
'curl'
'dev86'
- 'gsoap=2.8.11-1'
+ 'device-mapper'
+ 'glu'
+ 'gsoap'
'iasl'
'jdk7-openjdk'
'libidl2'
'libpulse'
'libstdc++5'
+ 'libxcomposite'
'libxcursor'
'libxinerama'
'libxml2'
@@ -37,13 +40,14 @@ makedepends=('alsa-lib'
'libxtst'
'linux-libre-headers'
'mesa'
- 'glu'
'python2'
'qt4'
'sdl'
'sdl_ttf'
'vde2'
- 'xalan-c' 'xorg-server-devel' 'xf86driproto' 'libxcomposite')
+ 'xalan-c'
+ 'xf86driproto'
+ 'xorg-server-devel')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
'10-vboxdrv.rules'
@@ -53,7 +57,8 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
'vboxweb.service'
'001-vboxdrv-reference.patch'
'002-change_default_driver_dir.patch'
- '18-system-xorg.patch'
+ '003-gcc-48.patch'
+ '004-system-xorg.patch'
'os_blag_64.png'
'os_blag.png'
'os_dragora_64.png'
@@ -82,6 +87,7 @@ md5sums=('99349df34caacdecbb7cf3908631c3f3'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
'f4e4c7895ede9c524109589bf16ae660'
'97e193f050574dd272a38e5ee5ebe62b'
+ '7cf8611ae5850b86323b690e430eeed7'
'4da461f8c90caa123b47c62479f426b4'
'8538dba8686d7449cb481c9bae9d722a'
'545c925b46f2ac95e5f8ae407fad101a'
@@ -102,11 +108,10 @@ md5sums=('99349df34caacdecbb7cf3908631c3f3'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
'05d166104a66ee479896c941ac27a3d0'
- '78168f8699aa01a632603f0d5b1b8281')
+ '50387fba578646a9d29de3f917a199d2')
-build() {
+prepare() {
cd "VirtualBox-$pkgver"
-
# Apply patches
for _p in "$srcdir"/*.patch; do
[[ -e $_p ]] || continue
@@ -133,9 +138,11 @@ build() {
for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images"
done
+}
+build() {
+ cd "VirtualBox-$pkgver"
cp "$srcdir/LocalConfig.kmk" .
-
# fake makeself binary to compile without nofatal
ln -s /bin/echo makeself
export PATH="$CWD:$PATH"
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 91d15e380..913fe7039 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -1,8 +1,8 @@
diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp
-index 6ae0372..df65e60 100644
+index 8c6ab79..1e048d9 100644
--- a/src/VBox/Main/src-all/Global.cpp
+++ b/src/VBox/Main/src-all/Global.cpp
-@@ -33,289 +33,365 @@ const Global::OSType Global::sOSTypes[] =
+@@ -33,285 +33,361 @@ const Global::OSType Global::sOSTypes[] =
VBOXOSTYPE_Unknown, VBOXOSHINT_NONE,
64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
@@ -188,10 +188,6 @@ index 6ae0372..df65e60 100644
+ VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-+ { "Free Distros", "Free GNU/Linux Distros", "Venenux", "Venenux",
-+ VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux", "Arch Linux",
VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -304,6 +300,10 @@ index 6ae0372..df65e60 100644
- { "Linux", "Linux", "Linux", "Other Linux",
- VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
- 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Venenux", "Venenux",
++ VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+ { "Non-free OSs", "Non-free Operating Systems", "Windows31", "Windows 3.1",
+ VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY,
+ 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -410,102 +410,106 @@ index 6ae0372..df65e60 100644
1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "FreeBSD", "FreeBSD",
-+ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD",
++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD",
VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE,
128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)",
VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "OpenBSD", "OpenBSD",
-+ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD",
++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD",
VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)",
VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "NetBSD", "NetBSD",
-+ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD",
++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD",
VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "NetBSD_64", "NetBSD (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)",
VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3",
-+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3",
VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4",
-+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4",
VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5",
-+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5",
VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "OS2", "IBM OS/2", "OS2eCS", "eComStation",
-+ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation",
VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX,
256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "OS2", "IBM OS/2", "OS2", "Other OS/2",
-+ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2",
VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "MacOS", "Mac OS X", "MacOS", "Mac OS X",
-+ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X",
++ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X",
VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
ChipsetType_ICH9, AudioControllerType_HDA },
- { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)",
VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
ChipsetType_ICH9, AudioControllerType_HDA },
- { "Other", "Other", "DOS", "DOS",
-+ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS",
++ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS",
VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "Other", "Other", "Netware", "Netware",
-+ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware",
++ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware",
VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX,
512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Other", "Other", "L4", "L4",
-+ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4",
++ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4",
VBOXOSTYPE_L4, VBOXOSHINT_NONE,
64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Other", "Other", "QNX", "QNX",
-+ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX",
- VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX,
++ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX",
+ #ifdef VBOX_WITH_RAW_RING1
+ VBOXOSTYPE_QNX, VBOXOSHINT_NONE,
+ #else
+@@ -319,7 +395,7 @@ const Global::OSType Global::sOSTypes[] =
+ #endif
512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Other", "Other", "JRockitVE", "JRockitVE",
-+ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE",
++ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE",
VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 },
diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index c5a4cfe..7d2b363 100644
+index b335043..59ee885 100644
--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-@@ -44,46 +44,33 @@ struct osTypePattern
+@@ -44,46 +44,32 @@ struct osTypePattern
static const osTypePattern gs_OSTypePattern[] =
{
@@ -573,22 +577,21 @@ index c5a4cfe..7d2b363 100644
+ { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
+ { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
+ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
-+ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
+
+ /* Code names for non-free GNU/Linux distributions: */
- { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
- { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
- { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] =
- { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
- { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
+ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
+ { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)", Qt::CaseInsensitive), "Ubuntu" },
+ { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
+@@ -91,7 +77,7 @@ static const osTypePattern gs_OSTypePattern[] =
+ { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
+ { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
- /* Regular names of Linux distributions: */
+ /* Regular names of non-free GNU/Linux distributions: */
{ QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
{ QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
{ QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -116,15 +102,52 @@ static const osTypePattern gs_OSTypePattern[] =
{ QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
{ QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
{ QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -599,8 +602,10 @@ index c5a4cfe..7d2b363 100644
- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
-
+-
- /* Other: */
++ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
++
+ /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
@@ -836,10 +841,10 @@ index cbc0b73..31516cd 100644
#define VBOXOSTYPE_x64_BIT 8
/** The mask which indicates 64-bit. */
diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp
-index 05fc3b6..ce24d92 100644
+index 05fc3b6..dc06073 100644
--- a/src/VBox/Main/src-server/ApplianceImpl.cpp
+++ b/src/VBox/Main/src-server/ApplianceImpl.cpp
-@@ -84,7 +84,32 @@ g_osTypes[] =
+@@ -84,7 +84,31 @@ g_osTypes[] =
{ ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS },
{ ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this
@@ -859,7 +864,6 @@ index 05fc3b6..ce24d92 100644
+ { ovf::CIMOSType_CIMOS_Trisquel, VBOXOSTYPE_Trisquel },
+ { ovf::CIMOSType_CIMOS_Trisquel_64, VBOXOSTYPE_Trisquel_x64 },
+ { ovf::CIMOSType_CIMOS_Dynebolic, VBOXOSTYPE_Dynebolic },
-+ { ovf::CIMOSType_CIMOS_Venenux, VBOXOSTYPE_Venenux },
+
+ // Free GNU/Linux distros that we have support for but CIM doesn't
+ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Parabola },
@@ -873,7 +877,14 @@ index 05fc3b6..ce24d92 100644
{ ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat },
{ ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 },
{ ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 },
-@@ -110,7 +135,7 @@ g_osTypes[] =
+@@ -104,13 +128,14 @@ g_osTypes[] =
+ { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu_x64 },
+ { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian },
+ { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian_x64 },
++ { ovf::CIMOSType_CIMOS_Venenux, VBOXOSTYPE_Venenux },
+ { ovf::CIMOSType_CIMOS_Linux_2_4_x, VBOXOSTYPE_Linux24 },
+ { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, VBOXOSTYPE_Linux24_x64 },
+ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Linux26 },
{ ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 },
{ ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 },
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-06 11:53:28 +0000