Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit be23e68

Browse files
trickyprtrickypr
authored
Merge branch 'alpha' into beta
2 parents 3595c00 + 6e4e992 commit be23e68

File tree

14 files changed

+85
-64
lines changed

14 files changed

+85
-64
lines changed

‎.github/PULL_REQUEST_TEMPLATE/ff_update.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This bumps Firefox up to `{NEW_VERSION}` for security and performance reasons. R
2222
- [ ] Tabliss is loading correctly
2323
- [ ] Tabliss does not have the webextention symbol in the title bar
2424
- [ ] uBlock origin is loading correctly
25-
- [ ] QR Code Generator is loading correctly
25+
- [ ] QRCode generator is loading correctly
2626

2727
- [ ] About dialog
2828

‎.github/workflows/alpha.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,15 @@ jobs:
316316
run: yarn imp
317317

318318
- name: Build
319-
run: yarn build -- --skip-patch-check
319+
shell: powershell.exe C:\mozilla-build\start-shell.bat "{0}"
320+
run: |
321+
cd /c/actions-runner/_work/browser/browser # mozillabuild defaults to ~
322+
yarn build --skip-patch-check
320323
321324
- name: Package
325+
shell: powershell.exe C:\mozilla-build\start-shell.bat "{0}"
322326
run: |
327+
cd /c/actions-runner/_work/browser/browser # mozillabuild defaults to ~
323328
yarn package
324329
mv ./dist/output.mar windows.mar
325330
@@ -402,8 +407,13 @@ jobs:
402407

403408
- name: Install flatpak builder
404409
run: |
405-
sudo apt-get install -y flatpak-builder
406-
410+
sudo apt-get install -y flatpak-builder
411+
412+
- name: Install build dependancies
413+
run: |
414+
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
415+
flatpak install flathub org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08 org.mozilla.firefox.BaseApp//22.08 --assumeyes
416+
407417
- name: Import GPG keys
408418
run: |
409419
mkdir ~/.gpg

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ For bug reports, support, and just having a friendly chat with the team, feel fr
5151
## 🏗️ Credits
5252

