Sat Jul 6 01:36:25 PDT 2013

author: root <root@rshg054.dnsready.net> 2013-07-06 01:37:35 -0700
committer: root <root@rshg054.dnsready.net> 2013-07-06 01:37:35 -0700
commit: f37cbd892db45b858a9a876c3aea2f007803b7e1 (patch)
tree: 33e5eaf8cd2ccbcc89e614172f86d60181924099 /libre
parent: 058f9788c1e4f2b1daac706848cb51fef22c8a5d (diff)
13 files changed, 177 insertions, 183 deletions
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 56137aaf3..de69239f6 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.9.8
+_kernver=3.9.9
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _version=v3.9-rc4
 _pkgver=3.9-rc4-2-su
 pkgver=3.9rc4.2
-pkgrel=9
+pkgrel=10
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 740cb40fd..457227e70 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.83
+_kernver=3.0.85
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.9-rc4
 _pkgver=3.9-rc4-2-su
 pkgver=3.9rc4.2
-pkgrel=7
+pkgrel=9
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 434a922af..ad16baf69 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189000 2013-06-28 06:57:30Z tpowa $
+# $Id: PKGBUILD 189672 2013-07-04 11:25:41Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,10 +8,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=84
+_sublevel=85
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.83 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.84 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '1327df75d631529dcf29f46f474cf16d')
+         '4cd1209f2b4eab4f26f82e7208c53d28')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -166,7 +166,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase} kernel and modules - stable longtime supported kernel package suitable for servers"
+  pkgdesc="The ${pkgbase^} kernel and modules - stable longtime supported kernel package suitable for servers"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-libre-firmware' 'kmod')
   optdepends=('crda: to set the correct wireless channels of your country')
@@ -250,7 +250,7 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+  pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
   provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
   conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
   replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 57539c3aa..78293fad3 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188998 2013-06-28 05:50:01Z tpowa $
+# $Id: PKGBUILD 189197 2013-06-29 09:29:53Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -10,7 +10,7 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.9
-_sublevel=8
+_sublevel=9
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
@@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('120df29f88622dabf7015a22c7cc8e25'
-         'b628d7ff09667dc5546993bb83461d45'
+         'e143fc381f4d2fdfc18686b867a5e6a5'
          '5bb868d38a27edafac1eb114cd2f3659'
          'c180de34b0450d7eef8e0c1a68433d7c'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -142,7 +142,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase} kernel and modules"
+  pkgdesc="The ${pkgbase^} kernel and modules"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-libre-firmware' 'kmod')
   optdepends=('crda: to set the correct wireless channels of your country')
@@ -224,7 +224,7 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+  pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
   provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
   conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
   replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
