From fdf7d593f3212b5ea5d9effd0a306beb0fd671b6cb45708f42e2aae1fdc09b62 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Sat, 1 Jan 2011 15:49:43 +0000 Subject: [PATCH] Accepting request 56966 from home:mseben fix build OBS-URL: https://build.opensuse.org/request/show/56966 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=13 --- vbox-smc-napa.diff | 13 +++++++++++++ virtualbox.changes | 5 +++++ virtualbox.spec | 9 +++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 vbox-smc-napa.diff diff --git a/vbox-smc-napa.diff b/vbox-smc-napa.diff new file mode 100644 index 0000000..1b32507 --- /dev/null +++ b/vbox-smc-napa.diff @@ -0,0 +1,13 @@ +Index: VirtualBox-4.0.0_OSE/src/VBox/Devices/PC/vbox.dsl +=================================================================== +--- VirtualBox-4.0.0_OSE.orig/src/VBox/Devices/PC/vbox.dsl ++++ VirtualBox-4.0.0_OSE/src/VBox/Devices/PC/vbox.dsl +@@ -778,7 +778,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, + Device (SMC) + { + Name (_HID, EisaId ("APP0001")) +- Name (_CID, "smc-napa") ++ Name (_CID, "smcnapa") + + Method (_STA, 0, NotSerialized) + { diff --git a/virtualbox.changes b/virtualbox.changes index 688a20f..b76ff35 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 31 22:41:25 UTC 2010 - mseben@gmail.com + +- added vbox-smc-napa.diff to fix build + ------------------------------------------------------------------- Thu Dec 30 19:50:12 UTC 2010 - tejas.guruswamy@opensuse.org diff --git a/virtualbox.spec b/virtualbox.spec index 874ed2f..10af831 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -78,6 +78,11 @@ Patch2: vbox-vboxadd-init-script.diff Patch4: vbox-ret-in-nonvoid-fnc.diff #fix rpath Patch5: vbox-rpath.diff +#fix build : "Error 4001 - String must be entirely alphanumeric" +#with renaming we probably break some macosx functionality however ths is just quick fix +#file :http://www.virtualbox.org/browser/trunk/src/VBox/Devices/PC/vbox.ds +#see thread : http://lists.freebsd.org/pipermail/freebsd-acpi/2010-October/006795.html +Patch6: vbox-smc-napa.diff #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user #try to start VirtualBox and is not memeber of vboxusers group Patch99: vbox-permissions_warning.diff @@ -195,6 +200,7 @@ Development file for %{name} ##%patch3 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %patch99 -p1 %patch100 %patch101 @@ -208,10 +214,9 @@ export SUSE_ASNEEDED=0 # turn on vnc feature by hand, this line could be dropped when we could use configure script echo VBOX_WITH_VNC=1 >> Config.kmk # -# --with-gcc=/usr/bin/gxx-4.3 do configure and set proper gcc - currently vbox support only gcc<=4.4 # --disable-kmods \ don't build Linux kernel modules - but use SUSE specific way see few lines under +# --with-gcc=/usr/bin/gxx-4.3 do configure and set proper gcc - currently vbox support only gcc<=4.4 # --nofatal try to avoid build fail caused by missing makeself package -# --disable-kmods build virtualbox without kernel modules ./configure \ --disable-kmods \ --with-gcc=/usr/bin/gcc-4.3 \