Skip to content

Commit

Permalink
final migrate to esr128
Browse files Browse the repository at this point in the history
  • Loading branch information
Ponchale committed Sep 17, 2024
1 parent 58fd993 commit 1ff9155
Show file tree
Hide file tree
Showing 4,060 changed files with 17,298 additions and 676,395 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .github/workflows/src/linux/shared/mozconfig_linux_base
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ac_add_options --with-app-name=midori
ac_add_options --with-app-basename=Midori
ac_add_options --with-branding=browser/branding/official

ac_add_options --disable-crashreporter
ac_add_options --enable-proxy-bypass-protection

Expand All @@ -9,6 +10,7 @@ ac_add_options --enable-update-channel=release

ac_add_options --with-mozilla-api-keyfile="$PWD/floorp/apis/api-mozilla-key"
ac_add_options --with-google-location-service-api-keyfile="$PWD/floorp/apis/api-google-location-service-key"

ac_add_options --enable-bootstrap
ac_add_options --with-l10n-base="$PWD/floorp/browser/locales/l10n-central"

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/src/mac/shared/mozconfig_darwin_pgo_base
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
ac_add_options --with-app-name=midori
ac_add_options --with-app-basename=Midori
ac_add_options --with-branding=browser/branding/official


ac_add_options --with-mozilla-api-keyfile="$PWD/floorp/apis/api-mozilla-key"
ac_add_options --with-google-location-service-api-keyfile="$PWD/floorp/apis/api-google-location-service-key"
ac_add_options --with-google-safebrowsing-api-keyfile="$PWD/floorp/apis/api-google-safe-browsing-key"

ac_add_options --with-l10n-base="$PWD/floorp/browser/locales/l10n-central"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ac_add_options --with-app-name=midori
ac_add_options --with-app-basename=Midori
ac_add_options --with-branding=browser/branding/official

ac_add_options --disable-crashreporter
ac_add_options --disable-maintenance-service
ac_add_options --enable-proxy-bypass-protection
Expand All @@ -19,7 +20,6 @@ ac_add_options --enable-bootstrap

ac_add_options --with-mozilla-api-keyfile="$PWD/floorp/apis/api-mozilla-key"
ac_add_options --with-google-location-service-api-keyfile="$PWD/floorp/apis/api-google-location-service-key"
ac_add_options --with-google-safebrowsing-api-keyfile="$PWD/floorp/apis/api-google-safe-browsing-key"

export WINSYSROOT="$(echo ~)/win-cross/vs2022"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
ac_add_options --with-app-name=midori
ac_add_options --with-app-basename=Midori
ac_add_options --with-branding=browser/branding/official

ac_add_options --disable-crashreporter
ac_add_options --disable-maintenance-service
ac_add_options --enable-proxy-bypass-protection
Expand All @@ -21,7 +22,6 @@ ac_add_options --enable-bootstrap

ac_add_options --with-mozilla-api-keyfile="$PWD/floorp/apis/api-mozilla-key"
ac_add_options --with-google-location-service-api-keyfile="$PWD/floorp/apis/api-google-location-service-key"
ac_add_options --with-google-safebrowsing-api-keyfile="$PWD/floorp/apis/api-google-safe-browsing-key"

export WIN_UCRT_REDIST_DIR="$(echo ~)/win-cross/vs2022/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/x86"
export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2022/VC/Redist/MSVC/14.38.33135/x86/Microsoft.VC143.CRT"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
ac_add_options --with-app-name=midori
ac_add_options --with-app-basename=Midori
ac_add_options --with-branding=browser/branding/official


ac_add_options --disable-crashreporter
ac_add_options --disable-maintenance-service
ac_add_options --enable-proxy-bypass-protection
Expand All @@ -19,7 +21,6 @@ ac_add_options --enable-bootstrap

ac_add_options --with-mozilla-api-keyfile="$PWD/floorp/apis/api-mozilla-key"
ac_add_options --with-google-location-service-api-keyfile="$PWD/floorp/apis/api-google-location-service-key"
ac_add_options --with-google-safebrowsing-api-keyfile="$PWD/floorp/apis/api-google-safe-browsing-key"

export WIN_UCRT_REDIST_DIR="$(echo ~)/win-cross/vs2022/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/x64"
export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2022/VC/Redist/MSVC/14.38.33135/x64/Microsoft.VC143.CRT"
Expand Down
8 changes: 0 additions & 8 deletions browser/actors/AboutPluginsChild.sys.mjs

This file was deleted.

40 changes: 0 additions & 40 deletions browser/actors/AboutPluginsParent.sys.mjs

