← Back to branch summary

~ubuntu-branches/ubuntu/natty/moon/natty

« back to all changes in this revision

Viewing changes to debian/patches/xulrunner_20.patch

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2011-01-31 16:04:45 UTC
  • Revision ID: package-import@ubuntu.com-20110131160445-dhh1gw64qo6nzw9k
Tags: 2.3-0ubuntu5
https://launchpad.net/bugs/538796
* Fix LP: #538796 - cannot open Firefox/Chromium/Chrome when moonlight
  is installed, due to a symbol collision with the icedtea plugin. Thanks
  to Evan Martin and Chris Toshok for figuring this out
  - add debian/patches/avoid_icedtea_symbol_collision.patch
  - update debian/patches/series
* Fix build with xulrunner 2.0
  - add debian/patches/xulrunner_20.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/xulrunner_20.patch
 
1
--- a/perf/perf-suite-tool/perf-suite-tool.cpp
 
2
+++ b/perf/perf-suite-tool/perf-suite-tool.cpp
 
3
@@ -41,6 +41,7 @@
 
4
 #include <sys/syscall.h>
 
5
 #include <sys/wait.h>
 
6
 #include <dlfcn.h>
 
7
+#include <mozilla-config.h>
 
8
 #include <gtkmozembed.h>
 
9
 #include <nsXPCOMGlue.h>
 
10
 
 
11
--- a/plugin/firefox/browser-http.inc
 
12
+++ b/plugin/firefox/browser-http.inc
 
13
@@ -1,3 +1,4 @@
 
14
+#include <mozilla-config.h>
 
15
 #include <nsCOMPtr.h>
 
16
 #include <nsXPCOM.h>
 
17
 #include <nsIURI.h>