[packages/iceweasel] - added gyp-slashism patch from xulrunner (try to eliminate double slashes) - rel 3

[baggins]

commit d3fcfd298ecd168c83617b194bf636d2eb2397d8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Apr 19 00:47:53 2013 +0200

    - added gyp-slashism patch from xulrunner (try to eliminate double slashes)
    - rel 3

 gyp-slashism.patch | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 iceweasel.spec     |  4 +++-
 2 files changed, 69 insertions(+), 1 deletion(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 43373ad..8ab419c 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -30,7 +30,7 @@ Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
 Version:	20.0.1
-Release:	2
+Release:	3
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
@@ -52,6 +52,7 @@ Patch11:	%{name}-middle_click_paste.patch
 Patch12:	%{name}-packaging.patch
 # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
 Patch13:	system-virtualenv.patch
+Patch14:	gyp-slashism.patch
 URL:		http://www.pld-linux.org/Packages/Iceweasel
 BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	OpenGL-devel
@@ -174,6 +175,7 @@ cd mozilla
 %patch11 -p2
 %patch12 -p2
 %patch13 -p2
+%patch14 -p2
 
 # config/rules.mk is patched by us and js/src/config/rules.mk
 # is supposed to be exact copy
diff --git a/gyp-slashism.patch b/gyp-slashism.patch
new file mode 100644
index 0000000..4c2f0ff
--- /dev/null
+++ b/gyp-slashism.patch
@@ -0,0 +1,66 @@
+--- xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.orig	2013-01-05 00:44:41.000000000 +0100
++++ xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py	2013-01-13 20:13:40.033894757 +0100
+@@ -114,6 +114,12 @@
+   if dir and not os.path.exists(dir):
+     os.makedirs(dir)
+ 
++def append_relative(base, rel):
++  if rel == '':
++    return base
++  else:
++    return base + '/' + rel
++
+ def GetFlavor(params):
+   """Returns |params.flavor| if it's set, the system's default flavor else."""
+   flavors = {
+@@ -142,9 +148,9 @@
+ 
+ def WriteMakefile(filename, data, build_file, depth, topsrcdir, srcdir, relative_path, extra_data=None):
+   if not os.path.isabs(topsrcdir):
+-    topsrcdir = depth + "/" + topsrcdir
++    topsrcdir = append_relative(depth, topsrcdir)
+   if not os.path.isabs(srcdir):
+-    srcdir = depth + "/" + srcdir
++    srcdir = append_relative(depth, srcdir)
+   #TODO: should compare with the existing file and not overwrite it if the
+   # contents are the same!
+   ensure_directory_exists(filename)
+@@ -261,7 +267,7 @@
+       qualified_target)
+     build_file = os.path.abspath(build_file)
+     rel_path, output_file = self.CalculateMakefilePath(build_file, target)
+-    subdepth = self.depth + "/" + getdepth(rel_path)
++    subdepth = append_relative(self.depth, getdepth(rel_path))
+     if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth):
+         # If WriteTargetMakefile returns True, then this is a useful target
+       dirs.append(rel_path)
+@@ -376,7 +382,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(append_relative(append_relative(top, self.relative_srcdir), os.path.split(rel_path)[0])),
+                   self.relative_srcdir,
+                   self.common_mk_path)
+     return True
+@@ -399,7 +405,7 @@
+   # The relative path from objdir to gyp_file_dir
+   srcdir = gyp.common.RelativePath(gyp_file_dir, objdir)
+   # The absolute path to the source dir
+-  abs_srcdir = topsrcdir + "/" + relative_srcdir
++  abs_srcdir = append_relative(topsrcdir, relative_srcdir)
+   # The path to get up to the root of the objdir from the output dir.
+   depth = getdepth(relative_srcdir)
+   # The output directory.
+@@ -408,9 +414,9 @@
+   makefile_path = os.path.join(output_dir, "Makefile")
+ 
+   def topsrcdir_path(path):
+-    return "$(topsrcdir)/" + swapslashes(gyp.common.RelativePath(path, topsrcdir))
++    return append_relative("$(topsrcdir)", swapslashes(gyp.common.RelativePath(path, topsrcdir)))
+   def objdir_path(path):
+-    return "$(DEPTH)/" + swapslashes(gyp.common.RelativePath(path, objdir))
++    return append_relative("$(DEPTH)", swapslashes(gyp.common.RelativePath(path, objdir)))
+ 
+   # Find the list of targets that derive from the gyp file(s) being built.
+   needed_targets = set()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/d3fcfd298ecd168c83617b194bf636d2eb2397d8