Xulrunner / Firefox 14.0.1

3 files changed, 48 insertions, 50 deletions

diff --git a/mozilla-691898.patch b/mozilla-691898.patch
index 441862d..d138d84 100644
--- a/mozilla-691898.patch
+++ b/mozilla-691898.patch
@@ -1,7 +1,7 @@
-diff -up xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h
---- xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898	2012-06-01 14:04:02.000000000 +0200
-+++ xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h	2012-06-04 10:43:23.694175924 +0200
-@@ -467,8 +467,6 @@ public:
+diff -up xulrunner-14.0.1/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 xulrunner-14.0.1/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h
+--- xulrunner-14.0.1/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898	2012-07-13 23:42:56.000000000 +0200
++++ xulrunner-14.0.1/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h	2012-07-16 13:46:03.512655482 +0200
+@@ -468,8 +468,6 @@ public:
      {
          sync_instruction_memory((caddr_t)code, size);
      }
@@ -10,12 +10,12 @@ diff -up xulrunner-13.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator
  #endif
  
  private:
-diff -up xulrunner-13.0/mozilla-release/js/src/Makefile.in.691898 xulrunner-13.0/mozilla-release/js/src/Makefile.in
---- xulrunner-13.0/mozilla-release/js/src/Makefile.in.691898	2012-06-01 14:04:02.000000000 +0200
-+++ xulrunner-13.0/mozilla-release/js/src/Makefile.in	2012-06-04 10:45:57.023808537 +0200
-@@ -337,20 +337,23 @@ CPPSRCS += 	checks.cc \
- # END enclude sources for V8 dtoa
- #############################################
+diff -up xulrunner-14.0.1/mozilla-release/js/src/Makefile.in.691898 xulrunner-14.0.1/mozilla-release/js/src/Makefile.in
+--- xulrunner-14.0.1/mozilla-release/js/src/Makefile.in.691898	2012-07-13 23:42:56.000000000 +0200
++++ xulrunner-14.0.1/mozilla-release/js/src/Makefile.in	2012-07-16 13:48:34.039399155 +0200
+@@ -320,20 +320,22 @@ endif
+ 
+ endif
  
 -# For architectures without YARR JIT, PCRE is faster than the YARR
 -# interpreter (bug 684559).
@@ -23,11 +23,11 @@ diff -up xulrunner-13.0/mozilla-release/js/src/Makefile.in.691898 xulrunner-13.0
  ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
  
 -VPATH +=        $(srcdir)/yarr/pcre \
+-		$(NULL)
 +VPATH +=	$(srcdir)/assembler \
 +		$(srcdir)/assembler/wtf \
 +		$(srcdir)/assembler/jit \
 +		$(srcdir)/yarr \
- 		$(NULL)
  
 -CPPSRCS += \
 -                pcre_compile.cpp \
@@ -47,15 +47,15 @@ diff -up xulrunner-13.0/mozilla-release/js/src/Makefile.in.691898 xulrunner-13.0
  		$(NULL)
  else
  
-@@ -918,4 +921,3 @@ endif
+@@ -903,4 +905,3 @@ endif
  #
  # END kludges for the Nitro assembler
  ###############################################
 -
-diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp
---- xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898	2012-06-01 14:04:05.000000000 +0200
-+++ xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp	2012-06-04 10:43:23.695175928 +0200
-@@ -167,7 +167,6 @@ MatchPairs::checkAgainst(size_t inputLen
+diff -up xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.cpp
+--- xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.cpp.691898	2012-07-13 23:42:59.000000000 +0200
++++ xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.cpp	2012-07-16 13:46:03.897657354 +0200
+@@ -168,7 +168,6 @@ MatchPairs::checkAgainst(size_t inputLen
  
  /* detail::RegExpCode */
  
@@ -63,7 +63,7 @@ diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrun
  void
  RegExpCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
  {
-@@ -199,46 +198,9 @@ RegExpCode::reportYarrError(JSContext *c
+@@ -200,46 +199,9 @@ RegExpCode::reportYarrError(JSContext *c
      }
  }
  
@@ -110,7 +110,7 @@ diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrun
      /* Parse the pattern. */
      ErrorCode yarrError;
      YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
-@@ -255,7 +217,7 @@ RegExpCode::compile(JSContext *cx, JSLin
+@@ -256,7 +218,7 @@ RegExpCode::compile(JSContext *cx, JSLin
       * case we have to bytecode compile it.
       */
  
@@ -119,7 +119,7 @@ diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrun
      if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
          JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx);
          if (!execAlloc) {
-@@ -276,21 +238,11 @@ RegExpCode::compile(JSContext *cx, JSLin
+@@ -277,21 +239,11 @@ RegExpCode::compile(JSContext *cx, JSLin
          return false;
      }
  
@@ -143,7 +143,7 @@ diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrun
  }
  
  RegExpRunStatus
-@@ -305,19 +257,12 @@ RegExpCode::execute(JSContext *cx, const
+@@ -306,19 +258,12 @@ RegExpCode::execute(JSContext *cx, const
      else
          result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
  #else
@@ -164,10 +164,10 @@ diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrun
      JS_ASSERT(result >= 0);
      return RegExpRunStatus_Success;
  }
-diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h
---- xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h.691898	2012-06-01 14:04:05.000000000 +0200
-+++ xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h	2012-06-04 10:47:03.609081248 +0200
-@@ -51,10 +51,8 @@
+diff -up xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.h
+--- xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.h.691898	2012-07-13 23:42:59.000000000 +0200
++++ xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject.h	2012-07-16 13:46:03.897657354 +0200
+@@ -52,10 +52,8 @@
  #include "yarr/Yarr.h"
  #if ENABLE_YARR_JIT
  #include "yarr/YarrJIT.h"
@@ -179,7 +179,7 @@ diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunne
  
  /*
   * JavaScript Regular Expressions
-@@ -112,68 +110,51 @@ namespace detail {
+@@ -113,68 +111,51 @@ namespace detail {
  
  class RegExpCode
  {
@@ -254,9 +254,9 @@ diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunne
      }
  
      bool compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags);
-diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h
---- xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898	2012-06-01 14:04:05.000000000 +0200
-+++ xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h	2012-06-04 10:43:23.695175928 +0200
+diff -up xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject-inl.h
+--- xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject-inl.h.691898	2012-07-13 23:42:59.000000000 +0200
++++ xulrunner-14.0.1/mozilla-release/js/src/vm/RegExpObject-inl.h	2012-07-16 13:46:03.898657360 +0200
 @@ -137,6 +137,7 @@ RegExpObject::setSticky(bool enabled)
      setSlot(STICKY_FLAG_SLOT, BooleanValue(enabled));
  }
@@ -273,9 +273,9 @@ diff -up xulrunner-13.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 xulr
  
  inline bool
  RegExpToShared(JSContext *cx, JSObject &obj, RegExpGuard *g)
-diff -up xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h.691898 xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h
---- xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h.691898	2012-06-01 14:04:05.000000000 +0200
-+++ xulrunner-13.0/mozilla-release/js/src/yarr/wtfbridge.h	2012-06-04 10:43:23.696175932 +0200
+diff -up xulrunner-14.0.1/mozilla-release/js/src/yarr/wtfbridge.h.691898 xulrunner-14.0.1/mozilla-release/js/src/yarr/wtfbridge.h
+--- xulrunner-14.0.1/mozilla-release/js/src/yarr/wtfbridge.h.691898	2012-07-13 23:42:59.000000000 +0200
++++ xulrunner-14.0.1/mozilla-release/js/src/yarr/wtfbridge.h	2012-07-16 13:46:03.898657360 +0200
 @@ -49,9 +49,7 @@
  #include "jsprvtd.h"
  #include "vm/String.h"
diff --git a/mozilla-nspr-build.patch b/mozilla-nspr-build.patch
deleted file mode 100644
index c3f285a..0000000
--- a/mozilla-nspr-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mozilla-release/hal/sandbox/PHal.ipdl.old mozilla-release/hal/sandbox/PHal.ipdl
---- mozilla-release/hal/sandbox/PHal.ipdl.old	2012-06-01 14:04:00.000000000 +0200
-+++ mozilla-release/hal/sandbox/PHal.ipdl	2012-06-05 09:15:02.524408100 +0200
-@@ -39,7 +39,7 @@
- 
- include protocol PContent;
- include protocol PBrowser;
--include "nspr/prtime.h";
-+include "prtime.h";
- include "mozilla/HalSensor.h";
- include "mozilla/HalTypes.h";
- 
diff --git a/xulrunner.spec b/xulrunner.spec
index 258a577..7c09a85 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -44,7 +44,7 @@
 # alpha_version should be set to the alpha number if using an alpha, 0 otherwise
 # beta_version  should be set to the beta number if using a beta, 0 otherwise
 # rc_version    should be set to the RC number if using an RC, 0 otherwise
-%global gecko_dir_ver 13
+%global gecko_dir_ver 14
 %global alpha_version 0
 %global beta_version  0
 %global rc_version    0
@@ -77,7 +77,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           %{shortname}%{gecko_dir_ver}
-Version:        13.0.1
+Version:        14.0.1
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -97,7 +97,6 @@ Patch14:        xulrunner-2.0-chromium-types.patch
 Patch17:        xulrunner-10.0-gcc47.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
 Patch18:        xulrunner-12.0-jemalloc-ppc.patch
-Patch19:        mozilla-nspr-build.patch
 
 
 # Fedora specific patches
@@ -153,10 +152,10 @@ Requires:       nss >= %{nss_version}
 %endif
 Provides:       gecko-libs = %{gecko_verrel}
 Provides:       gecko-libs%{?_isa} = %{gecko_verrel}
-Obsoletes:      xulrunner9
 Obsoletes:      xulrunner10
 Obsoletes:      xulrunner11
 Obsoletes:      xulrunner12
+Obsoletes:      xulrunner13
 
 %if %{?system_sqlite}
 BuildRequires:  sqlite-devel >= %{sqlite_version}
@@ -176,10 +175,10 @@ Group: Development/Libraries
 Obsoletes: mozilla-devel < 1.9
 Obsoletes: firefox-devel < 2.1
 Obsoletes: xulrunner-devel-unstable
-Obsoletes: xulrunner9-devel
 Obsoletes: xulrunner10-devel
 Obsoletes: xulrunner11-devel
 Obsoletes: xulrunner12-devel
+Obsoletes: xulrunner13-devel
 Provides: gecko-devel = %{gecko_verrel}
 Provides: gecko-devel%{?_isa} = %{gecko_verrel}
 Provides: gecko-devel-unstable = %{gecko_verrel}
@@ -260,7 +259,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 %patch14 -p1 -b .chromium-types
 %patch17 -p1 -b .gcc47
 %patch18 -p2 -b .jemalloc-ppc
-%patch19 -p1 -b .nspr
 
 %patch20 -p2 -b .pk
 %patch24 -p1 -b .static
@@ -471,6 +469,12 @@ EOF
 # Copy over the LICENSE
 %{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir}
 
+# Install xpcshell
+%{__cp} objdir/dist/bin/xpcshell $RPM_BUILD_ROOT/%{mozappdir}
+
+# Install run-mozilla.sh
+%{__cp} objdir/dist/bin/run-mozilla.sh $RPM_BUILD_ROOT/%{mozappdir}
+
 # Use the system hunspell dictionaries
 %{__rm} -rf ${RPM_BUILD_ROOT}%{mozappdir}/dictionaries
 ln -s %{_datadir}/myspell ${RPM_BUILD_ROOT}%{mozappdir}/dictionaries
@@ -505,7 +509,7 @@ fi
 %{_bindir}/%{name}
 %dir %{mozappdir}
 %doc %attr(644, root, root) %{mozappdir}/LICENSE
-%doc %attr(644, root, root) %{mozappdir}/README.txt
+%doc %attr(644, root, root) %{mozappdir}/README.xulrunner
 %{mozappdir}/chrome
 %{mozappdir}/chrome.manifest
 %{mozappdir}/dictionaries
@@ -549,6 +553,12 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Jul 24 2012 Remi Collet <RPMS@FamilleCollet.com> - 14.0.1-1
+- Sync with rawhide, update to 14.0.1
+
+* Mon Jul 16 2012 Jan Horak <jhorak@redhat.com> - 14.0.1-1
+- Update to 14.0.1
+
 * Sun Jun 16 2012 Remi Collet <RPMS@FamilleCollet.com> - 13.0.1-1
 - Sync with rawhide, update to 13.0.1