← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/29-fix-ftbfs-as-needed.patch

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/29-fix-ftbfs-as-needed.patch
1
1
Description: Fix FTBFS with ld --as-needed.
2
 
Origin: vendor, http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/files/virtualbox-4-asneeded.patch?revision=1.2
 
2
Origin: vendor, http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch?revision=1.2&view=markup
3
3
 
4
 
--- VirtualBox-4.0.0_OSE/src/libs/xpcom18a4/Makefile.kmk
5
 
+++ VirtualBox-4.0.0_OSE/src/libs/xpcom18a4/Makefile.kmk
6
 
@@ -469,9 +469,11 @@
7
 
  libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags)
8
 
  libIDL_config_libs   := $(shell $(VBOX_LIBIDL_CONFIG) --libs)
9
 
  xpidl_CFLAGS = \
10
 
-       $(libIDL_config_cflags)
11
 
+       $(shell pkg-config --cflags libIDL-2.0)
12
 
  xpidl_LDFLAGS = \
13
 
-       $(libIDL_config_libs)
14
 
+       $(shell pkg-config --libs-only-L libIDL-2.0)
15
 
+xpidl_LIBS.linux = \
16
 
+       $(shell pkg-config --libs-only-l libIDL-2.0 | sed -e 's/-l//g')
17
 
  xpidl_LDFLAGS.linux = \
18
 
        $(VBOX_LD_as_needed)
19
 
 endif
20
4
--- VirtualBox-4.0.0_OSE/Config.kmk
21
5
+++ VirtualBox-4.0.0_OSE/Config.kmk
22
6
@@ -4082,7 +4082,7 @@