This file was deleted.

8 changes: 8 additions & 0 deletions browser/actors/ScreenshotsComponentChild.sys.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,21 @@ export class ScreenshotsComponentChild extends JSWindowActorChild {
"mousemove",
"mousedown",
"mouseup",
"mouseenter",
"mouseover",
"mouseout",
"mouseleave",
"touchstart",
"touchmove",
"touchend",
"dblclick",
"auxclick",
"keypress",
"contextmenu",
"pointerenter",
"pointerover",
"pointerout",
"pointerleave",
];

get overlay() {
Expand Down
4 changes: 0 additions & 4 deletions browser/actors/test/browser/browser.ini

This file was deleted.

4 changes: 2 additions & 2 deletions browser/app/firefox.exe.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="*"
name="Floorp"
name="Midori"
type="win32"
/>
<description>Floorp</description>
<description>Midori</description>
<dependency>
<dependentAssembly>
<assemblyIdentity
Expand Down
47 changes: 0 additions & 47 deletions browser/app/midori.exe.manifest

This file was deleted.

6 changes: 0 additions & 6 deletions browser/app/profile/firefox.js
Original file line number Diff line number Diff line change
Expand Up @@ -1194,18 +1194,12 @@ pref("network.manage-offline-status", true);

// We want to make sure mail URLs are handled externally...
pref("network.protocol-handler.external.mailto", true); // for mail
pref("network.protocol-handler.external.news", true); // for news
pref("network.protocol-handler.external.snews", true); // for secure news
pref("network.protocol-handler.external.nntp", true); // also news
#ifdef XP_WIN
pref("network.protocol-handler.external.ms-windows-store", true);
#endif

// ...without warning dialogs
pref("network.protocol-handler.warn-external.mailto", false);
pref("network.protocol-handler.warn-external.news", false);
pref("network.protocol-handler.warn-external.snews", false);
pref("network.protocol-handler.warn-external.nntp", false);
#ifdef XP_WIN
pref("network.protocol-handler.warn-external.ms-windows-store", false);
#endif
Expand Down
30 changes: 8 additions & 22 deletions browser/base/content/aboutDialog.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

<html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="browser/aboutDialog.ftl"/>
<html:link rel="localization" href="browser/floorp.ftl"/>
</linkset>

<html:div id="aboutDialogContainer">
Expand Down Expand Up @@ -118,28 +119,13 @@
</vbox>
#endif
</hbox>

#ifdef MOZ_UPDATER
<description class="text-blurb" id="currentChannelText"
data-l10n-id="aboutdialog-channel-description"
data-l10n-attrs="{&quot;channel&quot;: &quot;&quot;}">
<label id="currentChannel" data-l10n-name="current-channel"/>
</description>
#endif
<vbox id="experimental" hidden="true">
<description class="text-blurb" id="warningDesc" data-l10n-id="warningDesc-version"></description>
<description class="text-blurb" id="communityExperimentalDesc" data-l10n-id="community-exp">
<label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="community-exp-mozillaLink"/>
<label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"/>
</description>
</vbox>
<description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
<label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="community-mozillaLink"/>
<label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/>
<description class="text-blurb" id="communityDesc" data-l10n-id="about-floorp">
<label is="text-link" href="https://astian.org/midori-browser" data-l10n-name="floorp-browser-link"/>
<label is="text-link" href="https://astian.org" data-l10n-name="ablaze-Link"/>
<label is="text-link" href="https://donate.stripe.com/00g6s675Xawl6ZO9AH" data-l10n-name="helpus-donateLink"/>
</description>
<description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
<label is="text-link" href="https://foundation.mozilla.org/?form=firefox-about" data-l10n-name="helpus-donateLink"/>
<label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>
<description class="text-blurb" id="floorp-contributor" data-l10n-id="contributors">
<label is="text-link" useoriginprincipal="true" href="about:contributors" data-l10n-name="about-contributor"/>
</description>
</vbox>
</vbox>
Expand All @@ -148,7 +134,7 @@
<hbox pack="center">
<label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>
<label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"/>
<label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"/>
<label is="text-link" class="bottom-link" href="https://astian.org/astian-privacy-policies/" data-l10n-id="bottomLinks-privacy"/>
</hbox>
<description id="trademark" data-l10n-id="trademarkInfo"></description>
</vbox>
Expand Down
43 changes: 0 additions & 43 deletions browser/base/content/browser-allTabsMenu.inc.xhtml

This file was deleted.

Loading

0 comments on commit 1ff9155

Please sign in to comment.