diff options
-rw-r--r-- | PKGBUILD | 4 | ||||
-rwxr-xr-x | binary_tarball/scripts/3_Configure_Source_Code.sh | 2 | ||||
-rw-r--r-- | megabar.patch | 106 |
3 files changed, 55 insertions, 57 deletions
@@ -41,13 +41,13 @@ sha256sums_x86_64=('291a593151e476e6c4b61e48a3bdd5a11896fbde6261dcad347d5b7df265 '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' 'SKIP' 'SKIP' - '305b3ac9b96430eb71035ddff558995268a88646d9b4ead50316b39af9da53c7' + '2bef819c55935f6c72a7aa28273ecddfce0888429a32465feb6c34a16ff1ed9c' '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0') sha256sums_aarch64=('291a593151e476e6c4b61e48a3bdd5a11896fbde6261dcad347d5b7df265a058' '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' 'SKIP' 'SKIP' - '305b3ac9b96430eb71035ddff558995268a88646d9b4ead50316b39af9da53c7' + '2bef819c55935f6c72a7aa28273ecddfce0888429a32465feb6c34a16ff1ed9c' '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0' '6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7' '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index 457b1b2..84b4858 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -110,9 +110,7 @@ END fi # hopefully the magic sauce that makes things build on 16.04 and later on work "everywhere": -patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/drop-check-glibc-symbols.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/build-with-libstdc++-7.patch" -patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/drop-libstdcxx-check.patch" # Remove some pre-installed addons that might be questionable patch -p1 -i ${CI_PROJECT_DIR}/remove_addons.patch diff --git a/megabar.patch b/megabar.patch index 3b03191..7929773 100644 --- a/megabar.patch +++ b/megabar.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm -index c557a10..e2c20af 100644 +index 18d73db..7911576 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm -@@ -1090,13 +1090,13 @@ class UrlbarInput { +@@ -1172,13 +1172,13 @@ class UrlbarInput { // Enable the animation only after the first extend call to ensure it // doesn't run when opening a new window. @@ -23,55 +23,8 @@ index c557a10..e2c20af 100644 } endLayoutExtend() { -diff --git a/browser/themes/shared/urlbar-autocomplete.inc.css b/browser/themes/shared/urlbar-autocomplete.inc.css -index 13a4595..eda7bdf 100644 ---- a/browser/themes/shared/urlbar-autocomplete.inc.css -+++ b/browser/themes/shared/urlbar-autocomplete.inc.css -@@ -48,8 +48,8 @@ - display: block; - text-shadow: none; - overflow: -moz-hidden-unscrollable; -- margin-inline: @urlbarViewMarginInline@; -- width: calc(100% - 2 * @urlbarViewMarginInline@); -+ margin-inline: 0; -+ width: 100%; - - /* Match urlbar-background's border. */ - border-inline: 1px solid transparent; -@@ -72,7 +72,7 @@ - .urlbarView-row { - fill: currentColor; - fill-opacity: .6; -- padding-block: 3px; -+ padding-block: 0; - } - - .urlbarView-row-inner { -@@ -179,6 +179,7 @@ - background-repeat: no-repeat; - background-size: contain; - -moz-context-properties: fill, fill-opacity; -+ margin-inline-start: 20px; - } - - @media (min-resolution: 2dppx) { -@@ -200,10 +201,10 @@ - - .urlbarView-type-icon { - position: absolute; -- min-width: 12px; -- height: 12px; -- margin-bottom: -4px; -- margin-inline-start: 8px; -+ min-width: 16px; -+ height: 16px; -+ margin-bottom: 0; -+ margin-inline-start: 0; - background-repeat: no-repeat; - background-size: contain; - -moz-context-properties: fill, stroke; diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css -index 5d5a3d1..4e84a7f 100644 +index 0b1f693..7de64a1 100644 --- a/browser/themes/shared/urlbar-searchbar.inc.css +++ b/browser/themes/shared/urlbar-searchbar.inc.css @@ -6,7 +6,7 @@ @@ -83,7 +36,7 @@ index 5d5a3d1..4e84a7f 100644 %define urlbarSearchButtonWidth calc(16px + 2 * @identityBoxPaddingInline@) :root { -@@ -196,13 +196,13 @@ +@@ -197,13 +197,13 @@ } #urlbar[breakout][breakout-extend] { @@ -101,7 +54,7 @@ index 5d5a3d1..4e84a7f 100644 } #urlbar[breakout][breakout-extend][open] > #urlbar-background { -@@ -210,9 +210,9 @@ +@@ -211,9 +211,9 @@ } #urlbar[breakout][breakout-extend] > #urlbar-input-container { @@ -114,7 +67,7 @@ index 5d5a3d1..4e84a7f 100644 } #urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button { -@@ -230,7 +230,7 @@ +@@ -231,7 +231,7 @@ } #urlbar[breakout][breakout-extend] > #urlbar-background { @@ -123,3 +76,50 @@ index 5d5a3d1..4e84a7f 100644 animation-duration: 0s; animation-timing-function: var(--animation-easing-function); } +diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css +index 6b8cac0..54648c6 100644 +--- a/browser/themes/shared/urlbarView.inc.css ++++ b/browser/themes/shared/urlbarView.inc.css +@@ -48,8 +48,8 @@ + display: block; + text-shadow: none; + overflow: -moz-hidden-unscrollable; +- margin-inline: @urlbarViewMarginInline@; +- width: calc(100% - 2 * @urlbarViewMarginInline@); ++ margin-inline: 0; ++ width: 100%; + + /* Match urlbar-background's border. */ + border-inline: 1px solid transparent; +@@ -72,7 +72,7 @@ + .urlbarView-row { + fill: currentColor; + fill-opacity: .6; +- padding-block: 3px; ++ padding-block: 0; + } + + .urlbarView-row-inner { +@@ -179,6 +179,7 @@ + background-repeat: no-repeat; + background-size: contain; + -moz-context-properties: fill, fill-opacity; ++ margin-inline-start: 20px; + } + + @media (min-resolution: 2dppx) { +@@ -204,10 +205,10 @@ + + .urlbarView-type-icon { + position: absolute; +- min-width: 12px; +- height: 12px; +- margin-bottom: -4px; +- margin-inline-start: 8px; ++ min-width: 16px; ++ height: 16px; ++ margin-bottom: 0; ++ margin-inline-start: 0; + background-repeat: no-repeat; + background-size: contain; + -moz-context-properties: fill, stroke; |