summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-16 21:29:18 -0200
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-16 21:29:18 -0200
commit7701a796e16a4196b4e0602d37b9fabbcb077ba8 (patch)
treea74effcf8fd6659a96672dc4890d0f94f236b4d1 /libre
parentfd0fd414514e44c8f015534a3835c89d18ae45bc (diff)
downloadabslibre-7701a796e16a4196b4e0602d37b9fabbcb077ba8.tar.gz
abslibre-7701a796e16a4196b4e0602d37b9fabbcb077ba8.tar.bz2
abslibre-7701a796e16a4196b4e0602d37b9fabbcb077ba8.zip
virtualbox-libre-4.2.0-4.1: keeping some changes backward due that are unnecessary
Diffstat (limited to 'libre')
-rwxr-xr-xlibre/virtualbox-libre/PKGBUILD2
-rw-r--r--libre/virtualbox-libre/free-distros.patch10
2 files changed, 6 insertions, 6 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 7006ab4f0..1983a2cd3 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -109,7 +109,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
'67cc4c8611890038eb3e4114ae899525'
- '2681df67a0db84afb3c54008903fd537')
+ '19109b9b69222fd16cc46579495c4606')
#_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 b49190a1b..1dbe38f69 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -500,7 +500,7 @@
1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 },
--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-16 21:08:36.066756905 -0200
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-16 21:21:17.755389876 -0200
@@ -44,45 +44,33 @@
static const osTypePattern gs_OSTypePattern[] =
@@ -551,12 +551,12 @@
+ { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
+
+ /* Regular names of free GNU/Linux distributions */
-+ { QRegExp("((Pa.*GNU[/|!-]{,1}Li)|(Pa.*GNU)|(Pa.*Li)|(Pa)).*64", Qt::CaseInsensitive), "Parabola_64" },
-+ { QRegExp("(Pa.*GNU[/|!-]{,1}Li)|(Pa.*GNU)|(Pa.*Li)|(Pa)", Qt::CaseInsensitive), "Parabola" },
++ { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
++ { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
+ { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
+ { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
-+ { QRegExp("((Bla.*GNU[/|!-]{,1}Li)|(Bla.*GNU)|(Bla.*Li)|(Bla)).*64", Qt::CaseInsensitive), "Blag_64" },
-+ { QRegExp("(Bla.*GNU[/|!-]{,1}Li)|(Bla.*GNU)|(Bla.*Li)|(Bla)", Qt::CaseInsensitive), "Blag" },
++ { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
++ { QRegExp("Bla", Qt::CaseInsensitive), "Blag" },
+ { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" },
+ { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" },
+ { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" },