68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate firefox68
authorWolfgang Rosenauer <wr@rosenauer.org>
Sat, 31 Aug 2019 21:57:57 +0200
branchfirefox68
changeset 1099 8a3c73e74e65
parent 1098 538cbf0bbdca
child 1100 e1c5065a014f
child 1103 54482415d6bd
68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate68.1.0 candidate
MozillaFirefox/MozillaFirefox.changes
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/mozilla-bmo1568145.patch
MozillaFirefox/mozilla-gcc-internal-compiler-error.patch
MozillaFirefox/source-stamp.txt
MozillaFirefox/tar_stamps
firefox-kde.patch
mozilla-bmo1568145.patch
mozilla-gcc-internal-compiler-error.patch
mozilla-kde.patch
series
--- a/MozillaFirefox/MozillaFirefox.changes	Fri Aug 30 23:43:39 2019 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sat Aug 31 21:57:57 2019 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Aug 30 20:49:11 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>
+
+- Mozilla Firefox 68.1.0
+- added mozilla-bmo1568145.patch to make builds reproducible
+- removed upstreamed patch mozilla-gcc-internal-compiler-error.patch
+
+-------------------------------------------------------------------
 Sun Aug 18 17:29:25 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
 
 - Mozilla Firefox 68.0.2:
--- a/MozillaFirefox/MozillaFirefox.spec	Fri Aug 30 23:43:39 2019 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat Aug 31 21:57:57 2019 +0200
@@ -19,12 +19,12 @@
 
 # changed with every update
 %define major          68
-%define mainver        %major.0.2
-%define orig_version   68.0.2
-%define orig_suffix    %{nil}
-%define update_channel release
+%define mainver        %major.1.0
+%define orig_version   68.1.0
+%define orig_suffix    esr
+%define update_channel esr68
 %define branding       1
-%define releasedate    20190813150448
+%define releasedate    20190826132627
 %define source_prefix  firefox-%{orig_version}
 
 # always build with GCC as SUSE Security Team requires that
@@ -168,12 +168,12 @@
 Patch7:         mozilla-cubeb-noreturn.patch
 Patch8:         mozilla-fix-aarch64-libopus.patch
 Patch9:         mozilla-disable-wasm-emulate-arm-unaligned-fp-access.patch
-Patch10:        mozilla-gcc-internal-compiler-error.patch
-Patch11:        mozilla-s390-context.patch
-Patch12:        mozilla-s390-bigendian.patch
-Patch13:        mozilla-reduce-rust-debuginfo.patch
-Patch14:        mozilla-ppc-altivec_static_inline.patch
-Patch15:        mozilla-bmo1005535.patch
+Patch10:        mozilla-s390-context.patch
+Patch11:        mozilla-s390-bigendian.patch
+Patch12:        mozilla-reduce-rust-debuginfo.patch
+Patch13:        mozilla-ppc-altivec_static_inline.patch
+Patch14:        mozilla-bmo1005535.patch
+Patch15:        mozilla-bmo1568145.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@@ -293,10 +293,10 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%ifarch s390x
 %patch11 -p1
-%ifarch s390x
+%endif
 %patch12 -p1
-%endif
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-bmo1568145.patch	Sat Aug 31 21:57:57 2019 +0200
@@ -0,0 +1,1 @@
+../mozilla-bmo1568145.patch
\ No newline at end of file
--- a/MozillaFirefox/mozilla-gcc-internal-compiler-error.patch	Fri Aug 30 23:43:39 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-gcc-internal-compiler-error.patch
\ No newline at end of file
--- a/MozillaFirefox/source-stamp.txt	Fri Aug 30 23:43:39 2019 +0200
+++ b/MozillaFirefox/source-stamp.txt	Sat Aug 31 21:57:57 2019 +0200
@@ -1,2 +1,2 @@
-REV=7ece03f6971968eede29275477502309bbe399da
-REPO=http://hg.mozilla.org/releases/mozilla-release
+REV=380fedbb18002297f1b233bd9c09764e59ddaa86
+REPO=http://hg.mozilla.org/releases/mozilla-esr68
--- a/MozillaFirefox/tar_stamps	Fri Aug 30 23:43:39 2019 +0200
+++ b/MozillaFirefox/tar_stamps	Sat Aug 31 21:57:57 2019 +0200
@@ -1,8 +1,8 @@
 PRODUCT="firefox"
