Merge branch 'jb49723' into 'master'

Remove patch added promptForSaveToFile() support

See merge request mer-core/gecko-dev!83

rpm/0001-Supply-source-uri-to-gstreamer-pipeline.patch

@@ -1,7 +1,7 @@
-From f6511020aa5c133a007a4fbadf018837a6629621 Mon Sep 17 00:00:00 2001
+From 4a70148a7b46f7525a313769f880a2a2c9cd0e50 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:10:46 +0300
-Subject: [PATCH 01/17] Supply source uri to gstreamer pipeline
+Subject: [PATCH] Supply source uri to gstreamer pipeline
 
 Backported SHA1 aae344839920dd17bddfd0ef822cc5bc36ea2d9f
 from esr38.
@@ -280,5 +280,5 @@ index 9460c56ff437..b63a761b949d 100644
 
  // For a complete list of file types, see http://www.ftyps.com/index.html
 -- 
-2.24.1
+2.26.2
 

rpm/0002-Workaround-for-late-access-message-loop.patch

@@ -1,7 +1,7 @@
-From 742457bea87cd7ed6d88c7bcf4817afff7ce5acd Mon Sep 17 00:00:00 2001
+From f70b880a75c0eacd87931781588fedce73d1faef Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:12:04 +0300
-Subject: [PATCH 02/17] Workaround for late access message loop.
+Subject: [PATCH] Workaround for late access message loop.
 
 See bug JB10381
 
@@ -25,5 +25,5 @@ index 30791953fb32..1f0b70a27430 100644
    bool nestableTasksAllowed = loop->NestableTasksAllowed();
 
 -- 
-2.24.1
+2.26.2
 

rpm/0004-Define-HAS_NEMO_RESOURCE-in-config.patch → rpm/0003-Define-HAS_NEMO_RESOURCE-in-config.patch

@@ -1,7 +1,7 @@
-From e4aae3c0f47aee0bc2e083639d6172d53c841554 Mon Sep 17 00:00:00 2001
+From 9d41a37a2f5edb09bb7c9fb0f6a0c228e4ec161d Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:13:03 +0300
-Subject: [PATCH 04/17] Define HAS_NEMO_RESOURCE in config
+Subject: [PATCH] Define HAS_NEMO_RESOURCE in config
 
 See bugs JB10947, JB30305, and JB30517
 
@@ -11,10 +11,10 @@ Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/configure.in b/configure.in
-index 3538538bac39..a3ba8b2f6ae2 100644
+index 82cd65a00559..7f5ce1a0f369 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -5661,6 +5661,9 @@ if test -n "$MOZ_GSTREAMER"; then
+@@ -5659,6 +5659,9 @@ if test -n "$MOZ_GSTREAMER"; then
          AC_MSG_ERROR([gstreamer and gstreamer-plugins-base development packages are needed to build gstreamer backend. Install them or disable gstreamer support with --disable-gstreamer])
      fi
 
@@ -24,7 +24,7 @@ index 3538538bac39..a3ba8b2f6ae2 100644
      _SAVE_LDFLAGS=$LDFLAGS
      LDFLAGS="$LDFLAGS $GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
      AC_TRY_LINK(,[return 0;],_HAVE_LIBGSTVIDEO=1,_HAVE_LIBGSTVIDEO=)
-@@ -5673,6 +5676,7 @@ if test -n "$MOZ_GSTREAMER"; then
+@@ -5671,6 +5674,7 @@ if test -n "$MOZ_GSTREAMER"; then
  fi
 
  AC_SUBST(MOZ_GSTREAMER)
@@ -33,5 +33,5 @@ index 3538538bac39..a3ba8b2f6ae2 100644
 
  if test -n "$MOZ_GSTREAMER"; then
 -- 
-2.24.1
+2.26.2
 

rpm/0005-Limit-surface-area-rather-than-width-and-height.patch → rpm/0004-Limit-surface-area-rather-than-width-and-height.patch

@@ -1,7 +1,7 @@
-From c282851b1cc387f79f6a67a33be450e668260f73 Mon Sep 17 00:00:00 2001
+From ea9e4b19efcfbb8cef82ac2956444772570d5895 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:17:36 +0300
-Subject: [PATCH 05/17] Limit surface area rather than width and height
+Subject: [PATCH] Limit surface area rather than width and height
 
 See bug JB26935
 
@@ -27,5 +27,5 @@ index 91043722c4c6..ba1d4688c14d 100644
 
  cairo_format_t
 -- 
