Merge pull request #1981 from bferturk/master

virtualbox

hardware/virtualization/virtualbox/actions.py

@@ -22,7 +22,7 @@ def setup():
 
     # TODO: Enable web service when we have soapcpp2
     autotools.rawConfigure("\
-                             --with-makeself=/usr/bin/echo \
+                             --with-makeself=/bin/echo \
                              --disable-docs \
                              --enable-vde \
                              --enable-vnc \
@@ -62,7 +62,7 @@ def install():
         pisitools.insinto(VBoxLibDir, _file)
 
     pisitools.dobin("VBox*.sh", VBoxDataDir)
-#    pisitools.insinto(VBoxDataDir, "nls")
+    pisitools.insinto(VBoxDataDir, "nls")
 
     # TODO: Add vboxwebsrv when ready
     # Binaries and Wrapper with Launchers
@@ -73,7 +73,7 @@ def install():
     pisitools.dobin("VBoxTunctl")
 
     # Desktop file, mimetype file for xml and icon
-    #pisitools.domove("%s/*.desktop" % VBoxLibDir, "/usr/share/applications")
+    pisitools.domove("%s/*.desktop" % VBoxLibDir, "/usr/share/applications")
     pisitools.domove("%s/*.png" % VBoxLibDir, "/usr/share/pixmaps")
     pisitools.domove("%s/*.xml" % VBoxLibDir, "/usr/share/mime/packages")
 

hardware/virtualization/virtualbox/pspec.xml

@@ -56,13 +56,8 @@
             <Patch level="1">wrapper.patch</Patch>
             <Patch level="1">002-dri-driver-path.patch</Patch>
             <Patch level="1">003-ogl-include-path.patch</Patch>
-            <Patch level="1">004-xorg.patch</Patch>
-            <Patch level="1">005-gsoap-build.patch</Patch>
-            <Patch level="1">006-rdesktop-vrdp-keymap-path.patch</Patch>
             <Patch level="1">008-root-window.patch</Patch>
-            <Patch level="1">desktop-file.patch</Patch>
+            <Patch level="1">004-xorg.patch</Patch>
-            <Patch level="1">fix-tr-keyboard.patch</Patch>
-            <Patch level="1">virtualbox-4-makeself-check.patch</Patch>
         </Patches>
     </Source>