jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 67216 from home:elvigia:branches:Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/67216
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=40
This commit is contained in:
Cristian Rodríguez 2011-04-13 16:03:05 +00:00 committed by Git OBS Bridge
parent 2e85c272a9
commit a2ec73f0a1
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vbox-xpcom-kmk.diff
View File

@ -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
#

3
virtualbox-ose_4.0.4-dfsg-1.diff.gz Normal file
View File

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

6
virtualbox.changes
View File

@ -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

58
virtualbox.spec
View File

@ -30,9 +30,9 @@ 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
%if %suse_version > 1110
BuildRequires: zlib-devel-static
BuildRequires: LibVNCServer-devel gcc gcc-c++ kbuild pam-devel udev quilt
%if %suse_version > 1110
BuildRequires: zlib-devel-static
%endif
%ifarch amd64 x86_64 ia32e em64t
BuildRequires: hal-32bit
@ -49,9 +49,9 @@ License: GPLv2+
Group: System/Emulators/PC
Url: http://www.virtualbox.org/
#
# so you don't need to repack virtualbox by hand, just add new release of VirtualBox-x.x.x.tar.bz2 and line below with
# so you don't need to repack virtualbox by hand, just add new release of VirtualBox-x.x.x.tar.bz2 and line below with
# script virtualbox-patch-source.sh will do the job :)
# WARNING: This is not a comment, but the real command to repack souce
# WARNING: This is not a comment, but the real command to repack souce
#%(bash %{_sourcedir}/virtualbox-patch-source.sh VirtualBox-%{version}.tar.bz2)
Source0: VirtualBox-%{version}-patched.tar.bz2
Source1: VirtualBox-%{version}-UserManual.pdf
@ -70,7 +70,7 @@ Source12: %{name}-vboxes
Source13: %{name}-sysconfig.vbox
Source98: %{name}-%{version}-rpmlintrc
Source99: %{name}-patch-source.sh
#rework init script
#rework init script
Patch1: vbox-vboxdrv-init-script.diff
Patch2: vbox-vboxadd-init-script.diff
#fix return values which trigger post build checks and coused build error - should goes to upstream
@ -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
@ -158,7 +158,7 @@ Provides: xorg-x11-driver-virtualbox-ose = %version
Obsoletes: xorg-x11-driver-virtualbox-ose < %version
%description guest-x11
VirtualBox
VirtualBox
This package contains X11 guest utilities and X11 guest mouse and video drivers
###########################################
%package guest-tools
@ -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
%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
@ -233,8 +239,8 @@ export SUSE_ASNEEDED=0
source env.sh
#
# VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file
# VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui
# VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file
# VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui
# -j1 disable parallel build to avoid "Out of memory: Kill process" crash of build in buildservice
/usr/bin/kmk \
-j1 \
@ -315,7 +321,7 @@ echo "entering virtualbox-kmp-guest and virtualbox-kmp-host install section"
export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
export INSTALL_MOD_DIR=updates
#to install modules we use here similar steps like in build phase, go trought the all modules :
for module_name in vbox{drv,netflt,netadp,guest,sf,video}
for module_name in vbox{drv,netflt,netadp,guest,sf,video}
do
#and trought the all flavors
for flavor in %flavors_to_build; do
@ -358,7 +364,7 @@ pushd out/linux.*/release/bin/additions/
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%__install -m 755 vboxvideo_drv_18.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else
%else
%if %suse_version == 1120
%__install -m 755 vboxmouse_drv_16.so \
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
@ -402,10 +408,10 @@ pushd out/linux.*/release/bin
# create links to vbox tools in PATH - they could be usefull for controlling vbox from command line
%__ln_s %{_vbox_instdir}/VBoxManage %{buildroot}%{_bindir}/VBoxManage
%__ln_s %{_vbox_instdir}/VBoxHeadless \
%{buildroot}%{_bindir}/VBoxHeadless
%{buildroot}%{_bindir}/VBoxHeadless
%__ln_s %{_vbox_instdir}/VBoxSDL %{buildroot}%{_bindir}/VBoxSDL
%__ln_s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
%__install -m 755 VBoxSVC %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxSVC %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxXPCOMIPCD %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxExtPackHelperApp %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxTestOGL %{buildroot}%{_vbox_instdir}
@ -443,7 +449,7 @@ popd
# modify and install the vboxdrv init script
# TODO: some of this stuff breaks the fillup macros below?
# TODO: some of this stuff breaks the fillup macros below?
%__sed -i "s|%NOLSB%|yes|g;s|%DEBIAN%||g;s|%PACKAGE%|virtualbox|g" src/VBox/Installer/linux/vboxdrv.sh.in
%__install -m 744 src/VBox/Installer/linux/vboxdrv.sh.in \
%{buildroot}%{_sysconfdir}/init.d/vboxdrv
@ -465,7 +471,7 @@ pushd out/linux.*/release/bin/sdk/installer
VBOX_INSTALL_PATH=%{_vbox_instdir} python vboxapisetup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=%{_tmppath}/SITE_FILES
popd
%__install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom
%__cp -r out/linux.*/release/bin/sdk/bindings/xpcom/python %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom
%__cp -r out/linux.*/release/bin/sdk/bindings/xpcom/python %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom
%py_compile %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom/python
######################################################
@ -500,16 +506,16 @@ groupadd -r vboxusers 2>/dev/null || :
%fillup_only -an vboxes
%if %suse_version >=1140
%set_permissions
%else
%else
%run_permissions
%endif
%endif
%post qt
%if %suse_version >=1140
%set_permissions
%else
%else
%run_permissions
%endif
%endif
%verifyscript
@ -519,7 +525,7 @@ groupadd -r vboxusers 2>/dev/null || :
%if %suse_version > 1110
%verify_permissions -e %{_vbox_instdir}/VBoxNetAdpCtl
%endif
%verify_permissions -e %{_vbox_instdir}/VBoxBFE -e %{_vbox_instdir}/VBoxHeadless -e %{_vbox_instdir}/VBoxSDL
%verify_permissions -e %{_vbox_instdir}/VBoxBFE -e %{_vbox_instdir}/VBoxHeadless -e %{_vbox_instdir}/VBoxSDL
%verifyscript qt
%verify_permissions -e %{_vbox_instdir}/VirtualBox
@ -532,7 +538,7 @@ groupadd -r vboxusers 2>/dev/null || :
exit 0
%preun guest-tools
%stop_on_removal vboxadd
%stop_on_removal vboxadd
exit 0
%postun
@ -552,7 +558,7 @@ exit 0
%defattr(-, root, root)
%doc UserManual.pdf
%{_bindir}/VBoxManage
%{_bindir}/VBoxHeadless
%{_bindir}/VBoxHeadless
%{_bindir}/VBoxSDL
%{_bindir}/VBoxTunctl
%dir %{_vbox_instdir}