Accepting request 67216 from home:elvigia:branches:Virtualization

OBS-URL: https://build.opensuse.org/request/show/67216
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=40

vbox-xpcom-kmk.diff

@@ -1,15 +0,0 @@
---- VirtualBox-4.0.2_OSE.orig/src/libs/xpcom18a4/Makefile.kmk	2011-01-14 20:19:30.000000000 +0000
-+++ VirtualBox-4.0.2_OSE/src/libs/xpcom18a4/Makefile.kmk	2011-02-05 18:09:05.797482000 +0000
-@@ -471,9 +471,11 @@
-  xpidl_CFLAGS = \
- 	$(libIDL_config_cflags)
-  xpidl_LDFLAGS = \
--	$(libIDL_config_libs)
-+	$(filter-out -l%,$(libIDL_config_libs))
-  xpidl_LDFLAGS.linux = \
- 	$(VBOX_LD_as_needed)
-+ xpidl_LIBS = \
-+	$(patsubst -l%,%,$(filter -l%,$(libIDL_config_libs)))
- endif
- 
- #

virtualbox-ose_4.0.4-dfsg-1.diff.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb505615ce9dc6549b4c48b0c629a6d5e7513791269fc0dcea51885afa0edb0e
+size 85952

virtualbox.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 13 15:58:01 UTC 2011 - crrodriguez@opensuse.org
+
+- Fix build with as-needed 
+- DO not use static libstdc
+
 -------------------------------------------------------------------
 Mon Apr 11 19:32:03 UTC 2011 - crrodriguez@opensuse.org
 

virtualbox.spec

@@ -30,7 +30,7 @@ BuildRequires:  bin86 dev86 libidl-devel libqt4-devel libxslt-devel yasm
 BuildRequires:  SDL-devel kernel-syms module-init-tools
 BuildRequires:  e2fsprogs-devel libcap-devel libcurl-devel python-devel update-desktop-files
 BuildRequires:  hal-devel pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk
-BuildRequires:  LibVNCServer-devel gcc gcc-c++ kbuild pam-devel udev
+BuildRequires:  LibVNCServer-devel gcc gcc-c++ kbuild pam-devel udev quilt
 %if %suse_version > 1110
 BuildRequires:  zlib-devel-static
 %endif
@@ -83,7 +83,6 @@ Patch5:         vbox-config.diff
 #see thread : http://lists.freebsd.org/pipermail/freebsd-acpi/2010-October/006795.html
 Patch6:         vbox-smc-napa.diff
 #fix build of Python and dev package on openSUSE 11.3
-Patch7:         vbox-xpcom-kmk.diff
 Patch8:         vbox-python-detection.diff
 #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user
 #try to start VirtualBox and is not memeber of vboxusers group
@@ -93,6 +92,7 @@ Patch100:       vbox-no-build-dates.diff
 Patch101:       vbox-default-os-type.diff
 #disable update in vbox gui
 Patch102:         vbox-disable-updates.diff
+Patch103:       virtualbox-ose_4.0.4-dfsg-1.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         pwdutils permissions
 Requires:       %{name}-host-kmp = %version
@@ -201,24 +201,30 @@ Development file for %{name}
 ###########################################
 %prep
 %setup -q -n VirtualBox-%{version}_OSE
+%patch103 -p1
+export QUILT_PATCHES=debian/patches
+#echo "18-system-xorg.patch" > debian/patches/series
+echo "22-no-static-libstdcpp.patch" > debian/patches/series
+echo "29-fix-ftbfs-as-needed.patch" >> debian/patches/series
+quilt push -a
 %patch1
 %patch2
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %patch99 -p1
 %patch100
 %patch101
 %patch102 -p1
+
 #copy user manual
 %__cp %{S:1} ./UserManual.pdf
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.
 # So we disable it here, if you want to retest, just delete this comment and the line below.
-export SUSE_ASNEEDED=0
+#export SUSE_ASNEEDED=0
 #
 #	--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