-CHANNEL="release"
-VERSION="68.0.2"
-VERSION_SUFFIX=""
-FF_RELEASE_TAG="7ece03f6971968eede29275477502309bbe399da"
+CHANNEL="esr68"
+VERSION="68.1.0"
+VERSION_SUFFIX="esr"
+FF_RELEASE_TAG="380fedbb18002297f1b233bd9c09764e59ddaa86"
 TB_RELEASE_TAG=""
 PREV_VERSION=""
 PREV_VERSION_SUFFIX=""
--- a/firefox-kde.patch	Fri Aug 30 23:43:39 2019 +0200
+++ b/firefox-kde.patch	Sat Aug 31 21:57:57 2019 +0200
@@ -3,7 +3,7 @@
 # Date 1559300151 -7200
 #      Fri May 31 12:55:51 2019 +0200
 # Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec
-# Parent  428161c3b9599083e1b8710eda1760f1f707ab11
+# Parent  28bde69150771a1530f784903bf68214dd5790ea
 How to apply this patch:
 1. Import and apply it
 2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
@@ -11,9 +11,10 @@
 4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)
 5. hg qrefresh
 
-diff -r 428161c3b959 -r 54d41b0033b8 browser/base/content/browser-kde.xul
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/browser/base/content/browser-kde.xul	Fri May 31 12:55:51 2019 +0200
+diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
+new file mode 100644
+--- /dev/null
++++ b/browser/base/content/browser-kde.xul
 @@ -0,0 +1,1375 @@
 +#filter substitution
 +<?xml version="1.0"?>
@@ -1390,10 +1391,15 @@
 +    <!-- gNotificationBox will be added here lazily. -->
 +  </vbox>
 +</window>
-diff -r 428161c3b959 -r 54d41b0033b8 browser/base/jar.mn
---- a/browser/base/jar.mn	Mon Jun 17 09:02:06 2019 +0200
-+++ b/browser/base/jar.mn	Fri May 31 12:55:51 2019 +0200
-@@ -33,6 +33,8 @@
+diff --git a/browser/base/jar.mn b/browser/base/jar.mn
+--- a/browser/base/jar.mn
++++ b/browser/base/jar.mn
+@@ -28,16 +28,18 @@ browser.jar:
+         content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
+ *       content/browser/browser.css                   (content/browser.css)
+         content/browser/browser.js                    (content/browser.js)
+ #ifdef MOZ_BROWSER_XHTML
+ *       content/browser/browser.xhtml                 (content/browser.xhtml)
  #else
  *       content/browser/browser.xul                   (content/browser.xul)
  #endif
@@ -1402,10 +1408,20 @@
          content/browser/browser-addons.js             (content/browser-addons.js)
          content/browser/browser-allTabsMenu.js        (content/browser-allTabsMenu.js)
          content/browser/browser-captivePortal.js      (content/browser-captivePortal.js)
-diff -r 428161c3b959 -r 54d41b0033b8 browser/components/preferences/in-content/main.js
---- a/browser/components/preferences/in-content/main.js	Mon Jun 17 09:02:06 2019 +0200
-+++ b/browser/components/preferences/in-content/main.js	Fri May 31 12:55:51 2019 +0200
-@@ -294,6 +294,13 @@
+         content/browser/browser-ctrlTab.js            (content/browser-ctrlTab.js)
+         content/browser/browser-customization.js      (content/browser-customization.js)
+         content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
+         content/browser/browser-contentblocking.js    (content/browser-contentblocking.js)
+ #ifndef MOZILLA_OFFICIAL
+diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
+--- a/browser/components/preferences/in-content/main.js
++++ b/browser/components/preferences/in-content/main.js
+@@ -339,16 +339,23 @@ var gMainPane = {
+         }, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]);
+       };
+ 
+       window.setTimeout(() => {
+         window.requestIdleCallback(pollForDefaultBrowser);
        }, backoffTimes[this._backoffIndex]);
      }
  
