# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1389084772 -3600
# Node ID c2baa065e3cda0de2584c0bd948a829fe37c68c3
# Parent  ac3e73b8c89d55c25e70e7573c415cdde9de9bd1
update to 27.0b4
- removed upstreamed mozilla-system-nspr.patch

diff -r ac3e73b8c89d -r c2baa065e3cd MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Thu Jan 02 22:30:26 2014 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Tue Jan 07 09:52:52 2014 +0100
@@ -1,11 +1,9 @@
 -------------------------------------------------------------------
-Sat Dec 28 20:10:57 UTC 2013 - wr@rosenauer.org
-
-- update to Firefox 27.0b2
+Tue Jan  7 08:51:56 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 27.0b4
 - requires NSS 3.15.4 or higher
 - rebased/reworked patches
-- added mozilla-system-nspr.patch to allow system NSPR builds
-  (bmo#953130)
 
 -------------------------------------------------------------------
 Thu Dec 12 21:19:54 UTC 2013 - uweigand@de.ibm.com
diff -r ac3e73b8c89d -r c2baa065e3cd MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Jan 02 22:30:26 2014 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Jan 07 09:52:52 2014 +0100
@@ -105,10 +105,9 @@
 Patch12:        mozilla-arm-disable-edsp.patch
 Patch13:        mozilla-ppc.patch
 Patch14:        mozilla-libproxy-compat.patch
-Patch15:        mozilla-system-nspr.patch
-Patch16:        mozilla-ppc64le.patch
-Patch17:        mozilla-libffi-ppc64le.patch
-Patch18:        mozilla-xpcom-ppc64le.patch
+Patch15:        mozilla-ppc64le.patch
+Patch16:        mozilla-libffi-ppc64le.patch
+Patch17:        mozilla-xpcom-ppc64le.patch
 # Firefox/browser
 Patch30:        firefox-browser-css.patch
 Patch31:        firefox-kde.patch
@@ -243,7 +242,6 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p1
 #
 %patch30 -p1
 %if %suse_version >= 1110
diff -r ac3e73b8c89d -r c2baa065e3cd MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Thu Jan 02 22:30:26 2014 +0100
+++ b/MozillaFirefox/create-tar.sh	Tue Jan 07 09:52:52 2014 +0100
@@ -2,7 +2,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_27_0b2_RELEASE"
+RELEASE_TAG="FIREFOX_27_0b4_RELEASE"
 VERSION="26.99"
 
 # mozilla
diff -r ac3e73b8c89d -r c2baa065e3cd MozillaFirefox/mozilla-system-nspr.patch
--- a/MozillaFirefox/mozilla-system-nspr.patch	Thu Jan 02 22:30:26 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-system-nspr.patch
\ No newline at end of file
diff -r ac3e73b8c89d -r c2baa065e3cd mozilla-system-nspr.patch
--- a/mozilla-system-nspr.patch	Thu Jan 02 22:30:26 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-# HG changeset patch
-# Parent 59d243709baef41e90fe91254a620c4f5215bb1e
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-
-diff --git a/content/media/Latency.cpp b/content/media/Latency.cpp
---- a/content/media/Latency.cpp
-+++ b/content/media/Latency.cpp
-@@ -4,17 +4,17 @@
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
- // We want this available in opt builds
- #define FORCE_PR_LOG
- 
- #include "Latency.h"
- #include "nsThreadUtils.h"
--#include <prlog.h>
-+#include "prlog.h"
- #include <cmath>
- #include <algorithm>
- 
- #include <mozilla/Services.h>
- #include <mozilla/StaticPtr.h>
- #include "nsContentUtils.h"
- 
- using namespace mozilla;
-diff --git a/content/media/Latency.h b/content/media/Latency.h
---- a/content/media/Latency.h
-+++ b/content/media/Latency.h
-@@ -3,17 +3,17 @@
- /* This Source Code Form is subject to the terms of the Mozilla Public
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
- #ifndef MOZILLA_LATENCY_H
- #define MOZILLA_LATENCY_H
- 
- #include "mozilla/TimeStamp.h"
--#include "nspr/prlog.h"
-+#include "prlog.h"
- #include "nsCOMPtr.h"
- #include "nsIThread.h"
- #include "mozilla/Monitor.h"
- #include "nsISupportsImpl.h"
- #include "nsObserverService.h"
- 
- class AsyncLatencyLogger;
- class LogEvent;
diff -r ac3e73b8c89d -r c2baa065e3cd series
--- a/series	Thu Jan 02 22:30:26 2014 +0100
+++ b/series	Tue Jan 07 09:52:52 2014 +0100
@@ -17,7 +17,6 @@
 mozilla-ppc.patch
 mozilla-idldir.patch
 mozilla-libproxy-compat.patch
-mozilla-system-nspr.patch
 mozilla-ppc64le.patch
 mozilla-libffi-ppc64le.patch
 mozilla-xpcom-ppc64le.patch