Merge branch 'jb51958' into 'master'

[sailfishos][gecko] Revert 'Apply UA override for window.navigator.'. Fixes JB#51958 See merge request mer-core/gecko-dev!192
sailfishos · Nov 17, 2020 · 54f4654 · 54f4654
2 parents d5805fa + 15438b3
commit 54f4654
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 39 deletions.
diff --git a/rpm/0044-sailfishos-gecko-Apply-UA-override-for-window.naviga.patch b/rpm/0044-sailfishos-gecko-Apply-UA-override-for-window.naviga.patch
diff --git a/...Ensure-audio-continues-when-screen-.patch → ...Ensure-audio-continues-when-screen-.patch b/...Ensure-audio-continues-when-screen-.patch → ...Ensure-audio-continues-when-screen-.patch
diff --git a/...rt--Make-MOZSIGNALTRAMPOLINE-Andro-.patch → ...rt--Make-MOZSIGNALTRAMPOLINE-Andro-.patch b/...rt--Make-MOZSIGNALTRAMPOLINE-Andro-.patch → ...rt--Make-MOZSIGNALTRAMPOLINE-Andro-.patch
diff --git a/...Force-recycling-of-gmpdroid-instanc.patch → ...Force-recycling-of-gmpdroid-instanc.patch b/...Force-recycling-of-gmpdroid-instanc.patch → ...Force-recycling-of-gmpdroid-instanc.patch
diff --git a/...Hardcode-loopback-address-for-profi.patch → ...Hardcode-loopback-address-for-profi.patch b/...Hardcode-loopback-address-for-profi.patch → ...Hardcode-loopback-address-for-profi.patch
diff --git a/...rt-Enable-MOZ_GECKO_PROFILER-on-And.patch → ...rt-Enable-MOZ_GECKO_PROFILER-on-And.patch b/...rt-Enable-MOZ_GECKO_PROFILER-on-And.patch → ...rt-Enable-MOZ_GECKO_PROFILER-on-And.patch
diff --git a/...rt-Implement-DWARF-stack-walker-for.patch → ...rt-Implement-DWARF-stack-walker-for.patch b/...rt-Implement-DWARF-stack-walker-for.patch → ...rt-Implement-DWARF-stack-walker-for.patch
diff --git a/rpm/xulrunner-qt5.spec b/rpm/xulrunner-qt5.spec
@@ -86,13 +86,12 @@ Patch40:    0040-sailfishos-configuration-Configure-application-as-mo.patch
 Patch41:    0041-sailfishos-gecko-Include-XUL-videocontrols-reflow-co.patch
 Patch42:    0042-sailfishos-gecko-Adjust-audio-control-dimensions.-Co.patch
 Patch43:    0043-sailfishos-gecko-Prioritize-loading-of-extension-ver.patch
-Patch44:    0044-sailfishos-gecko-Apply-UA-override-for-window.naviga.patch
-Patch45:    0045-sailfishos-media-Ensure-audio-continues-when-screen-.patch
-Patch46:    0046-sailfishos-backport--Make-MOZSIGNALTRAMPOLINE-Andro-.patch
-Patch47:    0047-sailfishos-gecko-Force-recycling-of-gmpdroid-instanc.patch
-Patch48:    0048-sailfishos-gecko-Hardcode-loopback-address-for-profi.patch
-Patch49:    0049-sailfishos-backport-Enable-MOZ_GECKO_PROFILER-on-And.patch
-Patch50:    0050-sailfishos-backport-Implement-DWARF-stack-walker-for.patch
+Patch44:    0044-sailfishos-media-Ensure-audio-continues-when-screen-.patch
+Patch45:    0045-sailfishos-backport--Make-MOZSIGNALTRAMPOLINE-Andro-.patch
+Patch46:    0046-sailfishos-gecko-Force-recycling-of-gmpdroid-instanc.patch
+Patch47:    0047-sailfishos-gecko-Hardcode-loopback-address-for-profi.patch
+Patch48:    0048-sailfishos-backport-Enable-MOZ_GECKO_PROFILER-on-And.patch
+Patch49:    0049-sailfishos-backport-Implement-DWARF-stack-walker-for.patch
 
 BuildRequires:  rust
 BuildRequires:  rust-std-static