virtualbox-libre-4.2.0-2: fixing free-distros.patch

2 files changed, 24 insertions, 24 deletions

diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index daa6f024d..7a347075c 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -62,7 +62,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
          '67cc4c8611890038eb3e4114ae899525'
-         'd015ba8c700e610d5562237afb58cc6a')
+         '058c61d52984c1c3b23006f151ed1562')
 
 _extramodules=extramodules-3.5-LIBRE
 _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index be8bf92e3..ac0a840e3 100755
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -413,13 +413,13 @@
          <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
          <file alias="hd_32px.png">images/hd_32px.png</file>
 --- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp	2012-09-08 06:36:02.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp		2012-09-19 02:04:34.156984571 -0300
++++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp		2012-09-19 03:33:50.143066084 -0300
 @@ -29,296 +29,94 @@
      /* NOTE1: we assume that unknown is always the first entry!
       * NOTE2: please use powers of 2 when specifying the size of harddisks since
       *        '2GB' looks better than '1.95GB' (= 2000MB) */
 -    { "Other",   "Other",             "Other",              "Other/Unknown",
-+    { "Other",   "Other",             SchemaDefs_OSTypeId_Other,           "Other/Unknown",
++    { "Other",     "Other",           "Other",              "Other/Unknown",
        VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,
          64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
@@ -514,51 +514,51 @@
 -    { "Linux",   "Linux",             "Linux24_64",         "Linux 2.4 (64 bit)",
 -      VBOXOSTYPE_Linux24_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
 -       128,   4,  4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "GNU",   "GNU",             SchemaDefs_OSTypeId_GNU,         "GNU",
++    { "GNU",       "GNU",             "GNU",                "GNU",
 +      VBOXOSTYPE_GNU,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "GNU",   "GNU",             SchemaDefs_OSTypeId_GNU_64,      "GNU (64 bit)",
++    { "GNU",       "GNU",             "GNU_64",             "GNU (64 bit)",
 +      VBOXOSTYPE_GNU_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "GNU-Hurd",   "GNU-Hurd",             SchemaDefs_OSTypeId_GNUHurd,         "GNU-Hurd",
++    { "GNU-Hurd",  "GNU-Hurd",        "GNUHurd",            "GNU-Hurd",
 +      VBOXOSTYPE_GNUHurd,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Linux26",            "Linux 2.6",
 -      VBOXOSTYPE_Linux26,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_GNULinux,         "GNU/Linux",
++    { "GNU/Linux", "GNU/Linux",       "GNULinux",           "GNU/Linux",
 +      VBOXOSTYPE_GNULinux,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Linux26_64",         "Linux 2.6 (64 bit)",
 -      VBOXOSTYPE_Linux26_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_GNULinux_64,      "GNU/Linux (64 bit)",
++    { "GNU/Linux", "GNU/Linux",       "GNULinux_64",        "GNU/Linux (64 bit)",
 +      VBOXOSTYPE_GNULinux_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "ArchLinux",          "Arch Linux",
 -      VBOXOSTYPE_ArchLinux,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Parabola,       "Parabola GNU/Linux-libre",
++    { "GNU/Linux", "GNU/Linux",       "Parabola",           "Parabola GNU/Linux-libre",
 +      VBOXOSTYPE_Parabola,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "ArchLinux_64",       "Arch Linux (64 bit)",
 -      VBOXOSTYPE_ArchLinux_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Parabola_64,    "Parabola GNU/Linux-libre (64 bit)",
++    { "GNU/Linux", "GNU/Linux",       "Parabola_64",        "Parabola GNU/Linux-libre (64 bit)",
 +      VBOXOSTYPE_Parabola_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Debian",             "Debian",
 -      VBOXOSTYPE_Debian,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_gNewSense,          "gNewSense",
++    { "GNU/Linux", "GNU/Linux",       "gNewSense",          "gNewSense",
 +      VBOXOSTYPE_gNewSense,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Debian_64",          "Debian (64 bit)",
 -      VBOXOSTYPE_Debian_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_gNewSense_64,       "gNewSense (64 bit)",
++    { "GNU/Linux", "GNU/Linux",       "gNewSense_64",       "gNewSense (64 bit)",
 +      VBOXOSTYPE_gNewSense_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
@@ -572,25 +572,25 @@
 -        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Fedora",             "Fedora",
 -      VBOXOSTYPE_FedoraCore,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Blag,          "Blag Linux and GNU",
++    { "GNU/Linux", "GNU/Linux",       "Blag",               "Blag Linux and GNU",
 +      VBOXOSTYPE_Blag,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Fedora_64",          "Fedora (64 bit)",
 -      VBOXOSTYPE_FedoraCore_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Blag_64,       "Blag Linux and GNU (64 bit)",
++    { "GNU/Linux", "GNU/Linux",       "Blag_64",            "Blag Linux and GNU (64 bit)",
 +      VBOXOSTYPE_Blag_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Gentoo",             "Gentoo",
 -      VBOXOSTYPE_Gentoo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Dragora,       "Dragora",
++    { "GNU/Linux", "GNU/Linux",       "Dragora",            "Dragora",
 +      VBOXOSTYPE_Dragora,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Gentoo_64",          "Gentoo (64 bit)",
 -      VBOXOSTYPE_Gentoo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Dragora_64,    "Dragora (64 bit)",
++    { "GNU/Linux", "GNU/Linux",       "Dragora_64",         "Dragora (64 bit)",
 +      VBOXOSTYPE_Dragora_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
@@ -605,53 +605,53 @@
 -    { "Linux",   "Linux",             "RedHat",             "Red Hat",
 -      VBOXOSTYPE_RedHat,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
 -       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Ututo,          "Ututo XS",
++    { "GNU/Linux", "GNU/Linux",       "Ututo",              "Ututo XS",
 +      VBOXOSTYPE_Ututo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "RedHat_64",          "Red Hat (64 bit)",
 -      VBOXOSTYPE_RedHat_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
 -       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Ututo_64,       "Ututo XS (64 bit)",
++    { "GNU/Linux", "GNU/Linux",       "Ututo_64",           "Ututo XS (64 bit)",
 +      VBOXOSTYPE_Ututo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Turbolinux",         "Turbolinux",
 -      VBOXOSTYPE_Turbolinux,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Musix,          "Musix",
++    { "GNU/Linux", "GNU/Linux",       "Musix",              "Musix",
 +      VBOXOSTYPE_Musix,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Turbolinux_64",      "Turbolinux (64 bit)",
 -      VBOXOSTYPE_Turbolinux_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Musix_64,       "Musix (64 bit)",
++    { "GNU/Linux", "GNU/Linux",       "Musix_64",           "Musix (64 bit)",
 +      VBOXOSTYPE_Musix_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 -        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Ubuntu",             "Ubuntu",
 -      VBOXOSTYPE_Ubuntu,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Trisquel,          "Trisquel",
++    { "GNU/Linux", "GNU/Linux",       "Trisquel",           "Trisquel",
 +      VBOXOSTYPE_Trisquel,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Ubuntu_64",          "Ubuntu (64 bit)",
 -      VBOXOSTYPE_Ubuntu_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Trisquel_64,       "Trisquel (64 bit)",
++    { "GNU/Linux", "GNU/Linux",       "Trisquel_64",        "Trisquel (64 bit)",
 +      VBOXOSTYPE_Trisquel_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Xandros",            "Xandros",
 -      VBOXOSTYPE_Xandros,         VBOXOSHINT_RTCUTC,
 -       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Dynebolic,         "Dyne:bolic",
++    { "GNU/Linux", "GNU/Linux",       "Dynebolic",          "Dyne:bolic",
 +      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  },
 -    { "Linux",   "Linux",             "Xandros_64",         "Xandros (64 bit)",
 -      VBOXOSTYPE_Xandros_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
 -       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "GNU/Linux",   "GNU/Linux",             SchemaDefs_OSTypeId_Venenux,          "Venenux",
++    { "GNU/Linux", "GNU/Linux",       "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  },