From 86072c7d9c5ff4ac8c4d89a64093344fd048a947 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 20 Jun 2018 15:03:59 +0200 Subject: Added missing patches from 60.0.2 --- build-aarch64-skia.patch | 17 ++---- firefox.spec | 7 +-- mozilla-1424422.patch | 135 +++++++++++++---------------------------------- rhbz-1498561.patch | 27 ---------- 4 files changed, 44 insertions(+), 142 deletions(-) delete mode 100644 rhbz-1498561.patch diff --git a/build-aarch64-skia.patch b/build-aarch64-skia.patch index 33d2d35..1ecad24 100644 --- a/build-aarch64-skia.patch +++ b/build-aarch64-skia.patch @@ -1,20 +1,11 @@ -diff -up firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp ---- firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia 2018-04-20 12:07:26.242037226 +0200 -+++ firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp 2018-04-20 12:12:58.916428432 +0200 -@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) { - } - - SI F from_half(U16 h) { --#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if 0 && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - return vcvt_f32_f16(h); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) +diff -up firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp +--- firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia 2018-06-20 09:19:11.411939714 +0200 ++++ firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp 2018-06-20 09:23:36.831919894 +0200 @@ -686,7 +686,7 @@ SI F from_half(U16 h) { } SI U16 to_half(F f) { --#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +#if 0 && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. return vcvt_f16_f32(f); diff --git a/firefox.spec b/firefox.spec index 6f80a7d..c7b51e9 100644 --- a/firefox.spec +++ b/firefox.spec @@ -145,8 +145,6 @@ Patch224: mozilla-1170092.patch Patch225: mozilla-1005640-accept-lang.patch #ARM run-time patch Patch226: rhbz-1354671.patch -# ppc(64)le run-time js patch -Patch227: rhbz-1498561.patch # Upstream patches Patch402: mozilla-1196777.patch @@ -340,7 +338,7 @@ This package contains results of tests executed during build. %patch29 -p1 -b .big-endian %endif %patch37 -p1 -b .jit-atomic-lucky -#%patch40 -p1 -b .aarch64-skia +%patch40 -p1 -b .aarch64-skia %patch3 -p1 -b .arm # Fedora patches @@ -353,7 +351,6 @@ This package contains results of tests executed during build. %ifarch aarch64 %patch226 -p1 -b .1354671 %endif -#%patch227 -p1 -b .rhbz-1498561 %patch402 -p1 -b .1196777 %patch406 -p1 -b .256180 @@ -361,7 +358,7 @@ This package contains results of tests executed during build. %ifarch %{arm} %patch415 -p1 -b .mozilla-1238661 %endif -#%patch416 -p1 -b .1424422 +%patch416 -p1 -b .1424422 #%patch417 -p1 -b .bug1375074-save-restore-x28 %patch418 -p1 -b .mozilla-1436242 diff --git a/mozilla-1424422.patch b/mozilla-1424422.patch index cc8b31f..883e5bd 100644 --- a/mozilla-1424422.patch +++ b/mozilla-1424422.patch @@ -1,30 +1,28 @@ -diff -up firefox-60.0/browser/base/content/browser.js.1424422 firefox-60.0/browser/base/content/browser.js ---- firefox-60.0/browser/base/content/browser.js.1424422 2018-04-26 22:07:20.000000000 +0200 -+++ firefox-60.0/browser/base/content/browser.js 2018-04-30 11:49:51.609458857 +0200 -@@ -1259,6 +1259,9 @@ var gBrowserInit = { +diff -up firefox-61.0/browser/base/content/browser.js.1424422 firefox-61.0/browser/base/content/browser.js +diff -up firefox-61.0/browser/base/content/browser-tabsintitlebar.js.1424422 firefox-61.0/browser/base/content/browser-tabsintitlebar.js +--- firefox-61.0/browser/base/content/browser-tabsintitlebar.js.1424422 2018-06-19 01:03:32.000000000 +0200 ++++ firefox-61.0/browser/base/content/browser-tabsintitlebar.js 2018-06-20 14:59:44.121827553 +0200 +@@ -36,6 +36,7 @@ var TabsInTitlebar = { + window.addEventListener("resize", this); - if (AppConstants.CAN_DRAW_IN_TITLEBAR) { - gDragSpaceObserver.init(); -+ if (AppConstants.platform == "linux") { -+ gLightThemeObserver.init(); -+ } - } - - BrowserSearch.initPlaceHolder(); -@@ -1826,6 +1829,9 @@ var gBrowserInit = { + gDragSpaceObserver.init(); ++ gLightThemeObserver.init(); - if (AppConstants.CAN_DRAW_IN_TITLEBAR) { - gDragSpaceObserver.uninit(); -+ if (AppConstants.platform == "linux") { -+ gLightThemeObserver.uninit(); -+ } - } + this._initialized = true; + this.update(); +@@ -302,6 +303,7 @@ var TabsInTitlebar = { + this._menuObserver.disconnect(); + CustomizableUI.removeListener(this); + gDragSpaceObserver.uninit(); ++ gLightThemeObserver.uninit(); + } + }; - TabsInTitlebar.uninit(); -@@ -5781,6 +5787,24 @@ var gDragSpaceObserver = { +@@ -343,3 +345,21 @@ var gDragSpaceObserver = { + TabsInTitlebar.update(); }, }; - ++ +var gLightThemeObserver = { + init() { + Services.obs.addObserver(this, "lightweight-theme-styling-update"); @@ -42,51 +40,10 @@ diff -up firefox-60.0/browser/base/content/browser.js.1424422 firefox-60.0/brows + } + }, +}; -+ - // Updates the UI density (for touch and compact mode) based on the uidensity pref. - var gUIDensity = { - MODE_NORMAL: 0, -diff -up firefox-60.0/browser/themes/linux/browser.css.1424422 firefox-60.0/browser/themes/linux/browser.css ---- firefox-60.0/browser/themes/linux/browser.css.1424422 2018-04-26 22:07:21.000000000 +0200 -+++ firefox-60.0/browser/themes/linux/browser.css 2018-04-30 11:45:40.388172492 +0200 -@@ -691,12 +691,34 @@ notification[value="translation"] menuli - padding-bottom: 2px; - } - -+ /* When default theme is used render titlebar command buttons -+ * according to system config. -+ * -+ * When -moz-lwtheme is enabled use similar approach as on Windows platform. -+ */ -+ .titlebar-button:-moz-lwtheme { -+ border: none; -+ margin: 0 !important; -+ padding: 8px 17px; -+ } -+ .titlebar-button:-moz-lwtheme > .toolbarbutton-icon { -+ width: 12px; -+ height: 12px; -+ } -+ .titlebar-button:hover:-moz-lwtheme { -+ background-color: Highlight; -+ } -+ - /* Render titlebar command buttons according to system config. - * Use full scale icons here as the Gtk+ does. - */ - @media (-moz-gtk-csd-minimize-button) { -- #titlebar-min { -- -moz-appearance: -moz-window-button-minimize; -+ #titlebar-min:not(:-moz-lwtheme) { -+ -moz-appearance: -moz-window-button-minimize; -+ } -+ #titlebar-min:-moz-lwtheme { -+ -moz-appearance: none !important; -+ list-style-image: url(chrome://browser/skin/window-controls/minimize-themes.svg); - } - } - @media (-moz-gtk-csd-minimize-button: 0) { -@@ -706,12 +728,20 @@ notification[value="translation"] menuli +diff -up firefox-61.0/browser/themes/linux/browser.css.1424422 firefox-61.0/browser/themes/linux/browser.css +--- firefox-61.0/browser/themes/linux/browser.css.1424422 2018-06-19 01:03:33.000000000 +0200 ++++ firefox-61.0/browser/themes/linux/browser.css 2018-06-20 14:17:43.193681172 +0200 +@@ -709,12 +709,20 @@ notification[value="translation"] menuli } @media (-moz-gtk-csd-maximize-button) { @@ -109,7 +66,7 @@ diff -up firefox-60.0/browser/themes/linux/browser.css.1424422 firefox-60.0/brow } @media (-moz-gtk-csd-maximize-button: 0) { #titlebar-max { -@@ -720,9 +750,13 @@ notification[value="translation"] menuli +@@ -723,9 +731,13 @@ notification[value="translation"] menuli } @media (-moz-gtk-csd-close-button) { @@ -124,26 +81,10 @@ diff -up firefox-60.0/browser/themes/linux/browser.css.1424422 firefox-60.0/brow } @media (-moz-gtk-csd-close-button: 0) { #titlebar-close { -diff -up firefox-60.0/browser/themes/linux/jar.mn.1424422 firefox-60.0/browser/themes/linux/jar.mn ---- firefox-60.0/browser/themes/linux/jar.mn.1424422 2018-04-26 22:07:20.000000000 +0200 -+++ firefox-60.0/browser/themes/linux/jar.mn 2018-04-30 11:45:40.388172492 +0200 -@@ -49,9 +49,12 @@ browser.jar: - * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) - skin/classic/browser/preferences/applications.css (preferences/applications.css) - skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png) -- - skin/classic/browser/sync-desktopIcon.svg (../shared/sync-desktopIcon.svg) - skin/classic/browser/sync-mobileIcon.svg (../shared/sync-mobileIcon.svg) -+ skin/classic/browser/window-controls/close-themes.svg (window-controls/close-themes.svg) -+ skin/classic/browser/window-controls/maximize-themes.svg (window-controls/maximize-themes.svg) -+ skin/classic/browser/window-controls/minimize-themes.svg (window-controls/minimize-themes.svg) -+ skin/classic/browser/window-controls/restore-themes.svg (window-controls/restore-themes.svg) - skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png) - - [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: -diff -up firefox-60.0/browser/themes/linux/window-controls/close-themes.svg.1424422 firefox-60.0/browser/themes/linux/window-controls/close-themes.svg ---- firefox-60.0/browser/themes/linux/window-controls/close-themes.svg.1424422 2018-04-30 11:45:40.388172492 +0200 -+++ firefox-60.0/browser/themes/linux/window-controls/close-themes.svg 2018-04-30 11:45:40.388172492 +0200 +diff -up firefox-61.0/browser/themes/linux/jar.mn.1424422 firefox-61.0/browser/themes/linux/jar.mn +diff -up firefox-61.0/browser/themes/linux/window-controls/close-themes.svg.1424422 firefox-61.0/browser/themes/linux/window-controls/close-themes.svg +--- firefox-61.0/browser/themes/linux/window-controls/close-themes.svg.1424422 2018-06-20 14:17:43.194681169 +0200 ++++ firefox-61.0/browser/themes/linux/window-controls/close-themes.svg 2018-06-20 14:17:43.194681169 +0200 @@ -0,0 +1,7 @@ +