5353
- Dot HQ's [melon build tool](https://github.com/dothq/melon), which was extracted from Dot Browser. They have been driving development of firefox forks and have made incredible progress. - [MPL-2.0 License](https://github.com/dothq/melon/blob/main/LICENSE)
54+
- We maintain our own fork, [Gluon](https://github.com/pulse-browser/gluon) which is used by this project
5455
- The [BetterFox](https://github.com/yokoffing/Better-Fox) user.js tweaks, which are used throughout the browser. - [MIT License](https://github.com/yokoffing/Better-Fox/blob/master/LICENSE)
5556
- [uBlock](https://github.com/gorhill/uBlock) extension from GitHub for blocking ads. - [GNU General Public License v3.0](https://github.com/gorhill/uBlock/blob/master/LICENSE.txt)
5657
- [Firefox-QR-Code-Generator](https://github.com/pulse-browser/firefox-qr-generator) extension from GitHub for a QR Code generator. - [MPL-2.0 License](https://github.com/pulse-browser/firefox-qr-generator/blob/main/LICENSE)

‎gluon.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"binaryName": "pulse-browser",
66
"version": {
77
"product": "firefox",
8-
"version": "106.0.5"
8+
"version": "107.0"
99
},
1010
"buildOptions": {
1111
"generateBranding": true
@@ -15,7 +15,7 @@
1515
"platform": "github",
1616
"id": "[email protected]",
1717
"repo": "gorhill/uBlock",
18-
"version": "1.44.4",
18+
"version": "1.45.2",
1919
"fileGlob": "uBlock0_*.firefox(.signed)?.xpi"
2020
},
2121
"tabliss": {
@@ -80,7 +80,7 @@
8080
"brandShortName": "Pulse Browser",
8181
"brandFullName": "Pulse Browser Alpha",
8282
"release": {
83-
"displayVersion": "1.0.0-a.32",
83+
"displayVersion": "1.0.0-a.37",
8484
"github": {
8585
"repo": "pulse-browser/browser"
8686
},

‎src/browser/app/profile/firefox-js.patch‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
2-
index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d746984613 100644
2+
index 14ecab77149f5645e24c8bffff57c223f64730bb..09bf8bebc166fb1e316e2c0c425f8117468281fc 100644
33
--- a/browser/app/profile/firefox.js
44
+++ b/browser/app/profile/firefox.js
55
@@ -19,6 +19,8 @@
@@ -19,32 +19,36 @@ index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d7
1919
pref("xpinstall.signatures.devInfoURL", "https://wiki.mozilla.org/Addons/Extension_Signing");
2020

2121
// Enable extensionStorage storage actor by default
22-
@@ -773,7 +774,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true);
22+
@@ -774,7 +775,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true);
2323
pref("browser.tabs.tooltipsShowPidAndActiveness", false);
2424
#endif
2525

2626
-pref("browser.tabs.firefox-view", true);
2727
+pref("browser.tabs.firefox-view", false);
2828
pref("browser.tabs.firefox-view.logLevel", "Warn");
29+
pref("browser.tabs.firefox-view.notify-for-tabs", false);
2930

30-
// allow_eval_* is enabled on Firefox Desktop only at this
31-
@@ -1937,7 +1938,6 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f
31+
@@ -1945,7 +1946,7 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f
3232
pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua");
3333

3434
// Default to enabling VPN promo messages to be shown when specified and allowed
3535
-pref("browser.vpn_promo.enabled", true);
36+
+pref("browser.vpn_promo.enabled", false);
3637
// Only show vpn card to certain regions. Comma separated string of two letter ISO 3166-1 country codes.
3738
// The most recent list of supported countries can be found at https://support.mozilla.org/en-US/kb/mozilla-vpn-countries-available-subscribe
3839
// The full list of supported country codes can also be found at https://github.com/mozilla/bedrock/search?q=VPN_COUNTRY_CODES
39-
@@ -2060,7 +2060,6 @@ pref("browser.tabs.crashReporting.includeURL", false);
40+
@@ -2066,10 +2067,6 @@ pref("browser.tabs.remote.warmup.unloadDelayMs", 2000);
41+
pref("browser.tabs.crashReporting.sendReport", true);
42+
pref("browser.tabs.crashReporting.includeURL", false);
4043

41-
// If true, unprivileged extensions may use experimental APIs on
42-
// nightly and developer edition.
44+
-// If true, unprivileged extensions may use experimental APIs on
45+
-// nightly and developer edition.
4346
-pref("extensions.experiments.enabled", false);
44-
47+
-
4548
#if defined(XP_LINUX) || defined(XP_WIN)
4649
// Allows us to adjust the priority of child processes at the OS level
47-
@@ -2108,13 +2107,6 @@ pref("browser.migrate.chrome.history.limit", 2000);
50+
pref("dom.ipc.processPriorityManager.enabled", true);
51+
@@ -2116,13 +2113,6 @@ pref("browser.migrate.chrome.history.limit", 2000);
4852
pref("browser.migrate.chrome.history.maxAgeInDays", 180);
4953
pref("browser.migrate.showBookmarksToolbarAfterMigration", true);
5054

@@ -58,13 +62,17 @@ index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d7
5862
// Enable Pocket button home panel for non link pages.
5963
pref("extensions.pocket.showHome", true);
6064

61-
@@ -2243,9 +2235,6 @@ pref("toolkit.coverage.enabled", false);
65+
@@ -2251,9 +2241,10 @@ pref("toolkit.coverage.enabled", false);
6266
pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org");
6367

6468
// Discovery prefs
6569
-pref("browser.discovery.enabled", true);
6670
-pref("browser.discovery.containers.enabled", true);
6771
-pref("browser.discovery.sites", "addons.mozilla.org");
72+
+//
73+
+// From memory, these connect to Google Analytics, so they are a no go
74+
+pref("browser.discovery.enabled", false);
75+
+pref("browser.discovery.containers.enabled", false);
6876

6977
pref("browser.engagement.recent_visited_origins.expiry", 86400); // 24 * 60 * 60 (24 hours in seconds)
7078
pref("browser.engagement.downloads-button.has-used", false);

‎src/browser/themes/BuiltInThemeConfig-jsm.patch‎ renamed to ‎src/browser/themes/BuiltInThemeConfig-sys-mjs.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
diff --git a/browser/themes/BuiltInThemeConfig.jsm b/browser/themes/BuiltInThemeConfig.jsm
2-
index 05bc07ac54fa43dd6bcce1f4ab619bc054cb8084..8ace74cac976889ca0e92910388fb5128436d013 100644
3-
--- a/browser/themes/BuiltInThemeConfig.jsm
4-
+++ b/browser/themes/BuiltInThemeConfig.jsm
5-
@@ -32,6 +32,20 @@ const BuiltInThemeConfig = new Map([
1+
diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs
2+
index 9c93c0d39ad11d95ecb4ad119d3c21da2528af23..e00efac497130363a41c0ecdbe07df761076b368 100644
3+
--- a/browser/themes/BuiltInThemeConfig.sys.mjs
4+
+++ b/browser/themes/BuiltInThemeConfig.sys.mjs
5+
@@ -32,6 +32,20 @@ export const BuiltInThemeConfig = new Map([
66
path: "resource://builtin-themes/dark/",
77
},
88
],

‎src/browser/themes/ThemeVariableMap-jsm.patch‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/browser/themes/ThemeVariableMap-sys-mjs.patch‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/browser/themes/ThemeVariableMap.sys.mjs b/browser/themes/ThemeVariableMap.sys.mjs
2+
index f2fd99193ddd0c24b7ad3ec953216973b162aaed..2d07c599152d8b0329f84a6cb626a1a40fdd241d 100644
3+
--- a/browser/themes/ThemeVariableMap.sys.mjs
4+
+++ b/browser/themes/ThemeVariableMap.sys.mjs
5+
@@ -126,7 +126,9 @@ export const ThemeVariableMap = [
6+
"--sidebar-background-color",
7+
{
8+
lwtProperty: "sidebar",
9+
- optionalElementID: "sidebar-box",
10+
+ // Pulse: we want to use the sidebar color in the sidebar tabs, which are
11+
+ // under the `browser` parent rather than the `sidebar-box` parent
12+
+ optionalElementID: "browser",
13+
processColor(rgbaChannels, element) {
14+
if (!rgbaChannels) {
15+
element.removeAttribute("lwt-sidebar");

‎src/browser/themes/pulse/sidebar_tabs.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
background-color: -moz-Dialog;
1919
overflow: hidden;
2020

21-
max-width: var(--tab-min-height);
21+
max-width: calc(var(--tab-min-height) + var(--tab-block-margin) * 2);
2222

2323
/* Makes the sidebar slide out from below */
2424
position: relative;

‎src/browser/themes/shared/browser-shared-css.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
2-
index ea4e59523027b51ecea12a45dc3844f17136c918..b542ece71a64cfe8747f494e67362f188b618321 100644
2+
index b3f83092c310fe2378f79d5a07726ad8c215e2a3..c4b32e71b153a02c8505a2f879321c7006fd76a2 100644
33
--- a/browser/themes/shared/browser-shared.css
44
+++ b/browser/themes/shared/browser-shared.css
55
@@ -23,6 +23,8 @@
66
@import url("chrome://browser/skin/customizableui/customizeMode.css");
77
@import url("chrome://browser/skin/UITour.css");
88

9-
+@import url("chrome://browser/skin/sidebar_tabs.css");
9+
+@import url("chrome://browser/skin/pulse/sidebar_tabs.css");
1010
+
1111
@namespace html url("http://www.w3.org/1999/xhtml");
1212

0 commit comments

Comments
 (0)