@@ -1419,8 +1435,18 @@
      this.initBrowserContainers();
      this.buildContentProcessCountMenuList();
  
-@@ -983,6 +990,17 @@
+     let performanceSettingsLink = document.getElementById(
+       "performanceSettingsLearnMore"
+     );
+     let performanceSettingsUrl =
+       Services.urlFormatter.formatURLPref("app.support.baseURL") +
+@@ -1146,16 +1153,27 @@ var gMainPane = {
+       this._backoffIndex = 0;
+ 
+       let shellSvc = getShellService();
+       if (!shellSvc) {
          return;
+       }
        try {
          shellSvc.setDefaultBrowser(true, false);
 +        if (kde_session == 1) {
@@ -1437,10 +1463,20 @@
        } catch (ex) {
          Cu.reportError(ex);
          return;
-diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/moz.build
---- a/browser/components/shell/moz.build	Mon Jun 17 09:02:06 2019 +0200
-+++ b/browser/components/shell/moz.build	Fri May 31 12:55:51 2019 +0200
-@@ -33,6 +33,8 @@
+       }
+ 
+       let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
+       document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
+     }
+diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
+--- a/browser/components/shell/moz.build
++++ b/browser/components/shell/moz.build
+@@ -28,16 +28,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+     ]
+ elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+     XPIDL_SOURCES += [
+         'nsIGNOMEShellService.idl',
+     ]
  
      SOURCES += [
          'nsGNOMEShellService.cpp',
@@ -1449,9 +1485,15 @@
      ]
  elif CONFIG['OS_ARCH'] == 'WINNT':
      SOURCES += [
-diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/browser/components/shell/nsKDEShellService.cpp	Fri May 31 12:55:51 2019 +0200
+         'nsWindowsShellService.cpp',
+     ]
+     LOCAL_INCLUDES += [
+         '../../../other-licenses/nsis/Contrib/CityHash/cityhash',
+     ]
+diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
+new file mode 100644
+--- /dev/null
++++ b/browser/components/shell/nsKDEShellService.cpp
 @@ -0,0 +1,150 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -1603,9 +1645,10 @@
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +}
 +
-diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/browser/components/shell/nsKDEShellService.h	Fri May 31 12:55:51 2019 +0200
+diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h
+new file mode 100644
+--- /dev/null
++++ b/browser/components/shell/nsKDEShellService.h
 @@ -0,0 +1,32 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -1639,9 +1682,10 @@
 +};
 +
 +#endif // nskdeshellservice_h____
-diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.cpp
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/browser/components/shell/nsUnixShellService.cpp	Fri May 31 12:55:51 2019 +0200
+diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp
+new file mode 100644
+--- /dev/null
++++ b/browser/components/shell/nsUnixShellService.cpp
 @@ -0,0 +1,22 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -1665,9 +1709,10 @@
 +        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
 +    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
 +}
-diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/browser/components/shell/nsUnixShellService.h	Fri May 31 12:55:51 2019 +0200
+diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h
+new file mode 100644
+--- /dev/null
++++ b/browser/components/shell/nsUnixShellService.h
 @@ -0,0 +1,15 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -1684,10 +1729,15 @@
 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 +
 +#endif // nsunixshellservice_h____
-diff -r 428161c3b959 -r 54d41b0033b8 browser/installer/package-manifest.in
---- a/browser/installer/package-manifest.in	Mon Jun 17 09:02:06 2019 +0200
-+++ b/browser/installer/package-manifest.in	Fri May 31 12:55:51 2019 +0200
-@@ -299,6 +299,8 @@
+diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
+--- a/browser/installer/package-manifest.in
++++ b/browser/installer/package-manifest.in
+@@ -295,16 +295,18 @@
+ @RESPATH@/browser/defaults/settings/main
+ @RESPATH@/browser/defaults/settings/security-state
+ 
+ ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
+ ; Technically this is an app pref file, but we are keeping it in the original
  ; gre location for now.
  @RESPATH@/defaults/pref/channel-prefs.js
  
