[seamonkey/el6] Fix #304121. No rebuild needed, as webrtc is disabled for now.
Dmitry Butskoy
buc at fedoraproject.org
Mon Jan 14 16:04:44 UTC 2013
commit 8da9a506d8cf4d7d40413e73f2c14fa7de9ddff0
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Mon Jan 14 20:04:05 2013 +0400
Fix #304121. No rebuild needed, as webrtc is disabled for now.
seamonkey-2.15-rhbz_304121.patch | 12 ++++++++++++
seamonkey.spec | 5 +++++
2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/seamonkey-2.15-rhbz_304121.patch b/seamonkey-2.15-rhbz_304121.patch
new file mode 100644
index 0000000..b5064d7
--- /dev/null
+++ b/seamonkey-2.15-rhbz_304121.patch
@@ -0,0 +1,12 @@
+diff -Nrbu seamonkey-2.15/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py seamonkey-2.15-OK/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+--- seamonkey-2.15/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-06 10:26:26.000000000 +0400
++++ seamonkey-2.15-OK/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-14 17:51:55.668267309 +0400
+@@ -376,7 +376,7 @@
+ 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
+
diff --git a/seamonkey.spec b/seamonkey.spec
index f202e53..8d6acc3 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -51,6 +51,7 @@ Patch1: xulrunner-15.0-gcc47.patch
Patch5: seamonkey-8.0-enable-addons.patch
Patch10: seamonkey-idl-parser-cachepath.patch
Patch20: seamonkey-2.13-jemalloc.patch
+Patch21: seamonkey-2.15-rhbz_304121.patch
Patch22: seamonkey-2.14-installdir.patch
Patch23: seamonkey-2.14-elfhack.patch
Patch24: seamonkey-2.15-nspr_4_9_1.patch
@@ -138,6 +139,7 @@ popd
%patch10 -p2 -b .idl-parser-cachepath
%patch20 -p1 -b .jemalloc
+%patch21 -p2 -b .rhbz304121
%patch22 -p2 -b .installdir
%patch23 -p2 -b .elfhack
@@ -476,6 +478,9 @@ fi
%changelog
+* Mon Jan 14 2013 Dmitry Butskoy <Dmitry at Butskoy.name>
+- add fix for #304121 (derived from Xulrunner)
+
* Wed Jan 9 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.15-1
- update to 2.15
- disable WebRTC support until nss >= 3.14 appear in RHEL6
More information about the scm-commits
mailing list