MR fixes
This commit is contained in:
commit
13933c536e
6 changed files with 78 additions and 15 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -7,4 +7,3 @@ mozconfig
|
||||||
Makefile
|
Makefile
|
||||||
librewolf
|
librewolf
|
||||||
installer_win.nsi
|
installer_win.nsi
|
||||||
firefox-85.0.find
|
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@ But we have a zip file and an installer available for testing right now..
|
||||||
|
|
||||||
Note: If your version of LibreWolf does _not_ run, an additional install of the [vc_redist.x64.exe](https://aka.ms/vs/16/release/VC_redist.x64.exe) component might be required.
|
Note: If your version of LibreWolf does _not_ run, an additional install of the [vc_redist.x64.exe](https://aka.ms/vs/16/release/VC_redist.x64.exe) component might be required.
|
||||||
|
|
||||||
Please consult the file **KNOWN_ISSUES.md** above, to see if your issue is already reported.
|
Please consult the file _KNOWN_ISSUES.md_ above, to see if your issue is already reported.
|
||||||
|
|
|
||||||
29
build.sh
29
build.sh
|
|
@ -9,15 +9,18 @@ pkgver=85.0.1
|
||||||
|
|
||||||
|
|
||||||
fetch() {
|
fetch() {
|
||||||
|
# fetch the firefox source.
|
||||||
rm -vf firefox-$pkgver.source.tar.xz
|
rm -vf firefox-$pkgver.source.tar.xz
|
||||||
wget https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
|
wget https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
|
||||||
|
|
||||||
# the settings and common submodules should be checked out to allow the build
|
# the settings and common submodules should be checked out with --recursive to allow the build
|
||||||
|
|
||||||
rm -vf megabar.patch remove_addons.patch unity-menubar.patch
|
# get the patches
|
||||||
wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch
|
echo 'Getting patches..'
|
||||||
wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/remove_addons.patch
|
rm -f megabar.patch remove_addons.patch unity-menubar.patch
|
||||||
wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/unity-menubar.patch
|
wget -q https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch
|
||||||
|
wget -q https://gitlab.com/librewolf-community/browser/linux/-/raw/master/remove_addons.patch
|
||||||
|
wget -q https://gitlab.com/librewolf-community/browser/linux/-/raw/master/unity-menubar.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -42,7 +45,7 @@ ac_add_options --enable-hardening
|
||||||
ac_add_options --enable-rust-simd
|
ac_add_options --enable-rust-simd
|
||||||
|
|
||||||
|
|
||||||
# as suggested by Mental Outlaw in https://www.youtube.com/watch?v=L2otiFy4ADI
|
# Does anybody even use webrtc? waiting for an issue on it..
|
||||||
ac_add_options --disable-webrtc
|
ac_add_options --disable-webrtc
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -70,8 +73,9 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0
|
||||||
#WIN32_REDIST_DIR=$VCINSTALLDIR\redist\x86\Microsoft.VC141.CRT
|
#WIN32_REDIST_DIR=$VCINSTALLDIR\redist\x86\Microsoft.VC141.CRT
|
||||||
END
|
END
|
||||||
|
|
||||||
|
echo 'Applying patches...'
|
||||||
|
|
||||||
|
# Apply patches..
|
||||||
patch -p1 -i ../remove_addons.patch
|
patch -p1 -i ../remove_addons.patch
|
||||||
patch -p1 -i ../megabar.patch
|
patch -p1 -i ../megabar.patch
|
||||||
patch -p1 -i ../unity-menubar.patch
|
patch -p1 -i ../unity-menubar.patch
|
||||||
|
|
@ -80,6 +84,7 @@ END
|
||||||
|
|
||||||
# Disabling Pocket
|
# Disabling Pocket
|
||||||
sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build
|
sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build
|
||||||
|
|
||||||
# this one only to remove an annoying error message:
|
# this one only to remove an annoying error message:
|
||||||
sed -i 's#SaveToPocket.init();#// SaveToPocket.init();#g' browser/components/BrowserGlue.jsm
|
sed -i 's#SaveToPocket.init();#// SaveToPocket.init();#g' browser/components/BrowserGlue.jsm
|
||||||
|
|
||||||
|
|
@ -120,7 +125,7 @@ END
|
||||||
cp -r ../common/source_files/* ./
|
cp -r ../common/source_files/* ./
|
||||||
|
|
||||||
# FIXME: this 'mozconfig' file in the 'common' submodule should be removed
|
# FIXME: this 'mozconfig' file in the 'common' submodule should be removed
|
||||||
# this submodule is purely for the branding.
|
# this submodule is purely for the branding. (not removing this breaks the build)
|
||||||
rm -f mozconfig
|
rm -f mozconfig
|
||||||
|
|
||||||
# FIXME: on windows: the stubinstaller folder is missing from the librewolf branding folder.
|
# FIXME: on windows: the stubinstaller folder is missing from the librewolf branding folder.
|
||||||
|
|
@ -138,9 +143,7 @@ END
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd firefox-$pkgver
|
cd firefox-$pkgver
|
||||||
|
|
||||||
./mach build
|
./mach build
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -148,12 +151,12 @@ build() {
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd firefox-$pkgver
|
cd firefox-$pkgver
|
||||||
|
|
||||||
./mach package
|
./mach package
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
installer_win() {
|
installer_win() {
|
||||||
cd firefox-$pkgver
|
cd firefox-$pkgver
|
||||||
|
|
||||||
|
|
|
||||||
BIN
missing_branding_files/content/about-background.png
Normal file
BIN
missing_branding_files/content/about-background.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 39 KiB |
54
missing_branding_files/content/aboutDialog.css
Normal file
54
missing_branding_files/content/aboutDialog.css
Normal file
|
|
@ -0,0 +1,54 @@
|
||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
#aboutDialogContainer {
|
||||||
|
background-image: url("chrome://branding/content/about-background.png");
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-color: #00acff;
|
||||||
|
color: #090909;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
firefox-85.0/browser/base/content/aboutDialog.css
|
||||||
|
firefox-85.0/browser/base/content/aboutDialog.js
|
||||||
|
firefox-85.0/browser/base/content/aboutDialog.xhtml
|
||||||
|
*/
|
||||||
|
/* enable this below for ESR version */
|
||||||
|
/* #release { display: inline; } */
|
||||||
|
|
||||||
|
|
||||||
|
.text-link {
|
||||||
|
color: #101010 !important;
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
#rightBox {
|
||||||
|
/* this margin prevents text from overlapping the planet image */
|
||||||
|
|
||||||
|
background-image: none; /* getting rid of the 'Nightly' text */
|
||||||
|
|
||||||
|
margin-left: 275px;
|
||||||
|
margin-top: 50px;
|
||||||
|
margin-right: 20px;
|
||||||
|
|
||||||
|
min-height: 260px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#bottomBox {
|
||||||
|
background-color: rgba(0,0,0,.7);
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#leftBox {
|
||||||
|
#display: none;
|
||||||
|
# background-image: url("chrome://branding/content/about-logo.png");
|
||||||
|
# background-repeat: no-repeat;
|
||||||
|
# background-size: 192px auto;
|
||||||
|
# background-position: center 20%;
|
||||||
|
# /* min-width and min-height create room for the logo */
|
||||||
|
min-width: 210px;
|
||||||
|
min-height: 220px;
|
||||||
|
margin-top: 20px;
|
||||||
|
margin-inline-start: 30px;
|
||||||
|
}
|
||||||
7
missing_branding_files/pref/firefox-branding.js
Normal file
7
missing_branding_files/pref/firefox-branding.js
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
pref("startup.homepage_welcome_url", "https://librewolf-community.gitlab.io/");
|
||||||
|
|
||||||
|
|
||||||
Loading…
Add table
Reference in a new issue