Merge branch 'jb52385' into 'master'

[sailfishos][media] Drop media buffer tweaks and reformat patches. JB#52385

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

rpm/0001-sailfishos-qt-Bring-back-Qt-layer.-JB-50505.patch

@@ -1,4 +1,4 @@
-From d33ee2b8341c5addcd2d02b8426f5a6ea66d4064 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Fri, 28 Feb 2020 11:38:58 +0200
 Subject: [PATCH] [sailfishos][qt] Bring back Qt layer. JB#50505
@@ -1051,7 +1051,7 @@ index deafd7ca0e1a..9dec5826cda1 100644
  else:
      DIRS += ['emacs']
 diff --git a/embedding/embedlite/config/mozconfig.merqtxulrunner b/embedding/embedlite/config/mozconfig.merqtxulrunner
-index 3f99e0b4ae55..5752ac5e3531 100644
+index 6044ac780a7a..06a016570bbc 100644
 --- a/embedding/embedlite/config/mozconfig.merqtxulrunner
 +++ b/embedding/embedlite/config/mozconfig.merqtxulrunner
 @@ -42,7 +42,7 @@ ac_add_options --disable-stylo
@@ -10938,5 +10938,5 @@ index 000000000000..3bf6f80f3916
 +
 +#endif /* __nsWindow_h__ */
 -- 
-2.25.1
+2.26.2
 

rpm/0002-sailfishos-gecko-Fix-embedlite-building.-JB-50505.patch

@@ -1,4 +1,4 @@
-From 9b8e3808f62f762009b0a74405218dd14d4b8946 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Wed, 19 Aug 2020 09:36:29 +0300
 Subject: [PATCH] [sailfishos][gecko] Fix embedlite building. JB#50505
@@ -31,7 +31,7 @@ index 7192a02fc088..62f9d8da3fbf 100644
  CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
 +OS_LIBS += CONFIG['GLIB_LIBS']
 diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
-index 8555c8794dc1..36461f10722a 100644
+index bdd887be5fd4..4f560f80d0f7 100644
 --- a/gfx/thebes/gfxPlatform.cpp
 +++ b/gfx/thebes/gfxPlatform.cpp
 @@ -88,6 +88,9 @@

rpm/0003-sailfishos-gecko-Hackish-fix-for-preferences-usage-i.patch

@@ -1,4 +1,4 @@
-From e2b4b8d3edcec8e74b57c0d0108912eab6d2a871 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Wed, 19 Aug 2020 09:17:05 +0300
 Subject: [PATCH] [sailfishos][gecko] Hackish fix for preferences usage in
@@ -127,10 +127,10 @@ index 7729150d7219..3596a6b98f70 100644
   private:
    // This is a function so we can log or breakpoint on why hit
 diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
-index 36461f10722a..d67613ec4493 100644
+index 4f560f80d0f7..7db374964622 100644
 --- a/gfx/thebes/gfxPlatform.cpp
 +++ b/gfx/thebes/gfxPlatform.cpp
