packages (DEVEL): VirtualBox/VirtualBox-export_modules.patch, VirtualBox/Vi...

arvenil arvenil at pld-linux.org
Sat Jun 5 18:31:24 CEST 2010 

Author: arvenil                      Date: Sat Jun  5 16:31:24 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 3.2.2
- gcc patch already in sources
- part of export_modules.patch already in sources
- doesn't build; fails on warnings

---- Files affected:
packages/VirtualBox:
   VirtualBox-export_modules.patch (1.5 -> 1.5.2.1) , VirtualBox.spec (1.279 -> 1.279.2.1) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox-export_modules.patch
diff -u packages/VirtualBox/VirtualBox-export_modules.patch:1.5 packages/VirtualBox/VirtualBox-export_modules.patch:1.5.2.1
--- packages/VirtualBox/VirtualBox-export_modules.patch:1.5	Sun May 16 15:42:12 2010
+++ packages/VirtualBox/VirtualBox-export_modules.patch	Sat Jun  5 18:31:18 2010
@@ -1,21 +1,5 @@
 --- VirtualBox-3.1.8_OSE/src/VBox/Additions/linux/export_modules.orig	2010-05-10 08:45:29.000000000 +0200
 +++ VirtualBox-3.1.8_OSE/src/VBox/Additions/linux/export_modules	2010-05-16 14:15:16.321158339 +0200
-@@ -31,6 +31,7 @@
- PATH_ROOT="`cd \`dirname $0\`/../../../..; pwd`"
- PATH_VBOXGUEST="$PATH_ROOT/src/VBox/Additions/common/VBoxGuest"
- PATH_VBOXSF="$PATH_ROOT/src/VBox/Additions/linux/sharedfolders"
-+PATH_VBOXVIDEO_DRM="$PATH_ROOT/src/VBox/Additions/linux/drm"
- 
- VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
- VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
-@@ -38,6 +39,7 @@
- 
- . $PATH_VBOXGUEST/linux/files_vboxguest
- . $PATH_VBOXSF/files_vboxsf
-+. $PATH_VBOXVIDEO_DRM/files_vboxvideo_drm
- 
- # Temporary path for creating the modules, will be removed later
- mkdir $PATH_TMP || exit 1
 @@ -71,6 +73,15 @@
      install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxsf/`echo $f|cut -d'>' -f2`"
  done
@@ -34,22 +18,6 @@
  
 --- VirtualBox-3.1.2_OSE/src/VBox/HostDrivers/linux/export_modules.org	2010-01-12 13:08:56.187604615 +0100
 +++ VirtualBox-3.1.2_OSE/src/VBox/HostDrivers/linux/export_modules	2010-01-12 13:14:32.244857217 +0100
-@@ -36,6 +36,7 @@
- PATH_LINUX="$PATH_ROOT/src/VBox/HostDrivers/linux"
- PATH_VBOXDRV="$PATH_ROOT/src/VBox/HostDrivers/Support"
- PATH_VBOXNET="$PATH_ROOT/src/VBox/HostDrivers/VBoxNetFlt"
-+PATH_VBOXADP="$PATH_ROOT/src/VBox/HostDrivers/VBoxNetAdp"
- 
- VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
- VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
-@@ -44,6 +45,7 @@
- 
- . $PATH_VBOXDRV/linux/files_vboxdrv
- . $PATH_VBOXNET/linux/files_vboxnetflt
-+. $PATH_VBOXADP/linux/files_vboxnetadp
- 
- # Temporary path for creating the modules, will be removed later
- mkdir $PATH_TMP || exit 1
 @@ -90,6 +92,20 @@
      sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXNET/linux/Makefile > $PATH_TMP/vboxnetflt/Makefile
  fi

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.279 packages/VirtualBox/VirtualBox.spec:1.279.2.1
--- packages/VirtualBox/VirtualBox.spec:1.279	Wed Jun  2 23:23:29 2010
+++ packages/VirtualBox/VirtualBox.spec	Sat Jun  5 18:31:18 2010
@@ -28,21 +28,21 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		2
+%define		rel		1
 %define		pname	VirtualBox
 Summary:	VirtualBox OSE - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox OSE - wirtualizator sprzętu x86
 Name:		%{pname}%{_alt_kernel}
-Version:	3.1.8
+Version:	3.2.2
 Release:	%{rel}
 License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-OSE.tar.bz2
-# Source0-md5:	93b5caaac8571591c21b679987cbe518
+# Source0-md5:	a00884da2f5dd8dc2fad5e27940446c6
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
-# Source1-md5:	8561a2b883fbede1e93b7dfb2238e7cc
+# Source1-md5:	187f655c0df29a1e100bffc86cb1b918
 Source2:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source2-md5:	bfcf00607c6def732365bf83c6a45315
+# Source2-md5:	00647d660e3ffcb878617cd5e7f33e4e
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxguest.init
 Source5:	%{pname}-vboxnetflt.init
@@ -54,7 +54,6 @@
 Patch1:		%{pname}-configure-spaces.patch
 Patch2:		%{pname}-export_modules.patch
 Patch3:		%{pname}-VBoxSysInfo.patch
-Patch4:		%{pname}-gcc.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	rpmbuild(macros) >= 1.535
 %if %{with userspace}
@@ -365,7 +364,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %{__sed} -i -e 's,$VBOX_DOC_PATH,%{_docdir}/%{name}-%{version},' src/VBox/Installer/linux/virtualbox.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/linux/virtualbox.desktop
@@ -770,6 +768,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.279.2.1  2010/06/05 16:31:18  arvenil
+- up to 3.2.2
+- gcc patch already in sources
+- part of export_modules.patch already in sources
+- doesn't build; fails on warnings
+
 Revision 1.279  2010/06/02 21:23:29  hawk
 - Titanium uses xorg 1.7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox-export_modules.patch?r1=1.5&r2=1.5.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.279&r2=1.279.2.1&f=u

More information about the pld-cvs-commit mailing list