rediff patches

diff --git a/Disable-js-JIT-on-x32.patch b/Disable-js-JIT-on-x32.patch
index d5a603dff3dac158b08ca043adfeb9f43f27d9de..744981be5ee320898f8f0c688e8ad1957d520b30 100644 (file)
--- a/Disable-js-JIT-on-x32.patch
+++ b/Disable-js-JIT-on-x32.patch
@@ -11,8 +11,8 @@ Index: mozjs24-24.2.0/js/src/configure.in
 +x86_64*-gnux32)
 +    ;;
  i?86-*)
 +x86_64*-gnux32)
 +    ;;
  i?86-*)

-     ENABLE_METHODJIT=1

      ENABLE_ION=1
      ENABLE_ION=1

+     AC_DEFINE(JS_CPU_X86)

 --- mozjs-24.2.0/js/src/configure~     2013-12-11 23:23:20.000000000 +0100
 +++ mozjs-24.2.0/js/src/configure      2015-03-23 22:55:24.995319443 +0100
 @@ -8243,6 +8243,8 @@
 --- mozjs-24.2.0/js/src/configure~     2013-12-11 23:23:20.000000000 +0100
 +++ mozjs-24.2.0/js/src/configure      2015-03-23 22:55:24.995319443 +0100
 @@ -8243,6 +8243,8 @@


@@ -22,5 +22,5 @@ Index: mozjs24-24.2.0/js/src/configure.in
 +x86_64*-gnux32)
 +    ;;
  i?86-*)
 +x86_64*-gnux32)
 +    ;;
  i?86-*)

-     ENABLE_METHODJIT=1

      ENABLE_ION=1
      ENABLE_ION=1

+     cat >> confdefs.pytmp <<\EOF

diff --git a/mozjs38-pkg-config-version.patch b/mozjs38-pkg-config-version.patch
index 34a43d1f6df8a39f1635082370925a0a0e504e58..effd724141068d1b8c75a11e0808efaf39643aec 100644 (file)
--- a/mozjs38-pkg-config-version.patch
+++ b/mozjs38-pkg-config-version.patch
@@ -9,7 +9,7 @@ Index: b/js/src/Makefile.in
 +++ b/js/src/Makefile.in
 @@ -214,10 +214,10 @@
  $(JS_CONFIG_NAME): js-config
 +++ b/js/src/Makefile.in
 @@ -214,10 +214,10 @@
  $(JS_CONFIG_NAME): js-config

-    cp $^ $@
+       cp $^ $@

  
 -$(LIBRARY_NAME).pc: js.pc
 +$(JS_LIBRARY_NAME).pc: js.pc
  
 -$(LIBRARY_NAME).pc: js.pc
 +$(JS_LIBRARY_NAME).pc: js.pc

diff --git a/mozjs38-system-virtualenv.patch b/mozjs38-system-virtualenv.patch
index debc326dc7349190c0e0884f5f67b690bfaf82fd..bd34b88242b05d00563258554b21002d1728dfc8 100644 (file)
--- a/mozjs38-system-virtualenv.patch
+++ b/mozjs38-system-virtualenv.patch
@@ -9,4 +9,4 @@
 +        return '/usr/bin/virtualenv-2'
  
      @property
 +        return '/usr/bin/virtualenv-2'
  
      @property

-     def python_path(self):
+     def bin_path(self):