-@@ -812,7 +812,7 @@ void gfxPlatform::Init() {
+@@ -810,7 +810,7 @@ void gfxPlatform::Init() {
    // Request the imgITools service, implicitly initializing ImageLib.
    nsCOMPtr<imgITools> imgTools = do_GetService("@mozilla.org/image/tools;1");
    if (!imgTools) {

rpm/0004-sailfishos-gecko-Hack-message_pump_qt-s-moc-generati.patch

@@ -1,4 +1,4 @@
-From df623397931ac1a1c135bfd5208287bb4fdc1021 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Tue, 20 Dec 2016 16:01:15 +0200
 Subject: [PATCH] [sailfishos][gecko] Hack message_pump_qt's moc generation to

rpm/0005-sailfishos-gecko-Backport-Embed-MessageLoop-contruct.patch

@@ -1,4 +1,4 @@
-From 1571fd2bcb4079916cfb01f52d74c4f865753147 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Mon, 16 Mar 2020 14:46:51 +0200
 Subject: [PATCH] [sailfishos][gecko] Backport Embed MessageLoop contructor

rpm/0006-sailfishos-compositor-Fix-GLContextProvider-defines.patch

@@ -1,4 +1,4 @@
-From ce79fb61f54a0465a6f1d5e6dc043513f5d065b0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Thu, 8 Dec 2016 14:32:54 +0200
 Subject: [PATCH] [sailfishos][compositor] Fix GLContextProvider defines

rpm/0007-sailfishos-compositor-Make-it-possible-to-extend-Com.patch

@@ -1,4 +1,4 @@
-From e8c6e188a2b3a398a2d976eee576e70501275233 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Thu, 19 Mar 2020 13:56:02 +0200
 Subject: [PATCH] [sailfishos][compositor] Make it possible to extend

rpm/0008-sailfishos-compositor-Allow-compositor-specializatio.patch

@@ -1,4 +1,4 @@
-From ffc9ad6a335f92f6047177bae8f3b1e467b63c2e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Fri, 17 Apr 2020 12:44:15 +0300
 Subject: [PATCH] [sailfishos][compositor] Allow compositor specializations to

rpm/0009-sailfishos-gecko-Create-EmbedLiteCompositorBridgePar.patch

@@ -1,4 +1,4 @@
-From 95db071bcf6a615798d4a59188cdef82f630db7b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Mon, 27 Jul 2020 13:50:15 +0300
 Subject: [PATCH] [sailfishos][gecko] Create EmbedLiteCompositorBridgeParent in

rpm/0010-sailfishos-gecko-Remove-PuppetWidget-from-TabChild-i.patch

@@ -1,4 +1,4 @@
-From 1b556bcd5a04125ef0fb6b5a306de5c3965e81c0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Tue, 28 Jul 2020 11:57:37 +0300
 Subject: [PATCH] [sailfishos][gecko] Remove PuppetWidget from TabChild

rpm/0011-sailfishos-gecko-Make-TabChild-to-work-with-TabChild.patch

@@ -1,4 +1,4 @@
-From 23f47b23decd60bd19bfd8048da0e8136cba90bd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Tue, 11 Aug 2020 17:09:44 +0300
 Subject: [PATCH] [sailfishos][gecko] Make TabChild to work with TabChildHelper

rpm/0012-sailfishos-build-Fix-build-error-with-newer-glibc.patch

@@ -1,4 +1,4 @@
-From c10605874c51e2889d4c727d73ce45bf350ef5b2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Fri, 24 Jul 2020 15:45:12 +0300
 Subject: [PATCH] [sailfishos][build] Fix build error with newer glibc.

rpm/0013-sailfishos-gecko-Enable-Pango-for-the-build.-JB-5086.patch

@@ -1,4 +1,4 @@
-From a65b06335ac8ce2facd7c999dfaab33a5bf99a47 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Tue, 17 Mar 2020 11:06:27 +0200
 Subject: [PATCH] [sailfishos][gecko] Enable Pango for the build. JB#50863

rpm/0014-sailfishos-gecko-Fix-gfxPlatform-AsyncPanZoomEnabled.patch

@@ -1,4 +1,4 @@
-From 652e65fa61120ecf66d19bafc4171ecddc5b09ea Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Fri, 9 Dec 2016 15:01:12 +0200
 Subject: [PATCH] [sailfishos][gecko] Fix gfxPlatform::AsyncPanZoomEnabled for
@@ -12,10 +12,10 @@ Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
-index d67613ec4493..a503d5c1f64e 100644
+index 7db374964622..14bebc2c568a 100644
 --- a/gfx/thebes/gfxPlatform.cpp
 +++ b/gfx/thebes/gfxPlatform.cpp
-@@ -2600,7 +2600,7 @@ void gfxPlatform::GetTilesSupportInfo(mozilla::widget::InfoObject& aObj) {
+@@ -2598,7 +2598,7 @@ void gfxPlatform::GetTilesSupportInfo(mozilla::widget::InfoObject& aObj) {
  }
 
  /*static*/ bool gfxPlatform::AsyncPanZoomEnabled() {

rpm/0015-sailfishos-gecko-Nullify-delayed-work-timer-after-ca.patch

@@ -1,4 +1,4 @@
-From 4487ba3b9e80a7dc79344b84ea7e787cc74e8b76 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Oleg <romaxa@gmail.com>
 Date: Sat, 25 Oct 2014 13:53:23 -0700
 Subject: [PATCH] [sailfishos][gecko] Nullify delayed work timer after

rpm/0016-sailfishos-compositor-Respect-gfxPrefs-ClearCompoisi.patch

@@ -1,4 +1,4 @@
-From 44a63d86bbfebf3f7b070c6d8e7bf30f769f5953 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Wed, 13 May 2015 07:51:44 -0700
 Subject: [PATCH] [sailfishos][compositor] Respect

rpm/0017-sailfishos-gecko-Workaround-for-late-access-message-.patch

@@ -1,4 +1,4 @@
-From 6d4c376111c2ca5ff011ea4cad1f68f5f1f3fe98 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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] [sailfishos][gecko] Workaround for late access message loop.

rpm/0018-sailfishos-gecko-Limit-surface-area-rather-than-widt.patch

@@ -1,4 +1,4 @@
-From e894c2f0f7c2db244041fb9ddf57d21e723a908c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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] [sailfishos][gecko] Limit surface area rather than width and

rpm/0019-sailfishos-gecko-Make-TextureImageEGL-hold-a-referen.patch

@@ -1,4 +1,4 @@
-From 6044554adeaa4b1447d61a6039c18548d944a25f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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] [sailfishos][gecko] Make TextureImageEGL hold a reference to

rpm/0020-sailfishos-loginmanager-Adapt-LoginManager-to-EmbedL.patch

@@ -1,4 +1,4 @@
-From 29620b5fa9082de957a5aaa67164e08d13e0ce1d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Wed, 19 Aug 2020 14:17:08 +0300
 Subject: [PATCH] [sailfishos][loginmanager] Adapt LoginManager to EmbedLite.
@@ -14,10 +14,10 @@ Signed-off-by: Pavel Tumakaev <p.tumakaev@omprussia.ru>
  3 files changed, 17 insertions(+), 12 deletions(-)
 
 diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
-index bfe029b51dcd..e1cc194254f5 100644
+index 2ec960923e0e..d0d73a30797c 100644
 --- a/dom/ipc/TabChild.h
 +++ b/dom/ipc/TabChild.h
-@@ -495,12 +495,16 @@ class TabChild final : public TabChildBase,
+@@ -496,12 +496,16 @@ class TabChild final : public TabChildBase,
    nsIContentChild* Manager() const { return mManager; }
 
    static inline TabChild* GetFrom(nsIDocShell* aDocShell) {
@@ -88,5 +88,5 @@ index 72e9ccffb883..59476fc09007 100644
 \ No newline at end of file
 +contract @mozilla.org/login-manager/crypto/SDR;1 {dc6c2976-0f73-4f1f-b9ff-3d72b4e28309}
 -- 
-2.25.1
+2.26.2
 

rpm/0021-sailfishos-gecko-Make-fullscreen-enabling-work-as-us.patch

@@ -1,4 +1,4 @@
-From 64b004f00dc88002b25f2513d6199037abb3f43b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Wed, 19 Aug 2020 14:27:21 +0300
 Subject: [PATCH] [sailfishos][gecko] Make fullscreen enabling work as used to

rpm/0022-sailfishos-gecko-Embedlite-doesn-t-have-prompter-imp.patch

@@ -1,4 +1,4 @@
-From d299e8d02577209b0f579226753e1c7b4b63e07d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Wed, 30 Jan 2019 15:42:27 +0200
 Subject: [PATCH] [sailfishos][gecko] Embedlite doesn't have prompter

rpm/0023-sailfishos-gecko-Disable-Marionette.patch

@@ -1,4 +1,4 @@
-From 4f3df0209bee5e5b37ceb824e15070b7f3f91a9f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Wed, 19 Aug 2020 14:42:43 +0300
 Subject: [PATCH] [sailfishos][gecko] Disable Marionette
@@ -9,7 +9,7 @@ Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index cd0cd1bb07aa..726765010e0d 100644
+index cd0cd1bb07aa..09423eb3c8d9 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -1081,8 +1081,7 @@ set_config('MOZ_MORTAR', True, when='--enable-mortar')

rpm/0024-sailfishos-gecko-Use-libcontentaction-for-custom-sch.patch

@@ -1,4 +1,4 @@
-From a8a824f32356e14cd2e919f99620efaf55fab0d1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Fri, 31 Jan 2020 11:09:02 +0000
 Subject: [PATCH] [sailfishos][gecko] Use libcontentaction for custom scheme

rpm/0025-sailfishos-gecko-Handle-temporary-directory-similarl.patch

@@ -1,4 +1,4 @@
-From fe0a3a115c8f77190f75e6b4f5ab0e23bb4620bf Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Wed, 19 Aug 2020 15:02:46 +0300
 Subject: [PATCH] [sailfishos][gecko] Handle temporary directory similarly as

rpm/0026-sailfishos-gecko-Disable-loading-heavier-extensions.patch

@@ -1,4 +1,4 @@
-From 61788ce519041c31fb4d772baae7fbb5269b7ef5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Andrew Branson <andrew.branson@jolla.com>
 Date: Thu, 14 May 2020 13:42:59 +0200
 Subject: [PATCH] [sailfishos][gecko] Disable loading heavier extensions

rpm/0027-sailfishos-gecko-Avoid-incorrect-compiler-optimisati.patch

@@ -1,4 +1,4 @@
-From 3e9131de94383b846ccfc933f603eea9ea600cad Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Tue, 21 Apr 2020 23:14:14 +0300
 Subject: [PATCH] [sailfishos][gecko] Avoid incorrect compiler optimisation.

rpm/0028-sailfishos-gecko-Avoid-rogue-origin-points-when-clip.patch

@@ -1,4 +1,4 @@
-From 6b44a3f6ef3bbd3dee04d15305a3e96e2aba373a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
 Date: Tue, 2 Jun 2020 11:47:10 +0000
 Subject: [PATCH] [sailfishos][gecko] Avoid rogue origin points when clipping

rpm/0029-sailfishos-gecko-Allow-render-shaders-to-be-loaded-f.patch

@@ -1,4 +1,4 @@
-From 2e39acab82824cfb8d149d10ce99cd4ecbe321a8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Llewellyn-Jones <david@flypig.co.uk>
 Date: Thu, 18 Jun 2020 11:19:57 +0000
 Subject: [PATCH] [sailfishos][gecko] Allow render shaders to be loaded from

rpm/0030-sailfishos-gecko-Prioritize-GMP-plugins-over-all-oth.patch

@@ -1,4 +1,4 @@
-From 906bef5d54b7bfac8d86632b1741076bd152932a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Andrew Branson <andrew.branson@jolla.com>
 Date: Wed, 24 Jun 2020 07:56:50 +0200
 Subject: [PATCH] [sailfishos][gecko] Prioritize GMP plugins over all others,

rpm/0031-sailfishos-gecko-Delete-startupCache-if-it-s-stale.patch

@@ -1,4 +1,4 @@
-From 243dcc269d988bc53bb674158c7efc8571fe6875 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Llewellyn-Jones <david@flypig.co.uk>
 Date: Tue, 28 Jul 2020 09:39:16 +0000
 Subject: [PATCH] [sailfishos][gecko] Delete startupCache if it's stale

rpm/0032-sailfishos-mozglue-Introduce-EmbedInitGlue-to-the-mo.patch

@@ -1,4 +1,4 @@
-From 0ee60d4ef44b7235656ebee303dd948665f89c1d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Wed, 26 Aug 2020 15:24:00 +0300
 Subject: [PATCH] [sailfishos][mozglue] Introduce EmbedInitGlue to the mozglue.

rpm/0033-sailfishos-gecko-Skip-invalid-WatchId-in-geolocation.patch

@@ -1,4 +1,4 @@
-From f02c22dd5fd42a28f464e762ba531bb7d1376ea1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "p.tumakaev" <p.tumakaev@omprussia.ru>
 Date: Mon, 29 Jun 2020 14:29:52 +0300
 Subject: [PATCH] [sailfishos][gecko] Skip invalid WatchId in

rpm/0034-sailfishos-locale-Get-12-24h-timeformat-setting-from.patch

@@ -1,4 +1,4 @@
-From 8d1291b493e7ba32bccba49b4d6f6af0d0577565 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Simo Piiroinen <simo.piiroinen@jollamobile.com>
 Date: Fri, 28 Aug 2020 12:33:28 +0300
 Subject: [PATCH] [sailfishos][locale] Get 12/24h timeformat setting from
@@ -37,7 +37,7 @@ index 403ebc479d18..e24df1e70dfe 100644
      '--enable-directshow',
      '--enable-dtrace',
 diff --git a/embedding/embedlite/config/mozconfig.merqtxulrunner b/embedding/embedlite/config/mozconfig.merqtxulrunner
-index 5752ac5e3531..869234fc87b6 100644
+index 06a016570bbc..b759f42eb111 100644
 --- a/embedding/embedlite/config/mozconfig.merqtxulrunner
 +++ b/embedding/embedlite/config/mozconfig.merqtxulrunner
 @@ -31,6 +31,7 @@ ac_add_options --enable-mobile-optimize

rpm/0035-sailfishos-contentaction-Fix-content-action-integrat.patch

@@ -1,4 +1,4 @@
-From 11c154404f809e3170254138e4272f87b0fac4be Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Thu, 17 Sep 2020 17:47:45 +0300
 Subject: [PATCH] [sailfishos][contentaction] Fix content action integration to

rpm/0036-sailfishos-qt-Initialize-FreeType-library-properly.-.patch

@@ -1,4 +1,4 @@
-From fb6f9a127ef86fb5f5a77a39dd006b95cd3b7df7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Mon, 28 Sep 2020 16:19:17 +0300
 Subject: [PATCH] [sailfishos][qt] Initialize FreeType library properly.

rpm/0037-sailfishos-disable-TLS-1.0-and-1.1.patch

@@ -1,4 +1,4 @@
-From 8f7de933693fa346d9c8ee7b7bad33795f692579 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
 Date: Fri, 2 Oct 2020 12:57:02 +0000
 Subject: [PATCH] [sailfishos][gecko] Disable TLS 1.0 and 1.1. Fixes JB#50522

rpm/0038-sailfishos-gecko-Use-registered-IHistory-service-imp.patch

@@ -1,4 +1,4 @@
-From 97dca733ec352279e975ccf7c74f4aefe6e4aa04 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Pavel Tumakaev <p.tumakaev@omprussia.ru>
 Date: Wed, 7 Oct 2020 19:30:57 +0300
 Subject: [PATCH] [sailfishos][gecko] Use registered IHistory service
@@ -49,5 +49,5 @@ index 0ea844f8e49d..0785cf6cd2b2 100644
  #else
      History *history = History::GetService();
 -- 
-2.25.1
+2.26.2
 

rpm/0039-sailfishos-gecko-Suppress-LoginManagerContent.jsm-ow.patch

@@ -1,4 +1,4 @@
-From abbb96148870a8ed442b10aff08008a80884e77b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Mon, 19 Oct 2020 11:44:03 +0300
 Subject: [PATCH] [sailfishos][gecko] Suppress LoginManagerContent.jsm

rpm/0040-sailfishos-configuration-Configure-application-as-mo.patch

@@ -1,7 +1,7 @@
-From ed5c88a01b2c6d0ebc89094d49913cbf06ac34ee Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Mon, 19 Oct 2020 13:40:23 +0300
-Subject: [PATCH 40/40] [sailfishos][configuration] Configure application as
+Subject: [PATCH] [sailfishos][configuration] Configure application as
  mobile/sailfishos. JB#51366
 
 This doesn't fix yet the issue with msn.com but at least this
@@ -15,7 +15,7 @@ Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
  embedding/embedlite/config/mozconfig.merqtxulrunner | 2 +-
  mobile/sailfishos                                   | 1 +
  toolkit/themes/moz.build                            | 4 ++--
- 7 files changed, 14 insertions(+), 7 deletions(-)
+ 6 files changed, 14 insertions(+), 7 deletions(-)
  create mode 120000 mobile/sailfishos
 
 diff --git a/dom/base/moz.build b/dom/base/moz.build
@@ -70,7 +70,7 @@ index afe307c9cd64..145a4712b074 100644
          'External.webidl',
      ]
 diff --git a/embedding/embedlite/config/mozconfig.merqtxulrunner b/embedding/embedlite/config/mozconfig.merqtxulrunner
-index 869234fc87b6..320788664dff 100644
+index b759f42eb111..03e648233993 100644
 --- a/embedding/embedlite/config/mozconfig.merqtxulrunner
 +++ b/embedding/embedlite/config/mozconfig.merqtxulrunner
 @@ -21,7 +21,7 @@ ac_add_options --enable-system-sqlite

rpm/0041-sailfishos-gecko-Include-XUL-videocontrols-reflow-co.patch

@@ -1,7 +1,8 @@
-From fbf03ece514aa1fb54d88d407f58c4d0e10ef979 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
 Date: Fri, 16 Oct 2020 14:41:10 +0300
-Subject: [PATCH] [sailfishos][gecko] Include XUL videocontrols reflow code on Sailfish OS
+Subject: [PATCH] [sailfishos][gecko] Include XUL videocontrols reflow code on
+ Sailfish OS
 
 The desktop browser videocontrol UI is implemented in HTML, whereas on
 Sailfish OS (and Android) XUL content is still needed. This change
@@ -74,5 +75,5 @@ index bc9c1a4678dc..071e8ad5a5b2 100644
    HTMLVideoElement* element = static_cast<HTMLVideoElement*>(GetContent());
    if (NS_FAILED(element->GetVideoSize(&size)) && ShouldDisplayPoster()) {
 -- 
-2.25.1
+2.26.2
 

rpm/0042-sailfishos-gecko-Adjust-audio-control-dimensions.-Co.patch

@@ -1,4 +1,4 @@
-From 6ce21fa982e37044bcd32c7b4cd4ee236cbd813c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
 Date: Fri, 16 Oct 2020 19:14:36 +0300
 Subject: [PATCH] [sailfishos][gecko] Adjust audio control dimensions.
@@ -57,5 +57,5 @@ index f48106d440de..14041b63d666 100644
        adjustControlSize() {
          if (this.videocontrols.isTouchControls) {
 -- 
-2.25.1
+2.26.2