@@ -384,7 +384,7 @@ _package-headers() {
 }
 
 _package-docs() {
-  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel"
+  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
   provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
   conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
   replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index f9907d3f4..ecee94e9b 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id: PKGBUILD 187808 2013-06-06 07:51:31Z tpowa $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=syslinux
-pkgver=5.10
-pkgrel=3
+pkgver=4.06
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
-url="http://www.syslinux.org"
+url="http://syslinux.zytor.com/"
 license=('GPL2')
 depends=('perl' 'glibc')
 optdepends=('perl-passwd-md5:  For md5pass'
@@ -25,10 +24,10 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
         syslinux.cfg
         syslinux-install_update
         splash.png)
-md5sums=('8f51d6a5d2730f534ba90e71f3347bff'
-         '25af85a05e7b212b7fb8b7587175e492'
-         'e5a69630e3f7083aad2d14362b6117b3'
-         '4450792e13a0270c1b89bb6a66ce2fbc'
+md5sums=('0384ef35b724615074e77b1fc89d5b47'
+         '1528c376e43f0eaccaa80d8ad1bc13b4'
+         '31fe4d80ad74b01e5bc8fccc1d32cccd'
+         '8559fb3daf3afa8688600d8a38118918'
          'befd0e7c38a03442b791f2a530b4dd2d')
 
 build() {
@@ -46,10 +45,8 @@ build() {
 
 package() {
   cd "$srcdir"/$pkgname-${pkgver}
-  make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install
+  make INSTALLROOT="$pkgdir" SBINDIR=/usr/bin AUXDIR=/usr/lib/syslinux install
 
-  # install docs
-  cp -ar "$srcdir"/$pkgname-${pkgver}/doc "$pkgdir"/usr/share/
   # Install the default configuration
   install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
   # Install Parabola splash
@@ -57,7 +54,4 @@ package() {
   # Install the installation and update script
   # This script is maintained at git://gist.github.com/772138.git
   install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update
-  # move extlinux binary to /usr/bin
-  mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/bin/extlinux
-  rmdir "$pkgdir"/sbin
 }
diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
index 54151ab87..2b86ab828 100644
--- a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
+++ b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
@@ -4,9 +4,9 @@ diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
 @@ -54,7 +54,7 @@
  # files that depend only on the B phase, but may have to be regenerated
  # for "make installer".
- BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
--	   diag libinstaller dos win32 win64 dosutil txt
-+	   libinstaller txt
+ BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
+-	   diag libinstaller dos win32 win64 dosutil
++	   libinstaller
  ITARGET  =
  IOBJECTS = $(ITARGET) \
  	utils/gethostip utils/isohybrid utils/mkdiskimage \
diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update
index 47d4d88be..34fe8e916 100644
--- a/libre/syslinux/syslinux-install_update
+++ b/libre/syslinux/syslinux-install_update
@@ -30,8 +30,8 @@ libpath="/usr/lib/syslinux"
 bootpath="/boot/syslinux"
 extlinux="/usr/bin/extlinux"
 
-core_modules=(ldlinux.c32)
 autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
+com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
 pciids_file=/usr/share/hwdata/pci.ids
 
 ## Helper functions ##
@@ -294,10 +294,9 @@ install_mbr() {
 }
 
 _install() {
-    # Copy all com32 files to /boot
-    for file in "${libpath}"/*.c32; do
-        file=${file##*/}
-        # Symlink files if /boot resides on the same partition as root
+    # Copy files to /boot
+    for file in "${com32_files[@]}"; do
+        # Symlink files even if links exist
         if [[ "$boot" = root ]]; then
             ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
         elif [[ "$boot" = boot ]]; then
@@ -305,8 +304,8 @@ _install() {
         fi
     done
 
-    # Copy / Symlink pci.ids if pci.ids exists on the FS
-    if [[ -f $pciids_file ]]; then
+    # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS
+    if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then 
         if [[ "$boot" = root ]]; then
             ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null
         elif [[ "$boot" = boot ]]; then
@@ -332,10 +331,10 @@ _install() {
 }
 
 update() {
-    # Update c32 files in /boot, if /boot is not on same fs
+    # Update any com and c32 files in /boot
     if [[ "$boot" = boot ]]; then
-        for file in "$bootpath"/*.c32; do
-            file=${file##*/}
+        for file in "$bootpath"/*.{c32,com}; do
+            file=$(basename "$file")
             cp "$libpath/$file" "$bootpath/$file" &> /dev/null
         done
         if [[ -f "$bootpath/pci.ids" ]]; then
@@ -343,17 +342,6 @@ update() {
         fi
     fi
 
-    # Ensure core modules exist and if not install them
-    for file in "${core_modules[@]}"; do
-        if [[ ! -f $bootpath/$file ]]; then
-            if [[  "$boot" = root ]]; then
-                ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
-            elif [[ "$boot" = boot ]]; then
-                cp "$libpath/$file" "$bootpath/$file"
-            fi
-        fi
-    done
-
     if device_is_raid $bootpart; then
         echo "Detected RAID on /boot - installing Syslinux with --raid"
         "$extlinux" --update "$bootpath" -r &> /dev/null
diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg
index e4f8d8e28..cb5afb371 100644
--- a/libre/syslinux/syslinux.cfg
+++ b/libre/syslinux/syslinux.cfg
@@ -7,6 +7,7 @@
 #   * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders
 #   * hdt.c32 - hardware detection tool
 #   * reboot.c32 - reboots the system
+#   * poweroff.com - shutdown the system
 #
 # To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux.
 # If /usr and /boot are on the same file system, symlink the files instead
@@ -49,21 +50,21 @@ MENU COLOR tabmsg       31;40   #30ffffff #00000000 std
 #-*
 
 LABEL parabola
-    MENU LABEL Parabola GNU/Linux-libre
-    LINUX ../vmlinuz-linux-libre
-    APPEND root=/dev/sda3 ro
-    INITRD ../initramfs-linux-libre.img
+	MENU LABEL Parabola GNU/Linux-libre
+	LINUX ../vmlinuz-linux-libre
+	APPEND root=/dev/sda3 ro
+	INITRD ../initramfs-linux-libre.img
 
 LABEL parabolafallback
-    MENU LABEL Parabola GNU/Linux-libre Fallback
-    LINUX ../vmlinuz-linux-libre
-    APPEND root=/dev/sda3 ro
-    INITRD ../initramfs-linux-libre-fallback.img
+	MENU LABEL Parabola GNU/Linux-libre Fallback
+	LINUX ../vmlinuz-linux-libre
+	APPEND root=/dev/sda3 ro
+	INITRD ../initramfs-linux-libre-fallback.img
 
 # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package)
-#    LABEL memtest
-#    MENU LABEL Memtest86+
-#    LINUX ../memtest86+/memtest.bin
+#	LABEL memtest
+#	MENU LABEL Memtest86+
+#	LINUX ../memtest86+/memtest.bin
 
 LABEL hdt
         MENU LABEL HDT (Hardware Detection Tool)
@@ -72,3 +73,7 @@ LABEL hdt
 LABEL reboot
         MENU LABEL Reboot
         COM32 reboot.c32
+ 
+LABEL off
+        MENU LABEL Power Off
+        COMBOOT poweroff.com
diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install
index 19caa1026..89dbf4e86 100644
--- a/libre/syslinux/syslinux.install
+++ b/libre/syslinux/syslinux.install
@@ -8,19 +8,6 @@ post_install() {
 post_upgrade() {
   # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
   /usr/bin/syslinux-install_update -s
-  # update to 5.01 message
-  if [ "$(vercmp $2 5.01)" -lt 0 ]; then
-      echo "If you used syslinux-install_update to install syslinux:"
-      echo "==> If you want to use syslinux with menu and all modules please rerun" 
-      echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
-      echo ""
-      echo "If you manually installed syslinux:"
-      echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory."
-      echo "==> If (/ and /boot on seperate fs):"
-      echo "==>   # cp /usr/lib/syslinux/*.c32 /boot/syslinux"
-      echo "==> If (/ and /boot on same fs):"
-      echo "==>   # ln -s /usr/lib/syslinux/*.c32 /boot/syslinux"
-  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index 8fe6b165c..2fa84cdf1 100755
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -4,16 +4,16 @@
 
 pkgname=unar
 pkgver=1.6
-pkgrel=2
+pkgrel=3
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://unarchiver.c3.cx/"
 license=('LGPL2.1')
 depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
 makedepends=('gcc-objc')
-replaces=("unarchiver")
-conflicts=("unarchiver" 'icu<51')
-provides=("unarchiver")
+replaces=('unarchiver' 'unrar')
+conflicts=('unarchiver' 'unrar' 'icu<51')
+provides=('unarchiver' 'unrar')
 source=("http://theunarchiver.googlecode.com/files/${pkgname}${pkgver}_src.zip"
         "native_obj_exceptions.patch")
 
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 7f4505883..cab223c30 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-guest-dkms'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
-pkgver=4.2.14
+pkgver=4.2.16
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
@@ -107,7 +107,7 @@ md5sums=('c4a36e2099a317f4715cd3861cdae238'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
          '9e0b199059faa3f99def5b0ba6e74009'
-         '2dc83a3286aa8eab080a3a6608ab3f67')
+         '1e2274facace125e6c2c8fcd7966fca7')
 
 prepare() {
     cd "VirtualBox-$pkgver"
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index fd6d29f3d..025a2b9f4 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 8c6ab79..1e048d9 100644
+index 2cd5a81..f234d58 100644
 --- a/src/VBox/Main/src-all/Global.cpp
 +++ b/src/VBox/Main/src-all/Global.cpp
-@@ -33,285 +33,361 @@ const Global::OSType Global::sOSTypes[] =
+@@ -33,293 +33,369 @@ 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 },
@@ -78,6 +78,14 @@ index 8c6ab79..1e048d9 100644
 -      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 -       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 -        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
+-    { "Windows", "Microsoft Windows", "Windows81",          "Windows 8.1",
+-      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
+-       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+-        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
+-    { "Windows", "Microsoft Windows", "Windows81_64",       "Windows 8.1 (64 bit)",
+-      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+-       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+-        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
 -    { "Windows", "Microsoft Windows", "Windows2012_64",     "Windows 2012 (64 bit)",
 -      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 -       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -376,6 +384,14 @@ index 8c6ab79..1e048d9 100644
 +      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows81",          "Windows 8.1",
++      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
++       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows81_64",       "Windows 8.1 (64 bit)",
++      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
++       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
 +    { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64",     "Windows 2012 (64 bit)",
 +      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
 +       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -496,7 +512,7 @@ index 8c6ab79..1e048d9 100644
  #ifdef VBOX_WITH_RAW_RING1
        VBOXOSTYPE_QNX,             VBOXOSHINT_NONE,
  #else
-@@ -319,7 +395,7 @@ const Global::OSType Global::sOSTypes[] =
+@@ -327,7 +403,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  },
@@ -506,53 +522,15 @@ index 8c6ab79..1e048d9 100644
          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 25928b9..0fd3a6e 100644
+index bd5bd86..c7a8c87 100644
 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-@@ -44,46 +44,32 @@ struct osTypePattern
+@@ -44,10 +44,80 @@ struct osTypePattern
  
  static const osTypePattern gs_OSTypePattern[] =
  {
 -    /* DOS: */
 -    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
--
--    /* Windows: */
--    { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
--    { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
--    { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
--    { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
--    { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
--    { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
--    { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
--    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
--    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
--    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
--    { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
--    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
--    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
--    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
--    { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
--    { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
--    { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
--    { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
--    { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
--    { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
--
--    /* Solaris: */
--    { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
--    { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
--    { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
--    { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
--    { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
--
--    /* OS/2: */
--    { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
--    { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
--    { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
--    { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
--    { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
--
--    /* Code names for Linux distributions: */
 +    /* Code names for free GNU/Linux distributions */
 +    { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
 +    { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
@@ -579,31 +557,39 @@ index 25928b9..0fd3a6e 100644
 +    { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
 +
 +    /* Code names for non-free GNU/Linux distributions: */
-     { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
-     { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", 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" },
++    { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
++    { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
++    { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
++    { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" },
++    { 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: */
+-    /* Windows: */
 +    /* 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 +102,52 @@ static const osTypePattern gs_OSTypePattern[] =
-     { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
-     { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
-     { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
--    { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
--    { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
--    { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
--    { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
--    { 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("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
++    { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
++    { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
++    { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
++    { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
++    { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
++    { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
++    { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
++    { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
++    { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
++    { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
++    { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
++    { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
++    { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
++    { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
++    { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
++    { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
++    { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
++    { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
++    { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
++    { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
++    { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
++    { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
++    { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
 +    { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
 +
 +    /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
@@ -620,40 +606,74 @@ index 25928b9..0fd3a6e 100644
 +
 +    /* Regular names of non-free operating systems: */
 +    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
-+    { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
-+    { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
-+    { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
-+    { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
-+    { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
-+    { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
-+    { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
-+    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
-+    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
-+    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
-+    { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
-+    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
-+    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
-+    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
-+    { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
-+    { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
-+    { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
-+    { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
-+    { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
-+    { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
-+    { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
-+    { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
-+    { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
-+    { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
-+    { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
-+    { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
-+    { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
-+    { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
-+    { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
-+    { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
+     { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
+     { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
+     { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
+@@ -70,63 +140,16 @@ static const osTypePattern gs_OSTypePattern[] =
+     { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
+     { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
+     { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
+-
+-    /* Solaris: */
+     { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
+     { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
+     { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
+     { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
+     { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
+-
+-    /* OS/2: */
+     { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
+     { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
+     { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
+     { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
+     { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
+-
+-    /* Code names for Linux distributions: */
+-    { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
+-    { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
+-    { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
+-    { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" },
+-    { 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: */
+-    { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
+-    { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
+-    { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
+-    { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
+-    { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
+-    { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
+-    { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
+-    { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
+-    { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
+-    { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
+-    { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
+-    { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
+-    { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
+-    { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
+-    { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
+-    { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
+-    { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
+-    { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
+-    { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
+-    { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
+-    { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
+-    { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
+-    { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
+-    { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
+-    { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
+-    { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
+-    { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
+-    { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
+-    { 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("L4", Qt::CaseInsensitive), "L4" },
      { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
      { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
-@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -139,6 +162,8 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
      { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
      { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
@@ -662,7 +682,7 @@ index 25928b9..0fd3a6e 100644
      { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
  };
  
-@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
+@@ -233,11 +258,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
      /* Create widgets: */
      QVBoxLayout *pMainLayout = new QVBoxLayout(this);
      {
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index 37fae91a9..4bf584f15 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -25,7 +25,7 @@ makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libc
 	     'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
 optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
 	    'pulseaudio: pulseaudio support'
-	    'lirc: remote controller support'
+	    'lirc-libre: remote controller support'
 	    'udisks: automount external drives'
 	    'upower: used to trigger suspend functionality'
 	    'libarchive: access compressed files without unpacking them'
author	root <root@rshg054.dnsready.net>	2013-07-06 01:37:35 -0700
committer	root <root@rshg054.dnsready.net>	2013-07-06 01:37:35 -0700
commit	f37cbd892db45b858a9a876c3aea2f007803b7e1 (patch)
tree	33e5eaf8cd2ccbcc89e614172f86d60181924099 /libre
parent	058f9788c1e4f2b1daac706848cb51fef22c8a5d (diff)