[packages/xulrunner] - added gyp-slashism patch (try to eliminate double slashes); let's see if it helps debugedit

[qboosh]

commit 95a29b652e4e67399e4f8b1cbcc7fd569510ada2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jan 14 21:27:57 2013 +0100

    - added gyp-slashism patch (try to eliminate double slashes); let's see if it helps debugedit

 xulrunner-gyp-slashism.patch | 66 ++++++++++++++++++++++++++++++++++++++++++++
 xulrunner.spec               |  4 ++-
 2 files changed, 69 insertions(+), 1 deletion(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 771bed4..50e583c 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -41,6 +41,7 @@ Patch5:		system-cairo.patch
 Patch6:		idl-parser.patch
 # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
 Patch7:		system-virtualenv.patch
+Patch8:		%{name}-gyp-slashism.patch
 URL:		https://developer.mozilla.org/en/XULRunner
 %{!?with_qt:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	alsa-lib-devel
@@ -109,7 +110,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # disable debuginfo package due to debugedit not being able to do its job on libxul.so
 # same problem as: https://bugzilla.redhat.com/show_bug.cgi?id=304121
-%define		_enable_debug_packages		0
+#define		_enable_debug_packages		0
 
 %description
 XULRunner is a Mozilla runtime package that can be used to bootstrap
@@ -198,6 +199,7 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
 %patch5 -p2
 %patch6 -p2
 %patch7 -p2
+%patch8 -p2
 
 # config/rules.mk is patched by us and js/src/config/rules.mk
 # is supposed to be exact copy
diff --git a/xulrunner-gyp-slashism.patch b/xulrunner-gyp-slashism.patch
new file mode 100644
index 0000000..ccab456
--- /dev/null
+++ b/xulrunner-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)
+     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/xulrunner.git/commitdiff/95a29b652e4e67399e4f8b1cbcc7fd569510ada2