summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-01-13 13:06:41 +0100
committerRemi Collet <fedora@famillecollet.com>2013-01-13 13:06:41 +0100
commitaef9bbfaf909ba9f0acc9e63a77041ce7c572617 (patch)
tree5932b370cf58460c3c0ab388952a6757743be97e
parent1d5a7ad885c24fb1d5603c57e1b3c3fbd98d6ae4 (diff)
Xulrunner: sync with rawhide, re-enable webrtc
-rw-r--r--rhbz-304121.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/rhbz-304121.patch b/rhbz-304121.patch
new file mode 100644
index 0000000..941aca2
--- /dev/null
+++ b/rhbz-304121.patch
@@ -0,0 +1,13 @@
+diff -up firefox-18.0/mozilla-release/media/webrtc/trunk/Makefile.old firefox-18.0/mozilla-release/media/webrtc/trunk/Makefile
+diff -up firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.old firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+--- firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.old 2013-01-05 00:44:41.000000000 +0100
++++ firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-10 14:48:58.418321640 +0100
+@@ -376,7 +376,7 @@ class MakefileGenerator(object):
+ WriteMakefile(output_file, data, build_file, depth, top,
+ # we set srcdir up one directory, since the subdir
+ # doesn't actually exist in the source directory
+- swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
++ swapslashes(os.path.normpath(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0]))),
+ self.relative_srcdir)
+ return True
+