M .github/workflows/build.yml +0 -2
@@ 65,8 65,6 @@ jobs:
if: steps.cache-dependencies.outputs.cache-hit != 'true' && env.nocache == 'false'
run: |
CC=clang CXX=clang++ ./mach build
- sed -i "s/'MOZ_APP_NAME': 'firefox'/'MOZ_APP_NAME': 'flamewolf'/g" obj-x86_64-pc-linux-gnu/config.status
- CC=clang CXX=clang++ ./mach build
./mach package
- name: Rename artifact
A => .nocache +0 -0
M browser/branding/flamewolf/branding.nsi +3 -3
@@ 11,9 11,9 @@
!define BrandFullNameInternal "FlameWolf"
!define BrandFullName "FlameWolf"
!define CompanyName "FlameWolf Authors"
-!define URLInfoAbout "https://www.mozilla.org"
-!define URLUpdateInfo "https://www.mozilla.org/firefox/${AppVersion}/releasenotes"
-!define HelpLink "https://support.mozilla.org"
+!define URLInfoAbout "https://flame.rajdeepm.xyz"
+!define URLUpdateInfo "https://github.com/rustdevbtw/flamewolf/releases/v${AppVersion}"
+!define HelpLink "https://github.com/rustdevbtw/flamewolf/issues"
; The OFFICIAL define is a workaround to support different urls for Release and
; Beta since they share the same branding when building with other branches that
M browser/branding/flamewolf/locales/en-US/brand.ftl +1 -1
@@ 23,5 23,5 @@
# This brand name can be used in messages where the product name needs to
# remain unchanged across different versions (Nightly, Beta, etc.).
-brand-product-name = FlameWolf
--vendor-short-name = FlameWolf Authors
+-vendor-short-name = FlameWolf Community
trademarkInfo = FlameWolf and the FlameWolf logos are trademarks of the FlameWolf Authors.
M browser/branding/flamewolf/pref/firefox-branding.js +12 -12
@@ 17,20 17,20 @@ pref("app.update.promptWaitTime", 691200
// update" link supplied in the "An update is available" page of the update
// wizard.
#if MOZ_UPDATE_CHANNEL == beta
- pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/beta?reason=manual-update");
- pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/beta/notes");
- pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=whatsnew");
- pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
+pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/beta?reason=manual-update");
+pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/beta/notes");
+pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=whatsnew");
+pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
#elifdef MOZ_ESR
- pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/enterprise?reason=manual-update");
- pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/organizations/notes");
- pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=whatsnew");
- pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
+pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/enterprise?reason=manual-update");
+pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/organizations/notes");
+pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=whatsnew");
+pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
#else
- pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/new?reason=manual-update");
- pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes");
- pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=whatsnew");
- pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
+pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/new?reason=manual-update");
+pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes");
+pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=whatsnew");
+pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
#endif
pref("app.releaseNotesURL.prompt", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=updateprompt");
M browser/config/mozconfig +1 -2
@@ 40,10 40,9 @@ ac_add_options RUSTC_OPT_LEVEL="3"
mk_add_options MOZ_DATA_REPORTING=0
mk_add_options MOZ_SERVICES_HEALTHREPORT=0
mk_add_options MOZ_TELEMETRY_REPORTING=0
-mk_add_options MOZ_APP_NAME="flamewolf"
ac_add_options --disable-artifact-builds
export MOZ_ENABLE_WAYLAND=1
-export MOZ_APP_NAME="flamewolf"
+ac_add_options --with-app-basename="Flamewolf"
ac_add_options --with-system-jpeg
ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
M browser/config/version.txt +1 -1
@@ 1,1 1,1 @@
-128.1.0
+128.1.1
M browser/config/version_display.txt +1 -1
@@ 1,1 1,1 @@
-128.1.0esr
+128.1.1esr
M mobile/android/version.txt +1 -1
@@ 1,1 1,1 @@
-128.0
+128.1
M netwerk/protocol/http/nsHttpHandler.cpp +10 -18
@@ 860,19 860,15 @@ void nsHttpHandler::BuildUserAgent() {
mUserAgent += '/';
mUserAgent += mProductSub;
- bool isFirefox = mAppName.EqualsLiteral("Firefox");
- if (isFirefox || mCompatFirefoxEnabled) {
- // "Firefox/x.y" (compatibility) app token
- mUserAgent += ' ';
- mUserAgent += mCompatFirefox;
- }
- if (!isFirefox) {
- // App portion
- mUserAgent += ' ';
- mUserAgent += mAppName;
- mUserAgent += '/';
- mUserAgent += mAppVersion;
- }
+ // "Firefox/x.y" (compatibility) app token
+ mUserAgent += ' ';
+ mUserAgent += mCompatFirefox;
+
+ // App portion
+ mUserAgent += ' ';
+ mUserAgent += mAppName;
+ mUserAgent += '/';
+ mUserAgent += mAppVersion;
}
#ifdef XP_WIN
@@ 1085,11 1081,7 @@ void nsHttpHandler::PrefsChanged(const c
bool cVar = false;
- if (PREF_CHANGED(UA_PREF("compatMode.firefox"))) {
- rv = Preferences::GetBool(UA_PREF("compatMode.firefox"), &cVar);
- mCompatFirefoxEnabled = (NS_SUCCEEDED(rv) && cVar);
- mUserAgentIsDirty = true;
- }
+ mCompatFirefoxEnabled = true;
// general.useragent.override
if (PREF_CHANGED(UA_PREF("override"))) {
M netwerk/protocol/http/nsHttpHandler.h +3 -1
@@ 637,7 637,9 @@ class nsHttpHandler final : public nsIHt
nsCString mAppName;
nsCString mAppVersion;
nsCString mCompatFirefox;
- bool mCompatFirefoxEnabled{false};
+ // Enable Firefox compat by default (bug:
+ // https://github.com/rustdevbtw/flamewolf/issues/12)
+ bool mCompatFirefoxEnabled{true};
nsCString mCompatDevice;
nsCString mDeviceModelId;
M toolkit/moz.configure +1 -2
@@ 3194,8 3194,7 @@ with only_when(compile_environment):
"MOZ_NORMANDY",
)
def data_reporting(telemetry, healthreport, crashreporter, normandy):
- return telemetry or healthreport or crashreporter or normandy
-
+ return False
set_config("MOZ_DATA_REPORTING", True, when=data_reporting)
set_define("MOZ_DATA_REPORTING", True, when=data_reporting)