From 68c7274ffd574ff6ed0f4fa39ed9926033e64661 Mon Sep 17 00:00:00 2001 From: eyedeekay Date: Tue, 20 May 2025 20:22:52 -0400 Subject: [PATCH] more chromium purging --- VERSION.md | 4 - build.xml | 206 +------------------- fedora-docker.sh | 4 +- scripts/build.number | 4 +- src/build.xml | 4 - src/java/net/i2p/i2pfirefox/I2PBrowser.java | 9 +- 6 files changed, 10 insertions(+), 221 deletions(-) diff --git a/VERSION.md b/VERSION.md index d042ad7..9f50c56 100644 --- a/VERSION.md +++ b/VERSION.md @@ -25,7 +25,3 @@ ublock-origin https://addons.mozilla.org/firefox/downloads/file/4492375/ublock_origin-1.64.0.xpi ``` -## Chromium - -```md -``` diff --git a/build.xml b/build.xml index 48a58bc..cd67b53 100755 --- a/build.xml +++ b/build.xml @@ -127,50 +127,6 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -202,30 +158,6 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - - - - - - - - - - - - - - - - - - - - - - - - @@ -492,10 +424,6 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - - - - @@ -516,10 +444,6 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - - - - @@ -582,7 +506,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - + @@ -600,7 +524,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - + @@ -617,7 +541,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - + @@ -634,7 +558,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - + @@ -836,7 +760,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - + @@ -904,128 +828,8 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fedora-docker.sh b/fedora-docker.sh index 4158311..73cdecb 100755 --- a/fedora-docker.sh +++ b/fedora-docker.sh @@ -9,7 +9,7 @@ jpackage --verbose \ --type rpm \ --linux-menu-group "Network;WebBrowser;P2P" \ --linux-app-category "Network" \ - --linux-package-deps "firefox|chromium|brave|firefox-esr|librewolf|icecat" \ + --linux-package-deps "firefox|firefox-esr|librewolf|icecat" \ --linux-shortcut \ --license-file LICENSE.md \ --name i2pbrowser \ @@ -18,4 +18,4 @@ jpackage --verbose \ --input src/build \ --main-jar i2pfirefox.jar \ --main-class net.i2p.i2pfirefox.I2PBrowser -ls *.rpm \ No newline at end of file +ls *.rpm diff --git a/scripts/build.number b/scripts/build.number index 22c61a2..021c54f 100644 --- a/scripts/build.number +++ b/scripts/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Tue May 20 15:44:11 EDT 2025 -build.number=826 +#Tue May 20 20:19:14 EDT 2025 +build.number=827 diff --git a/src/build.xml b/src/build.xml index 11fb3da..4ec82fc 100644 --- a/src/build.xml +++ b/src/build.xml @@ -60,8 +60,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/src/java/net/i2p/i2pfirefox/I2PBrowser.java b/src/java/net/i2p/i2pfirefox/I2PBrowser.java index c489869..3381e48 100644 --- a/src/java/net/i2p/i2pfirefox/I2PBrowser.java +++ b/src/java/net/i2p/i2pfirefox/I2PBrowser.java @@ -24,10 +24,8 @@ public class I2PBrowser extends I2PGenericUnsafeBrowser { private final I2PFirefox i2pFirefox = new I2PFirefox(); private final I2PGenericUnsafeBrowser i2pGeneral = new I2PGenericUnsafeBrowser(); - public boolean firefox = false; - public boolean chromium = false; + public boolean firefox = true; public boolean generic = false; - public boolean chromiumFirst = false; public boolean usability = false; public int privateBrowsing = 0; private boolean outputConfig = false; @@ -178,9 +176,6 @@ public class I2PBrowser extends I2PGenericUnsafeBrowser { if (arg.equals("-private")) { this.privateBrowsing = 1; } - if (arg.equals("-chromium")) { - this.chromium = true; - } if (arg.equals("-firefox")) { this.firefox = true; } @@ -209,8 +204,6 @@ public class I2PBrowser extends I2PGenericUnsafeBrowser { } } } - if (!this.chromium) - this.firefox = true; } return visitURL; }