-2.24.1
+2.26.2
 

rpm/0006-Make-TextureImageEGL-hold-a-reference-to-GLContext.-.patch → rpm/0005-Make-TextureImageEGL-hold-a-reference-to-GLContext.-.patch

@@ -1,8 +1,8 @@
-From ef04eb022fcfcd473f58a3fda98e28d68dcd5348 Mon Sep 17 00:00:00 2001
+From a6b0db8624bf9a86b16518fdfccac36cc8795510 Mon Sep 17 00:00:00 2001
 From: Piotr Tworek <piotr.tworek@jollamobile.com>
 Date: Wed, 8 Jul 2015 16:13:11 +0200
-Subject: [PATCH 06/17] Make TextureImageEGL hold a reference to GLContext.
- Fixes JB#30109.
+Subject: [PATCH] Make TextureImageEGL hold a reference to GLContext. Fixes
+ JB#30109.
 
 Due to rather non standard view shutdown procedure of EmbedLite port
 objets like TextureImageEGL often end up being destroyed after the
@@ -38,5 +38,5 @@ index 472718e2efd2..61d873a79a90 100644
      gfx::IntRect mUpdateRect;
      gfx::SurfaceFormat mUpdateFormat;
 -- 
-2.24.1
+2.26.2
 

rpm/0007-Limit-maximum-scale-to-4x.-Fixes-JB-25377.patch → rpm/0006-Limit-maximum-scale-to-4x.-Fixes-JB-25377.patch

@@ -1,7 +1,7 @@
-From ca43c703dd35e55599f9200555e0f4e1500d2b5e Mon Sep 17 00:00:00 2001
+From 787a05f017f7aa99dbecce3e3be7a3e879f90252 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Mon, 12 Oct 2015 16:22:59 +0300
-Subject: [PATCH 07/17] Limit maximum scale to 4x. Fixes JB#25377
+Subject: [PATCH] Limit maximum scale to 4x. Fixes JB#25377
 
 The default zoom contraints now matches to the EmbedContentController.
 
@@ -24,5 +24,5 @@ index facba7c420be..c4e9e2ad0285 100644
  /**
   * Minimum zoom amount, always used, even if a page asks for lower.
 -- 
-2.24.1
+2.26.2
 

rpm/0008-Adapt-LoginManager-to-EmbedLite.-Fixes-JB21980.patch → rpm/0007-Adapt-LoginManager-to-EmbedLite.-Fixes-JB21980.patch

@@ -1,7 +1,7 @@
-From 6812cabf5325fb2f3fe77cf82250e7ec3bc8b6a5 Mon Sep 17 00:00:00 2001
+From dfad45a26dadf97ba37a03a95b3566fc70458ab6 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Wed, 28 Oct 2015 16:07:36 +0200
-Subject: [PATCH 08/17] Adapt LoginManager to EmbedLite. Fixes JB21980
+Subject: [PATCH] Adapt LoginManager to EmbedLite. Fixes JB21980
 
 Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
@@ -63,5 +63,5 @@ index 1d3d3c367a6e..873426b995aa 100644
 \ No newline at end of file
 +category healthreport-js-provider-default PasswordsMetricsProvider resource://gre/modules/LoginManagerParent.jsm
 -- 
-2.24.1
+2.26.2
 

rpm/0009-Bug-1253215-Initialize-RequestSyncService-only-if-it.patch → rpm/0008-Bug-1253215-Initialize-RequestSyncService-only-if-it.patch

@@ -1,8 +1,8 @@
-From e231bc8eeeadc5009f18766c387a8525c28e8d2f Mon Sep 17 00:00:00 2001
+From 42f304657218322acf3ab543d6aaa0ec6e13187c Mon Sep 17 00:00:00 2001
 From: Andrea Marchesini <amarchesini@mozilla.com>
 Date: Thu, 3 Mar 2016 18:30:16 +0100
-Subject: [PATCH 09/17] Bug 1253215 - Initialize RequestSyncService only if its
- pref is enabled, r=ehsan
+Subject: [PATCH] Bug 1253215 - Initialize RequestSyncService only if its pref
+ is enabled, r=ehsan
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
 ---
@@ -25,5 +25,5 @@ index 835010922ab0..4b20868f9185 100644
        ppmm.addMessageListener(msgName, this);
      }).bind(this));
 -- 
-2.24.1
+2.26.2