From 9aef81ed84c99a06e3197d136857057671778f1a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 04 2019 20:02:20 +0000
Subject: import firefox-68.1.0-1.el8_0


---

diff --git a/.firefox.metadata b/.firefox.metadata
index 1d7b40a..b448290 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,6 +1,6 @@
 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
 e86c38c48960b95353503b78e1de9ddca1ed34d7 SOURCES/cbindgen-vendor.tar.xz
-b97d8a86871300a121476145303c144eea7169da SOURCES/firefox-68.0.1esr.source.tar.xz
+c24f8036294edba40fd36f52a9dbe2cfe30cd229 SOURCES/firefox-68.1.0esr.source.tar.xz
 6724218efbb1f3fa14541cb2f255970b98446a45 SOURCES/firefox-symbolic.svg
 0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
 e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
diff --git a/.gitignore b/.gitignore
index 13eb8b4..48624d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 SOURCES/Python-2.7.13.tar.xz
 SOURCES/cbindgen-vendor.tar.xz
-SOURCES/firefox-68.0.1esr.source.tar.xz
+SOURCES/firefox-68.1.0esr.source.tar.xz
 SOURCES/firefox-symbolic.svg
 SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/build-ppc64le-inline.patch b/SOURCES/build-ppc64le-inline.patch
new file mode 100644
index 0000000..de0f6d9
--- /dev/null
+++ b/SOURCES/build-ppc64le-inline.patch
@@ -0,0 +1,27 @@
+diff -up firefox-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp.ppc64le-inline firefox-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp
+--- firefox-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp.ppc64le-inline	2019-08-26 18:52:28.000000000 +0200
++++ firefox-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp	2019-08-29 08:49:57.695687874 +0200
+@@ -1092,7 +1092,11 @@ class MOZ_STACK_CLASS CallMethodHelper f
+   MOZ_ALWAYS_INLINE bool GetOutParamSource(uint8_t paramIndex,
+                                            MutableHandleValue srcp) const;
+ 
++#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
++  bool GatherAndConvertResults();
++#else
+   MOZ_ALWAYS_INLINE bool GatherAndConvertResults();
++#endif
+ 
+   MOZ_ALWAYS_INLINE bool QueryInterfaceFastPath();
+ 
+@@ -1139,7 +1143,11 @@ class MOZ_STACK_CLASS CallMethodHelper f
+ 
+   ~CallMethodHelper();
+ 
++#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
++  bool Call();
++#else
+   MOZ_ALWAYS_INLINE bool Call();
++#endif
+ 
+   // Trace implementation so we can put our CallMethodHelper in a Rooted<T>.
+   void trace(JSTracer* aTrc);
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 3b755bd..8ec448c 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -8,7 +8,7 @@
 %if 0%{?rhel} == 8
 %global system_nss        1
 %else
-%global system_nss        0
+%global system_nss        1
 %endif
 %define use_bundled_ffi   0
 %if 0%{?rhel} == 8
@@ -159,8 +159,8 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        68.0.1
-Release:        3%{?pre_tag}%{?dist}
+Version:        68.1.0
+Release:        1%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 %if 0%{?rhel} == 7
@@ -172,7 +172,7 @@ ExclusiveArch:  i686 x86_64 ppc64 s390x
 
 Source0:        https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20190726.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20190828.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source10:       firefox-mozconfig
@@ -206,6 +206,7 @@ Source101:      https://www.python.org/ftp/python/%{bundled_python_version_3}/Py
 %endif
 # Build patches
 Patch1000:      python-2.7.patch
+Patch1001:      build-ppc64le-inline.patch
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
 Patch1:         no-rust-lto.patch
 Patch2:         rust-network-check.patch
@@ -535,6 +536,7 @@ https://extensions.gnome.org.
 
 #%patch500 -p1 -b .debug
 %patch501 -p1 -b .python-encode
+%patch1001 -p1 -b .ppc64le-inline
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -1295,6 +1297,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Aug 28 2019 Jan Horak <jhorak@redhat.com> - 68.1.0-1
+- Update to 68.1.0 ESR
+
+* Mon Aug 5 2019 Martin Stransky <stransky@redhat.com> - 68.0.1-4
+- Enable system nss
+
 * Mon Jul 29 2019 Martin Stransky <stransky@redhat.com> - 68.0.1-3
 - Enable official branding