@@ -1696,3 +1746,8 @@
  ; Services (gre) prefs
  @RESPATH@/defaults/pref/services-sync.js
  
+ ; [Layout Engine Resources]
+ ; Style Sheets, Graphics and other Resources used by the layout engine.
+ @RESPATH@/res/EditorOverride.css
+ @RESPATH@/res/contenteditable.css
+ @RESPATH@/res/designmode.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-bmo1568145.patch	Sat Aug 31 21:57:57 2019 +0200
@@ -0,0 +1,30 @@
+Author: Bernhard M. Wiedemann <bwiedemann suse de>
+Date: 2019-07-22
+
+Allow to override build date with SOURCE_DATE_EPOCH
+in order to make builds reproducible.
+See https://reproducible-builds.org/ for why this is good
+and https://reproducible-builds.org/specs/source-date-epoch/
+for the definition of this variable.
+
+diff --git a/python/mozbuild/mozbuild/action/langpack_manifest.py b/python/mozbuild/mozbuild/action/langpack_manifest.py
+index 6f72697..d4cca96 100644
+--- a/python/mozbuild/mozbuild/action/langpack_manifest.py
++++ b/python/mozbuild/mozbuild/action/langpack_manifest.py
+@@ -16,6 +16,7 @@ import os
+ import json
+ import io
+ import datetime
++import time
+ import requests
+ import mozversioncontrol
+ import mozpack.path as mozpath
+@@ -100,7 +101,7 @@ def get_timestamp_for_locale(path):
+         dt = get_dt_from_hg(path)
+ 
+     if dt is None:
+-        dt = datetime.datetime.utcnow()
++        dt = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))
+ 
+     dt = dt.replace(microsecond=0)
+     return dt.strftime("%Y%m%d%H%M%S")
--- a/mozilla-gcc-internal-compiler-error.patch	Fri Aug 30 23:43:39 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# HG changeset patch
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent  88217eaa8804fc699c02411b1b5377ef7eb5d2db
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90756
-https://bugzilla.mozilla.org/show_bug.cgi?id=1562886
-
-diff --git a/gfx/skia/skia/third_party/skcms/src/Transform_inl.h b/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
---- a/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
-+++ b/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
-@@ -554,17 +554,18 @@ SI void sample_clut_16(const skcms_A2B* 
-     *r = cast<F>((rgb >>  0) & 0xffff) * (1/65535.0f);
-     *g = cast<F>((rgb >> 16) & 0xffff) * (1/65535.0f);
-     *b = cast<F>((rgb >> 32) & 0xffff) * (1/65535.0f);
- #endif
- }
- 
- // GCC 7.2.0 hits an internal compiler error with -finline-functions (or -O3)
- // when targeting MIPS 64,  I think attempting to inline clut() into exec_ops().
--#if 1 && defined(__GNUC__) && !defined(__clang__) && defined(__mips64)
-+// s390x and i*86 also hit this with GCC 7.4 and -O2
-+#if 1 && defined(__GNUC__) && !defined(__clang__) && ( defined(__mips64) || defined(__s390x__) || defined( __i586__ ) || defined( __i486__ ) || defined( __i386__ ))
-     #define MAYBE_NOINLINE __attribute__((noinline))
- #else
-     #define MAYBE_NOINLINE
- #endif
- 
- MAYBE_NOINLINE
- static void clut(const skcms_A2B* a2b, F* r, F* g, F* b, F a) {
-     const int dim = (int)a2b->input_channels;
--- a/mozilla-kde.patch	Fri Aug 30 23:43:39 2019 +0200
+++ b/mozilla-kde.patch	Sat Aug 31 21:57:57 2019 +0200
@@ -3,7 +3,7 @@
 # Date 1559294891 -7200
 #      Fri May 31 11:28:11 2019 +0200
 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
-# Parent  f11c2d7239c0caa4dc74272716d9e30ced1a1ca3
+# Parent  93495ad6fa0fe292eadcbfef14e0e27273528497
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -701,23 +701,29 @@
 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
-@@ -1042,30 +1042,60 @@ nsUnknownContentTypeDialog.prototype = {
- 
-       if (params.handlerApp &&
-           params.handlerApp.executable &&
-           params.handlerApp.executable.isFile()) {
+@@ -1204,36 +1204,66 @@ nsUnknownContentTypeDialog.prototype = {
+         params.handlerApp &&
+         params.handlerApp.executable &&
+         params.handlerApp.executable.isFile()
+       ) {
          // Remember the file they chose to run.
          this.chosenApp = params.handlerApp;
        }
      } else if ("@mozilla.org/applicationchooser;1" in Cc) {
 -      var nsIApplicationChooser = Ci.nsIApplicationChooser;
--      var appChooser = Cc["@mozilla.org/applicationchooser;1"]
--                         .createInstance(nsIApplicationChooser);
--      appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle"));
+-      var appChooser = Cc["@mozilla.org/applicationchooser;1"].createInstance(
+-        nsIApplicationChooser
+-      );
+-      appChooser.init(
+-        this.mDialog,
+-        this.dialogElement("strings").getString("chooseAppFilePickerTitle")
+-      );
 -      var contentTypeDialogObj = this;
 -      let appChooserCallback = function appChooserCallback_done(aResult) {
 -        if (aResult) {
--           contentTypeDialogObj.chosenApp = aResult.QueryInterface(Ci.nsILocalHandlerApp);
+-          contentTypeDialogObj.chosenApp = aResult.QueryInterface(
+-            Ci.nsILocalHandlerApp
+-          );
 -        }
 -        contentTypeDialogObj.finishChooseApp();
 -      };
@@ -754,13 +760,19 @@
 +        });
 +      } else {
 +        var nsIApplicationChooser = Ci.nsIApplicationChooser;
-+        var appChooser = Cc["@mozilla.org/applicationchooser;1"]
-+                           .createInstance(nsIApplicationChooser);
-+        appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle"));
++        var appChooser = Cc["@mozilla.org/applicationchooser;1"].createInstance(
++          nsIApplicationChooser
++        );
++        appChooser.init(
++          this.mDialog,
++          this.dialogElement("strings").getString("chooseAppFilePickerTitle")
++        );
 +        var contentTypeDialogObj = this;
 +        let appChooserCallback = function appChooserCallback_done(aResult) {
 +          if (aResult) {
-+             contentTypeDialogObj.chosenApp = aResult.QueryInterface(Ci.nsILocalHandlerApp);
++            contentTypeDialogObj.chosenApp = aResult.QueryInterface(
++              Ci.nsILocalHandlerApp
++            );
 +          }
 +          contentTypeDialogObj.finishChooseApp();
 +        };
@@ -770,12 +782,12 @@
 +      }
      } else {
        var nsIFilePicker = Ci.nsIFilePicker;
-       var fp = Cc["@mozilla.org/filepicker;1"]
-                  .createInstance(nsIFilePicker);
-       fp.init(this.mDialog,
-               this.dialogElement("strings").getString("chooseAppFilePickerTitle"),
-               nsIFilePicker.modeOpen);
- 
+       var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
+       fp.init(
+         this.mDialog,
+         this.dialogElement("strings").getString("chooseAppFilePickerTitle"),
+         nsIFilePicker.modeOpen
+       );
 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/series	Fri Aug 30 23:43:39 2019 +0200
+++ b/series	Sat Aug 31 21:57:57 2019 +0200
@@ -8,12 +8,12 @@
 mozilla-cubeb-noreturn.patch
 mozilla-fix-aarch64-libopus.patch
 mozilla-disable-wasm-emulate-arm-unaligned-fp-access.patch
-mozilla-gcc-internal-compiler-error.patch
 mozilla-s390-context.patch
 mozilla-s390-bigendian.patch
 mozilla-reduce-rust-debuginfo.patch
 mozilla-ppc-altivec_static_inline.patch
 mozilla-bmo1005535.patch
+mozilla-bmo1568145.patch
 
 # Firefox patches
 firefox-kde.patch