summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/branding/icecat/content/icecat-wordmark.svg (renamed from data/branding/icecat-wordmark.svg)0
-rw-r--r--data/branding/icecat/content/jar.mn1
-rw-r--r--data/buildscripts/mozconfig-common4
-rw-r--r--data/buildscripts/mozconfig-gnulinux2
-rw-r--r--data/patches/default-search-duckduckgo.patch362
-rw-r--r--data/patches/dont-pin-search-engines-to-top-sites.patch29
-rw-r--r--data/patches/duckduckgo-no-params.patch4
-rw-r--r--data/patches/fix-data-reporting-check.patch20
-rw-r--r--data/patches/icecat-about-dialog.patch4
-rw-r--r--data/patches/icecat-preferences.patch155
-rw-r--r--data/patches/moz-configure-changes.patch8
-rw-r--r--data/settings.js20
-rwxr-xr-xmakeicecat87
13 files changed, 256 insertions, 440 deletions
diff --git a/data/branding/icecat-wordmark.svg b/data/branding/icecat/content/icecat-wordmark.svg
index bb448f1..bb448f1 100644
--- a/data/branding/icecat-wordmark.svg
+++ b/data/branding/icecat/content/icecat-wordmark.svg
diff --git a/data/branding/icecat/content/jar.mn b/data/branding/icecat/content/jar.mn
index 40e013e..a493ac9 100644
--- a/data/branding/icecat/content/jar.mn
+++ b/data/branding/icecat/content/jar.mn
@@ -8,6 +8,7 @@ browser.jar:
content/branding/about-logo.png
content/branding/about-logo@2x.png
content/branding/about-wordmark.svg
+ content/branding/icecat-wordmark.svg
content/branding/icon16.png (../default16.png)
content/branding/icon32.png (../default32.png)
content/branding/icon48.png (../default48.png)
diff --git a/data/buildscripts/mozconfig-common b/data/buildscripts/mozconfig-common
index 419a4fe..0b2b9e0 100644
--- a/data/buildscripts/mozconfig-common
+++ b/data/buildscripts/mozconfig-common
@@ -4,12 +4,12 @@ ac_add_options --with-distribution-id=org.gnu
mk_add_options MOZ_MAKE_FLAGS=-j7
ac_add_options --with-ccache=/usr/bin/ccache
ac_add_options --enable-release
-ac_add_options --with-unsigned-addon-scopes=app
+ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
ac_add_options --disable-debug
ac_add_options --disable-tests
ac_add_options --disable-updater
ac_add_options --disable-crashreporter
-ac_add_options --disable-maintenance-service
ac_add_options --disable-eme
diff --git a/data/buildscripts/mozconfig-gnulinux b/data/buildscripts/mozconfig-gnulinux
index 9ec0959..fa10a1d 100644
--- a/data/buildscripts/mozconfig-gnulinux
+++ b/data/buildscripts/mozconfig-gnulinux
@@ -1,4 +1,2 @@
ac_add_options --enable-application=browser
mk_add_options MOZ_OBJDIR=./obj-gnulinux
-
-ac_add_options --disable-gconf
diff --git a/data/patches/default-search-duckduckgo.patch b/data/patches/default-search-duckduckgo.patch
index 9eea07b..93c70c6 100644
--- a/data/patches/default-search-duckduckgo.patch
+++ b/data/patches/default-search-duckduckgo.patch
@@ -1,33 +1,41 @@
---- a/browser/components/search/SearchTelemetry.jsm.orig 1980-01-01 18:59:51.000000000 -0500
-+++ b/browser/components/search/SearchTelemetry.jsm 2019-10-25 06:58:49.564335696 -0400
-@@ -40,6 +40,12 @@
- * page mightbe an advert.
+--- a/browser/components/search/SearchTelemetry.jsm
++++ b/browser/components/search/SearchTelemetry.jsm
+@@ -61,16 +61,6 @@
+ * a partner search.
*/
const SEARCH_PROVIDER_INFO = {
-+ duckduckgo: {
-+ regexp: /^https:\/\/duckduckgo\.com\//,
-+ queryParam: "q",
-+ codeParam: "t",
-+ codePrefixes: ["ff"],
-+ },
- google: {
- regexp: /^https:\/\/www\.google\.(?:.+)\/search/,
+- google: {
+- regexp: /^https:\/\/www\.google\.(?:.+)\/search/,
+- queryParam: "q",
+- codeParam: "client",
+- codePrefixes: ["firefox"],
+- followonParams: ["oq", "ved", "ei"],
+- extraAdServersRegexps: [
+- /^https:\/\/www\.google(?:adservices)?\.com\/(?:pagead\/)?aclk/,
+- ],
+- },
+ duckduckgo: {
+ regexp: /^https:\/\/duckduckgo\.com\//,
queryParam: "q",
-@@ -50,12 +56,6 @@
- /^https:\/\/www\.googleadservices\.com\/(?:pagead\/)?aclk/,
+@@ -81,6 +71,16 @@
+ /^https:\/\/www\.amazon\.(?:[a-z.]{2,24}).*(?:tag=duckduckgo-)/,
],
},
-- duckduckgo: {
-- regexp: /^https:\/\/duckduckgo\.com\//,
-- queryParam: "q",
-- codeParam: "t",
-- codePrefixes: ["ff"],
-- },
++ google: {
++ regexp: /^https:\/\/www\.google\.(?:.+)\/search/,
++ queryParam: "q",
++ codeParam: "client",
++ codePrefixes: ["firefox"],
++ followonParams: ["oq", "ved", "ei"],
++ extraAdServersRegexps: [
++ /^https:\/\/www\.google(?:adservices)?\.com\/(?:pagead\/)?aclk/,
++ ],
++ },
yahoo: {
regexp: /^https:\/\/(?:.*)search\.yahoo\.com\/search/,
queryParam: "p",
---- a/browser/components/search/extensions/list.json.orig 1980-01-01 18:59:51.000000000 -0500
-+++ b/browser/components/search/extensions/list.json 2019-10-25 07:27:58.209006756 -0400
+--- a/browser/components/search/extensions/list.json
++++ b/browser/components/search/extensions/list.json
@@ -1,9 +1,9 @@
{
"default": {
@@ -36,8 +44,8 @@
+ "searchDefault": "DuckDuckGo",
+ "searchOrder": ["DuckDuckGo", "Google", "Bing"],
"visibleDefaultEngines": [
-- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
-+ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia"
+- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "wikipedia"
++ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "wikipedia"
]
},
"regionOverrides": {
@@ -45,50 +53,50 @@
"en-US": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
-+ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "twitter", "wikipedia"
+- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "wikipedia"
++ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "wikipedia"
]
},
"KZ": {
"visibleDefaultEngines": [
-- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
-+ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en"
+- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
++ "ddg", "amazondotcom", "bing", "google-b-d", "wikipedia", "yandex-en"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"BY": {
"visibleDefaultEngines": [
-- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
-+ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en"
+- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
++ "ddg", "amazondotcom", "bing", "google-b-d", "wikipedia", "yandex-en"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"RU": {
"visibleDefaultEngines": [
-- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
-+ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en"
+- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
++ "ddg", "amazondotcom", "bing", "google-b-d", "wikipedia", "yandex-en"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"TR": {
"visibleDefaultEngines": [
-- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
-+ "ddg", "amazondotcom", "bing", "google", "twitter", "wikipedia", "yandex-en"
+- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
++ "ddg", "amazondotcom", "bing", "google-b-d", "wikipedia", "yandex-en"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"experimental-hidden": {
"visibleDefaultEngines": [
-@@ -90,131 +90,131 @@
+@@ -90,145 +90,145 @@
"ach": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia"
+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia"
++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia"
]
}
},
@@ -103,8 +111,8 @@
"an": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter"
-+ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-an", "twitter"
+- "google-b-d", "bing", "ebay-es", "wikipedia-an", "ddg"
++ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-an"
]
}
},
@@ -116,14 +124,6 @@
]
}
},
- "as": {
- "default": {
- "visibleDefaultEngines": [
-- "google-b-d", "amazon-in", "ddg", "wikipedia-as"
-+ "ddg", "google-b-d", "amazon-in", "wikipedia-as"
- ]
- }
- },
"ast": {
"default": {
"visibleDefaultEngines": [
@@ -196,6 +196,14 @@
]
}
},
+ "bo": {
+ "default": {
+ "visibleDefaultEngines": [
+- "google-b-d", "ddg", "wikipedia"
++ "ddg", "google-b-d", "wikipedia"
+ ]
+ }
+ },
"br": {
"default": {
"visibleDefaultEngines": [
@@ -204,19 +212,35 @@
]
}
},
+ "brx": {
+ "default": {
+ "visibleDefaultEngines": [
+- "google-b-d", "ddg", "wikipedia"
++ "ddg", "google-b-d", "wikipedia"
+ ]
+ }
+ },
"bs": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "ddg", "olx", "twitter", "wikipedia-bs"
-+ "ddg", "google-b-d", "olx", "twitter", "wikipedia-bs"
+- "google-b-d", "ddg", "olx", "wikipedia-bs"
++ "ddg", "google-b-d", "olx", "wikipedia-bs"
]
}
},
"ca": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca"
-+ "ddg", "google-b-d", "bing", "diec2", "ebay-es", "twitter", "wikipedia-ca"
+- "google-b-d", "bing", "diec2", "ddg", "ebay-es", "wikipedia-ca"
++ "ddg", "google-b-d", "bing", "diec2", "ebay-es", "wikipedia-ca"
+ ]
+ }
+ },
+ "ca-valencia": {
+ "default": {
+ "visibleDefaultEngines": [
+- "google-b-d", "bing", "diec2", "ddg", "ebay-es", "wikipedia-ca"
++ "ddg", "google-b-d", "bing", "diec2", "ebay-es", "wikipedia-ca"
]
}
},
@@ -228,15 +252,15 @@
]
}
},
- "crh": {
+ "ckb": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "ddg", "twitter", "wikipedia-crh"
-+ "ddg", "google-b-d", "twitter", "wikipedia-crh"
+- "google-b-d", "ddg", "wikipedia"
++ "ddg", "google-b-d", "wikipedia"
]
}
},
-@@ -222,74 +222,74 @@
+@@ -236,74 +236,74 @@
"default": {
"searchOrder": ["Google", "Seznam"],
"visibleDefaultEngines": [
@@ -288,127 +312,87 @@
"en-CA": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
-+ "ddg", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia"
+- "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
++ "ddg", "google-b-d", "amazon-ca", "bing", "ebay-ca", "wikipedia"
]
},
"KZ": {
"visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "wikipedia"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"BY": {
"visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "wikipedia"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"RU": {
"visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "wikipedia"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"TR": {
"visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
++ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "wikipedia"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"experimental-hidden": {
"visibleDefaultEngines": [
-@@ -300,32 +300,32 @@
+@@ -314,32 +314,32 @@
"en-GB": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
-+ "ddg", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia"
+- "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
++ "ddg", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "wikipedia"
]
},
"KZ": {
"visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "wikipedia"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"BY": {
"visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "wikipedia"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"RU": {
"visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "wikipedia"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"TR": {
"visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
++ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "wikipedia"
],
- "searchDefault": "Yandex"
+ "searchDefault": "DuckDuckGo"
},
"experimental-hidden": {
"visibleDefaultEngines": [
-@@ -336,66 +336,66 @@
- "en-ZA": {
- "default": {
- "visibleDefaultEngines": [
-- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia"
- ]
- },
- "KZ": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia"
- ],
-- "searchDefault": "Yandex"
-+ "searchDefault": "DuckDuckGo"
- },
- "BY": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia"
- ],
-- "searchDefault": "Yandex"
-+ "searchDefault": "DuckDuckGo"
- },
- "RU": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia"
- ],
-- "searchDefault": "Yandex"
-+ "searchDefault": "DuckDuckGo"
- },
- "TR": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "ddg", "yandex-en", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia"
- ],
-- "searchDefault": "Yandex"
-+ "searchDefault": "DuckDuckGo"
- }
- },
+@@ -350,35 +350,35 @@
"eo": {
"default": {
"visibleDefaultEngines": [
@@ -436,8 +420,8 @@
"es-ES": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es"
-+ "ddg", "google-b-d", "bing", "drae", "ebay-es", "twitter", "wikipedia-es"
+- "google-b-d", "bing", "drae", "ddg", "ebay-es", "wikipedia-es"
++ "ddg", "google-b-d", "bing", "drae", "ebay-es", "wikipedia-es"
]
}
},
@@ -449,7 +433,7 @@
]
},
"experimental-hidden": {
-@@ -407,49 +407,49 @@
+@@ -390,49 +390,49 @@
"et": {
"default": {
"visibleDefaultEngines": [
@@ -506,12 +490,12 @@
]
},
"experimental-hidden": {
-@@ -461,105 +461,105 @@
+@@ -444,112 +444,112 @@
"ga-IE": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE"
-+ "ddg", "google-b-d", "amazon-en-GB", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE"
+- "google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "wikipedia-ga-IE"
++ "ddg", "google-b-d", "amazon-en-GB", "ebay-ie", "tearma", "wikipedia-ga-IE"
]
}
},
@@ -534,8 +518,8 @@
"gn": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn"
-+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-gn"
+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-gn"
++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-gn"
]
}
},
@@ -566,8 +550,8 @@
"hr": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
-+ "ddg", "google-b-d", "amazon-en-GB", "bing", "eudict", "twitter", "wikipedia-hr"
+- "google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "wikipedia-hr"
++ "ddg", "google-b-d", "amazon-en-GB", "bing", "eudict", "wikipedia-hr"
]
}
},
@@ -587,6 +571,14 @@
]
}
},
+ "hye": {
+ "default": {
+ "visibleDefaultEngines": [
+- "google-b-d", "ddg", "wikipedia"
++ "ddg", "google-b-d", "wikipedia"
+ ]
+ }
+ },
"hy-AM": {
"default": {
"visibleDefaultEngines": [
@@ -598,8 +590,8 @@
"ia": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia"
-+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ia"
+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ia"
++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ia"
]
}
},
@@ -627,29 +619,29 @@
]
}
},
-@@ -567,7 +567,7 @@
+@@ -557,7 +557,7 @@
"default": {
- "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"],
+ "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Wikipedia (ja)"],
"visibleDefaultEngines": [
-- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
-+ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja"
+- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "wikipedia-ja", "ddg"
++ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "wikipedia-ja"
]
}
},
-@@ -575,159 +575,159 @@
+@@ -565,152 +565,152 @@
"default": {
- "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"],
+ "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Wikipedia (ja)"],
"visibleDefaultEngines": [
-- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
-+ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja"
+- "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "wikipedia-ja", "ddg"
++ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "wikipedia-ja"
]
}
},
"ka": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka"
-+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ka"
+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ka"
++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ka"
]
}
},
@@ -664,8 +656,8 @@
"kk": {
"default": {
"visibleDefaultEngines": [
-- "yandex-kk", "google-b-d", "ddg", "flip", "twitter", "wikipedia-kk"
-+ "ddg", "yandex-kk", "google-b-d", "flip", "twitter", "wikipedia-kk"
+- "yandex-kk", "google-b-d", "ddg", "flip", "wikipedia-kk"
++ "ddg", "yandex-kk", "google-b-d", "flip", "wikipedia-kk"
]
},
"KZ": {
@@ -688,8 +680,8 @@
"km": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km"
-+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-km"
+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-km"
++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-km"
]
}
},
@@ -720,16 +712,16 @@
"lo": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "ddg", "wikipedia-lo", "twitter"
-+ "ddg", "google-b-d", "bing", "wikipedia-lo", "twitter"
+- "google-b-d", "bing", "ddg", "wikipedia-lo"
++ "ddg", "google-b-d", "bing", "wikipedia-lo"
]
}
},
"lt": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter"
-+ "ddg", "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "twitter"
+- "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "ddg"
++ "ddg", "google-b-d", "wikipedia-lt", "bing", "amazondotcom"
]
}
},
@@ -749,11 +741,11 @@
]
}
},
- "mai": {
+ "meh": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-hi"
-+ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-hi"
+- "google-b-d", "ddg", "wikipedia"
++ "ddg", "google-b-d", "wikipedia"
]
}
},
@@ -765,14 +757,6 @@
]
}
},
- "ml": {
- "default": {
- "visibleDefaultEngines": [
-- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia", "wikipedia-ml"
-+ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia", "wikipedia-ml"
- ]
- }
- },
"mr": {
"default": {
"visibleDefaultEngines": [
@@ -784,16 +768,16 @@
"ms": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms"
-+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-ms"
+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ms"
++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ms"
]
}
},
"my": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my"
-+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-my"
+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-my"
++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-my"
]
}
},
@@ -808,8 +792,8 @@
"ne-NP": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "ddg", "twitter", "wikipedia-ne"
-+ "ddg", "google-b-d", "bing", "twitter", "wikipedia-ne"
+- "google-b-d", "bing", "ddg", "wikipedia-ne"
++ "ddg", "google-b-d", "bing", "wikipedia-ne"
]
}
},
@@ -821,7 +805,7 @@
]
},
"experimental-hidden": {
-@@ -739,244 +739,244 @@
+@@ -722,244 +722,244 @@
"nn-NO": {
"default": {
"visibleDefaultEngines": [
@@ -833,16 +817,8 @@
"oc": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc"
-+ "ddg", "google-b-d", "bing", "twitter", "wikipedia-oc", "wiktionary-oc"
- ]
- }
- },
- "or": {
- "default": {
- "visibleDefaultEngines": [
-- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-or"
-+ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-or"
+- "google-b-d", "bing", "ddg", "wikipedia-oc", "wiktionary-oc"
++ "ddg", "google-b-d", "bing", "wikipedia-oc", "wiktionary-oc"
]
}
},
@@ -865,8 +841,8 @@
"pt-BR": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
-+ "ddg", "google-b-d", "bing", "mercadolivre", "twitter", "wikipedia-pt"
+- "google-b-d", "bing", "ddg", "mercadolivre", "wikipedia-pt"
++ "ddg", "google-b-d", "bing", "mercadolivre", "wikipedia-pt"
]
}
},
@@ -918,6 +894,14 @@
+ "searchDefault": "DuckDuckGo"
}
},
+ "scn": {
+ "default": {
+ "visibleDefaultEngines": [
+- "google-b-d", "ddg", "wikipedia"
++ "ddg", "google-b-d", "wikipedia"
+ ]
+ }
+ },
"si": {
"default": {
"visibleDefaultEngines": [
@@ -937,8 +921,8 @@
"sl": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl"
-+ "ddg", "google-b-d", "ceneji", "najdi-si", "odpiralni", "twitter", "wikipedia-sl"
+- "google-b-d", "ceneji", "ddg", "najdi-si", "odpiralni", "wikipedia-sl"
++ "ddg", "google-b-d", "ceneji", "najdi-si", "odpiralni", "wikipedia-sl"
]
}
},
@@ -1001,16 +985,16 @@
"tl": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl"
-+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-tl"
+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-tl"
++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-tl"
]
}
},
"tr": {
"default": {
"visibleDefaultEngines": [
-- "yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr"
-+ "ddg", "yandex-tr", "google-b-d", "twitter", "wikipedia-tr"
+- "yandex-tr", "google-b-d", "ddg", "wikipedia-tr"
++ "ddg", "yandex-tr", "google-b-d", "wikipedia-tr"
]
},
"TR": {
@@ -1049,16 +1033,16 @@
"ur": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur"
-+ "ddg", "google-b-d", "bing", "amazon-in", "twitter", "wikipedia-ur"
+- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-ur"
++ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-ur"
]
}
},
"uz": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz"
-+ "ddg", "google-b-d", "bing", "amazondotcom", "twitter", "wikipedia-uz"
+- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-uz"
++ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-uz"
]
}
},
@@ -1073,8 +1057,8 @@
"wo": {
"default": {
"visibleDefaultEngines": [
-- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo"
-+ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "twitter", "wikipedia-wo"
+- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "wikipedia-wo"
++ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "wikipedia-wo"
]
}
},
diff --git a/data/patches/dont-pin-search-engines-to-top-sites.patch b/data/patches/dont-pin-search-engines-to-top-sites.patch
deleted file mode 100644
index 762a240..0000000
--- a/data/patches/dont-pin-search-engines-to-top-sites.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/browser/components/newtab/lib/ActivityStream.jsm.orig 1980-01-01 18:59:51.000000000 -0500
-+++ b/browser/components/newtab/lib/ActivityStream.jsm 2019-11-17 01:16:54.431504079 -0500
-@@ -155,24 +155,8 @@
- }],
- ["improvesearch.topSiteSearchShortcuts.searchEngines", {
- title: "An ordered, comma-delimited list of search shortcuts that we should try and pin",
-- // This pref is dynamic as the shortcuts vary depending on the region
-- getValue: ({geo}) => {
-- if (!geo) {
-- return "";
-- }
-- const searchShortcuts = [];
-- if (geo === "CN") {
-- searchShortcuts.push("baidu");
-- } else if (["BY", "KZ", "RU", "TR"].includes(geo)) {
-- searchShortcuts.push("yandex");
-- } else {
-- searchShortcuts.push("google");
-- }
-- if (["DE", "FR", "GB", "IT", "JP", "US"].includes(geo)) {
-- searchShortcuts.push("amazon");
-- }
-- return searchShortcuts.join(",");
-- },
-+ // This pref is dynamic as the shortcuts could vary depending on the region
-+ getValue: ({geo}) => { return ""; },
- }],
- ["improvesearch.topSiteSearchShortcuts.havePinned", {
- title: "A comma-delimited list of search shortcuts that have previously been pinned",
diff --git a/data/patches/duckduckgo-no-params.patch b/data/patches/duckduckgo-no-params.patch
index f6dc0b3..fe28e59 100644
--- a/data/patches/duckduckgo-no-params.patch
+++ b/data/patches/duckduckgo-no-params.patch
@@ -1,5 +1,5 @@
---- a/browser/components/search/extensions/ddg/manifest.json.orig 1980-01-01 18:59:51.000000000 -0500
-+++ b/browser/components/search/extensions/ddg/manifest.json 2019-12-19 03:57:42.448131290 -0500
+--- a/browser/components/search/extensions/ddg/manifest.json
++++ b/browser/components/search/extensions/ddg/manifest.json
@@ -18,43 +18,11 @@
"chrome_settings_overrides": {
"search_provider": {
diff --git a/data/patches/fix-data-reporting-check.patch b/data/patches/fix-data-reporting-check.patch
index d586dc5..99aac2a 100644
--- a/data/patches/fix-data-reporting-check.patch
+++ b/data/patches/fix-data-reporting-check.patch
@@ -1,22 +1,22 @@
---- a/old-configure.in.orig 1980-01-01 18:59:51.000000000 -0500
-+++ b/old-configure.in 2019-10-28 04:13:17.343606008 -0400
-@@ -3116,7 +3116,7 @@
+--- a/old-configure.in
++++ b/old-configure.in
+@@ -2783,7 +2783,7 @@
dnl If we have any service that uploads data (and requires data submission
dnl policy alert), set MOZ_DATA_REPORTING.
dnl We need SUBST for build system and DEFINE for xul preprocessor.
--if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then
-+if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then
+-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER" || test -n "$MOZ_NORMANDY"; then
++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1 || test "$MOZ_NORMANDY" = 1; then
MOZ_DATA_REPORTING=1
AC_DEFINE(MOZ_DATA_REPORTING)
AC_SUBST(MOZ_DATA_REPORTING)
---- a/old-configure.orig 1980-01-01 18:59:51.000000000 -0500
-+++ b/old-configure 2019-10-28 04:15:41.772322191 -0400
-@@ -12150,7 +12150,7 @@
+--- a/old-configure
++++ b/old-configure
+@@ -10359,7 +10359,7 @@
--if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then
-+if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then
+-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER" || test -n "$MOZ_NORMANDY"; then
++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1 || test "$MOZ_NORMANDY" = 1; then
MOZ_DATA_REPORTING=1
cat >> confdefs.pytmp <<\EOF
(''' MOZ_DATA_REPORTING ''', ' 1 ')
diff --git a/data/patches/icecat-about-dialog.patch b/data/patches/icecat-about-dialog.patch
index 2e6c205..e531691 100644
--- a/data/patches/icecat-about-dialog.patch
+++ b/data/patches/icecat-about-dialog.patch
@@ -1,5 +1,5 @@
---- a/browser/base/content/aboutDialog.xul.orig 2019-10-16 15:29:49.000000000 -0400
-+++ b/browser/base/content/aboutDialog.xul 2019-11-20 21:39:21.693714855 -0500
+--- a/browser/base/content/aboutDialog.xhtml
++++ b/browser/base/content/aboutDialog.xhtml
@@ -147,7 +147,6 @@
<hbox pack="center">
<label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"></label>
diff --git a/data/patches/icecat-preferences.patch b/data/patches/icecat-preferences.patch
deleted file mode 100644
index 86fdd06..0000000
--- a/data/patches/icecat-preferences.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- a/browser/components/preferences/in-content/privacy.xul.orig 2019-10-16 15:29:49.000000000 -0400
-+++ b/browser/components/preferences/in-content/privacy.xul 2019-10-30 23:54:53.591633131 -0400
-@@ -594,6 +594,79 @@
- data-l10n-id="addressbar-suggestions-settings"/>
- </groupbox>
-
-+<!-- IceCat-specific privacy group -->
-+<groupbox id="iceCatPrivacyGroup"
-+ data-category="panePrivacy"
-+ hidden="true">
-+ <label><html:h2 data-l10n-id="icecat-privacy-group-header"/></label>
-+ <vbox>
-+ <checkbox id="disableJavaScript" data-l10n-id="disable-javascript-option"
-+ preference="javascript.enabled"
-+ onsyncfrompreference="return gPrivacyPane.readDisableJavaScriptOption();"
-+ onsynctopreference="return gPrivacyPane.writeDisableJavaScriptOption();"/>
-+ <vbox class="indent">
-+ <label data-l10n-id="disable-javascript-description"/>
-+ </vbox>
-+ </vbox>
-+ <vbox>
-+ <checkbox id="disableCustomFonts" data-l10n-id="disable-custom-fonts-option"
-+ preference="browser.display.use_document_fonts"
-+ onsyncfrompreference="return gPrivacyPane.readDisableCustomFontsOption();"
-+ onsynctopreference="return gPrivacyPane.writeDisableCustomFontsOption();"/>
-+ <vbox class="indent">
-+ <label data-l10n-id="disable-custom-fonts-description"/>
-+ </vbox>
-+ </vbox>
-+ <vbox>
-+ <checkbox id="isolateRequestFirstParty" data-l10n-id="isolate-request-first-party-option"
-+ preference="privacy.firstparty.isolate"/>
-+ <vbox class="indent">
-+ <label data-l10n-id="isolate-request-first-party-description"/>
-+ </vbox>
-+ </vbox>
-+ <vbox>
-+ <checkbox id="autoUpdateExtensions" data-l10n-id="auto-update-extensions-option"
-+ preference="extensions.update.enabled"/>
-+ <vbox class="indent">
-+ <label data-l10n-id="auto-update-extensions-description"/>
-+ </vbox>
-+ </vbox>
-+ <vbox>
-+ <checkbox id="spoofReferrers" data-l10n-id="spoof-referers-option"
-+ preference="network.http.referer.spoofSource"/>
-+ <vbox class="indent">
-+ <label data-l10n-id="spoof-referers-description"/>
-+ </vbox>
-+ </vbox>
-+ <vbox>
-+ <checkbox id="detectCaptivePortal" data-l10n-id="detect-captive-portal-option"
-+ preference="captivedetect.canonicalURL"
-+ onsyncfrompreference="return gPrivacyPane.readDetectCaptiveOption();"
-+ onsynctopreference="return gPrivacyPane.writeDetectCaptiveOption();"/>
-+ <vbox class="indent">
-+ <label data-l10n-id="detect-captive-portal-description"/>
-+ </vbox>
-+ </vbox>
-+ <vbox>
-+ <checkbox id="geolocation" data-l10n-id="geolocation-option"
-+ preference="browser.search.geoip.url"
-+ onsyncfrompreference="return gPrivacyPane.readGeolocationOption();"
-+ onsynctopreference="return gPrivacyPane.writeGeolocationOption();"/>
-+ <vbox class="indent">
-+ <label data-l10n-id="geolocation-description"/>
-+ </vbox>
-+ </vbox>
-+ <vbox>
-+ <checkbox id="webgl" data-l10n-id="webgl-option"
-+ preference="webgl.disabled"
-+ onsyncfrompreference="return gPrivacyPane.readWebGLOption();"
-+ onsynctopreference="return gPrivacyPane.writeWebGLOption();"/>
-+ <vbox class="indent">
-+ <label data-l10n-id="webgl-description"/>
-+ </vbox>
-+ </vbox>
-+</groupbox>
-+
- <hbox id="permissionsCategory"
- class="subcategory"
- hidden="true"
---- a/browser/components/preferences/in-content/privacy.js.orig 2019-10-16 15:29:49.000000000 -0400
-+++ b/browser/components/preferences/in-content/privacy.js 2019-10-31 00:08:05.819561577 -0400
-@@ -93,6 +93,16 @@
- { id: "browser.urlbar.suggest.history", type: "bool" },
- { id: "browser.urlbar.suggest.openpage", type: "bool" },
-
-+ // IceCat-specific
-+ { id: "javascript.enabled", type: "bool" },
-+ { id: "browser.display.use_document_fonts", type: "int" },
-+ { id: "privacy.firstparty.isolate", type: "bool" },
-+ { id: "extensions.update.enabled", type: "bool" },
-+ { id: "network.http.referer.spoofSource", type: "bool" },
-+ { id: "webgl.disabled", type: "bool" },
-+ { id: "captivedetect.canonicalURL", type: "string" },
-+ { id: "browser.search.geoip.url", type: "string" },
-+
- // History
- { id: "places.history.enabled", type: "bool" },
- { id: "browser.formfill.enable", type: "bool" },
-@@ -587,6 +597,53 @@
- SiteDataManager.updateSites();
- },
-
-+ // ICECAT PREFERENCES
-+
-+ readDisableJavaScriptOption() {
-+ let pref = Preferences.get("javascript.enabled");
-+ return !pref.value;
-+ },
-+ writeDisableJavaScriptOption() {
-+ let checkbox = document.getElementById("disableJavaScript");
-+ return !checkbox.checked;
-+ },
-+
-+ readDisableCustomFontsOption() {
-+ let pref = Preferences.get("browser.display.use_document_fonts");
-+ return pref.value == 0;
-+ },
-+ writeDisableCustomFontsOption() {
-+ let checkbox = document.getElementById("disableCustomFonts");
-+ return checkbox.checked ? 0 : 1;
-+ },
-+
-+ readDetectCaptiveOption() {
-+ let pref = Preferences.get("captivedetect.canonicalURL");
-+ return pref.value !== "";
-+ },
-+ writeDetectCaptiveOption() {
-+ let checkbox = document.getElementById("detectCaptivePortal");
-+ return checkbox.checked ? "http://detectportal.firefox.com/success.txt" : "";
-+ },
-+
-+ readGeolocationOption() {
-+ let pref = Preferences.get("browser.search.geoip.url");
-+ return pref.value !== "";
-+ },
-+ writeGeolocationOption() {
-+ let checkbox = document.getElementById("geolocation");
-+ return checkbox.checked ? "https://location.services.mozilla.com/v1/country?key=%MOZILLA_API_KEY%" : "";
-+ },
-+
-+ readWebGLOption() {
-+ let pref = Preferences.get("webgl.disabled");
-+ return !pref.value;
-+ },
-+ writeWebGLOption() {
-+ let checkbox = document.getElementById("webgl");
-+ return !checkbox.checked;
-+ },
-+
- // CONTENT BLOCKING
-
- /**
diff --git a/data/patches/moz-configure-changes.patch b/data/patches/moz-configure-changes.patch
index 53091a4..43a940a 100644
--- a/data/patches/moz-configure-changes.patch
+++ b/data/patches/moz-configure-changes.patch
@@ -1,6 +1,6 @@
---- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500
-+++ b/browser/moz.configure 2019-10-28 13:04:11.469562089 -0400
-@@ -5,10 +5,10 @@
+--- a/browser/moz.configure
++++ b/browser/moz.configure
+@@ -5,11 +5,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
imply_option('MOZ_PLACES', True)
@@ -9,8 +9,10 @@
imply_option('MOZ_SERVICES_SYNC', True)
-imply_option('MOZ_DEDICATED_PROFILES', True)
-imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True)
+-imply_option('MOZ_NORMANDY', True)
+imply_option('MOZ_DEDICATED_PROFILES', False)
+imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', False)
++imply_option('MOZ_NORMANDY', False)
with only_when(target_is_linux & compile_environment):
option(env='MOZ_NO_PIE_COMPAT',
diff --git a/data/settings.js b/data/settings.js
index 1136446..fc9df7e 100644
--- a/data/settings.js
+++ b/data/settings.js
@@ -67,6 +67,8 @@ pref ("app.support.baseURL", "http://libreplanet.org/wiki/Group:IceCat/");
pref ("app.support.inputURL", "https://lists.gnu.org/mailman/listinfo/bug-gnuzilla");
pref ("app.feedback.baseURL", "https://lists.gnu.org/mailman/listinfo/bug-gnuzilla");
pref ("browser.uitour.url", "http://libreplanet.org/wiki/Group:IceCat/Tour");
+// FIXME: Find a better URL for this:
+pref ("browser.uitour.themeOrigin", "");
pref ("plugins.update.url", "https://www.gnu.org/software/gnuzilla/");
pref ("browser.customizemode.tip0.learnMoreUrl", "http://libreplanet.org/wiki/Group:IceCat/Tour");
@@ -151,6 +153,7 @@ pref("browser.search.suggest.enabled", false);
pref("browser.sessionstore.max_resumed_crashes", 0);
// Don't ping Mozilla for MitM detection, see <https://bugs.torproject.org/32321>
pref("security.certerrors.mitm.priming.enabled", false);
+pref("security.certerrors.recordEventTelemetry", false);
// Disable shield/heartbeat
pref("extensions.shield-recipe-client.enabled", false);
// Don't download ads for the newtab page
@@ -170,6 +173,9 @@ pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/fi
pref("geo.enabled", false);
pref("geo.wifi.uri", "");
pref("browser.search.geoip.url", "");
+pref("browser.search.geoSpecificDefaults", false);
+pref("browser.search.geoSpecificDefaults.url", "");
+pref("browser.search.modernConfig", false);
// Disable captive portal detection
pref("captivedetect.canonicalURL", "");
pref("network.captive-portal-service.enabled", false);
@@ -241,6 +247,20 @@ pref("font.default.x-western", "sans-serif");
// Preferences for the Get Add-ons panel
pref ("extensions.webservice.discoverURL", "https://gnuzilla.gnu.org/extensions");
pref ("extensions.getAddons.search.url", "https://gnuzilla.gnu.org/extensions");
+pref ("extensions.getAddons.search.browseURL", "https://gnuzilla.gnu.org/extensions");
+pref ("extensions.getAddons.get.url", "https://gnuzilla.gnu.org/extensions");
+pref ("extensions.getAddons.link.url", "https://gnuzilla.gnu.org/extensions");
+pref ("extensions.getAddons.discovery.api_url", "https://gnuzilla.gnu.org/extensions");
+
+pref ("extensions.systemAddon.update.url", "");
+pref ("extensions.systemAddon.update.enabled", false);
+
+// FIXME: find better URLs for these:
+pref ("extensions.getAddons.langpacks.url", "https://gnuzilla.gnu.org/extensions");
+pref ("lightweightThemes.getMoreURL", "https://gnuzilla.gnu.org/extensions");
+pref ("browser.geolocation.warning.infoURL", "");
+pref ("browser.xr.warning.infoURL", "");
+pref ("app.feedback.baseURL", "");
// Mobile
pref("privacy.announcements.enabled", false);
diff --git a/makeicecat b/makeicecat
index 4baeeb8..4bda91a 100755
--- a/makeicecat
+++ b/makeicecat
@@ -21,8 +21,8 @@
set -euxo pipefail
-FFMAJOR=68
-FFMINOR=12
+FFMAJOR=78
+FFMINOR=2
FFSUB=0
GNUVERSION=1
FFVERSION=$FFMAJOR.$FFMINOR.$FFSUB
@@ -44,7 +44,7 @@ wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr
wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
-echo -n ae692bf2a15908cacbb9d4c7ccf78525a87410ff3f13befedc1926f849bc27cc firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+echo -n 965ccfcbb8c0aa97639911997c54be0fcf896fd388b03138952089af675ea918 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
echo Extracting Firefox tarball
tar -xf firefox-${FFVERSION}esr.source.tar.xz
@@ -70,9 +70,9 @@ cd ..
mv l10n $SOURCEDIR
-hg clone http://hg.mozilla.org/l10n/compare-locales/
+hg clone https://hg.mozilla.org/l10n/compare-locales/
cd compare-locales/
-hg checkout RELEASE_3_3_0
+hg checkout RELEASE_8_0_0
cd ..
rm compare-locales/.hg* compare-locales/.git* -rf
mv compare-locales $SOURCEDIR/l10n
@@ -181,10 +181,8 @@ echo "ac_add_options --disable-eme" >> build/mozconfig.common
echo "ac_add_options --enable-stdcxx-compat" >> build/mozconfig.common.override
# Disable healthreport
-sed '/mozilla.org\/legal/d' -i toolkit/components/telemetry/healthreport-prefs.js
-cat << EOF >> toolkit/components/telemetry/healthreport-prefs.js
-pref("datareporting.healthreport.infoURL", "https://$INFOURL");
-EOF
+sed "/\"datareporting.healthreport.infoURL\"/s|http.*|https://$LEGALINFOURL\");|" -i modules/libpref/init/all.js
+sed '/"datareporting.healthreport.uploadEnabled"/s/true/false/' -i modules/libpref/init/all.js
# Custom privacy statement link
sed "s%https://www.mozilla.org/legal/privacy/%https://$LEGALINFOURL%" -i ./browser/app/profile/firefox.js ./toolkit/content/aboutRights.xhtml
@@ -202,16 +200,18 @@ done
# These are not condensed into a single sed script to make it fail on individual commands that didn't change the source
ActivityStream=browser/components/newtab/lib/ActivityStream.jsm
sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i $ActivityStream
-sed '/\["showSponsored/,/value/s/value: true/value: false/' -i $ActivityStream
-sed '/\["telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream
-sed '/\["section.highlights.includePocket"/,/value/s/value: true/value: false/' -i $ActivityStream
-sed '/\["telemetry.ping.endpoint"/,/value/s/value: .*/value: ""/' -i $ActivityStream
-sed 's/\(read_more_endpoint:\) .http.*/\1 "",/' -i $ActivityStream
-sed 's/\(stories_endpoint:\) .http.*/\1 "",/' -i $ActivityStream
+sed '/"showSponsored"/,/value/s/value: true/value: false/' -i $ActivityStream
+sed '/ "telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream
+sed '/"section.highlights.includePocket"/,/value/s/value: true/value: false/' -i $ActivityStream
+sed '/read_more_endpoint:/,/http/s/"http.*/"",/' -i $ActivityStream
+sed '/stories_endpoint: `/,/}`,/c stories_endpoint: "",' -i $ActivityStream
sed 's/\(stories_referrer:\) .http.*/\1 "",/' -i $ActivityStream
sed 's/\(topics_endpoint:\) .http.*/\1 "",/' -i $ActivityStream
+sed '/"telemetry.structuredIngestion"/,/value/s/value: .*/value: false,/' -i $ActivityStream
+sed '/"telemetry.structuredIngestion.endpoint"/,/value/s/value: .*/value: "",/' -i $ActivityStream
+sed '/layout_endpoint:/,/http/s/"http.*/"",/' -i $ActivityStream
sed '/name: "telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream
-sed '/name: "section.topstories"/,/return/s/return.*/return false;/' -i $ActivityStream
+sed '/name: "system.topstories"/,/},/s/.*!!locales.*/false/' -i $ActivityStream
sed 's/.Ubuntu., //' -i browser/components/newtab/css/activity-stream*.css
###############################################################################
@@ -247,7 +247,7 @@ done
for STRING in helpus community-2 community-exp
do
- find -name aboutDialog.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
+ find -wholename '*/browser/aboutDialog.ftl' | xargs sed -i "s/^$STRING.*/$STRING = /"
done
cp $DATA/aboutRights.xhtml toolkit/content/aboutRights.xhtml
@@ -259,15 +259,11 @@ sed -i 's/<a\ href\=\"http\:\/\/www.mozilla.org\/\">Mozilla\ Project<\/a>/<a\ hr
cp $DATA/branding/sync.png browser/themes/shared/fxa/logo.png
# Hide mobile promo
-echo ".fxaMobilePromo { display: none !important; }" >> browser/themes/shared/incontentprefs/preferences.inc.css
+echo ".fxaMobilePromo { display: none !important; }" >> browser/themes/shared/preferences/preferences.inc.css
-# Hide plugindeprecation-notice
-echo "#plugindeprecation-notice { display: none !important; }" >> toolkit/mozapps/extensions/content/extensions.css
-# Hide warnings on unsigned extensions
-echo ".warning{display: none!important; } .addon[notification=warning]{background-image: none!important;}" >> toolkit/mozapps/extensions/content/extensions.css
# Hide extra links in about box
-sed '/releaseNotes.link/d' -i ./browser/base/content/aboutDialog.xul
-sed '/description.*helpus/,/description/d' -i ./browser/base/content/aboutDialog.xul
+sed '/releaseNotes.link/d' -i ./browser/base/content/aboutDialog.xhtml
+sed '/description.*helpus/,/description/d' -i ./browser/base/content/aboutDialog.xhtml
###############################################################################
# Batch rebranding
@@ -276,9 +272,7 @@ sed '/description.*helpus/,/description/d' -i ./browser/base/content/aboutDialog
# Replace Firefox branding
find . | tac | grep -i fennec | prename --nofullpath -E 's/fennec/icecatmobile/;' -E 's/Fennec/IceCatMobile/;'
find . | tac | grep -i firefox | prename --nofullpath -E 's/firefox/icecat/;' -E 's/Firefox/IceCat/;'
-
-rm browser/components/newtab/data/content/assets/icecat-wordmark.svg
-cp $DATA/branding/icecat-wordmark.svg browser/components/newtab/data/content/assets/
+find services/fxaccounts/rust-bridge | tac | prename --nofullpath -E 's/icecat-accounts/firefox-accounts/;' -E 's/IceCatAccounts/FirefoxAccounts/;'
echo "Running batch rebranding"
SEDSCRIPT="
@@ -309,10 +303,10 @@ s|PACKAGES/icecat|PACKAGES/firefox|g;
s/GNU Public/Mozilla Public/g;
s/GNU Foundation/Mozilla Foundation/g;
s/GNU Corporation/Mozilla Corporation/g;
-s/icecat.com/firefox.com/g;
+s/icecat.com\\>/firefox.com/g;
s/IceCat-Spdy/Firefox-Spdy/g;
s/icecat-accounts/firefox-accounts/g;
-s/IceCatAccountsCommand/FirefoxAccountsCommand/g;
+s/IceCatAccounts/FirefoxAccounts/g;
s|https://www.mozilla.org/icecat/?utm_source=synceol|https://www.mozilla.org/firefox/?utm_source=synceol|g;
s|www.gnu.org/software/gnuzilla/icecat-help|libreplanet.org/wiki/Group:IceCat/Help|g;
@@ -385,14 +379,13 @@ MOZ_SERVICES_HEALTHREPORTER=0
MOZ_SERVICES_FXACCOUNTS=0
MOZ_SERVICES_METRICS=0
MOZ_DATA_REPORTING=0
+MOZ_NORMANDY=0
MOZ_SERVICES_SYNC=0
MOZ_DEVICES=0
MOZ_ANDROID_GOOGLE_PLAY_SERVICES=0
MOZ_ADDON_SIGNING=0
EOF
-sed 's/mozilla-esr/gnu-esr/' -i browser/confvars.sh
-
###############################################################################
# Icons
###############################################################################
@@ -474,6 +467,7 @@ MOZ_SERVICES_HEALTHREPORTER=0
MOZ_SERVICES_FXACCOUNTS=0
MOZ_SERVICES_METRICS=0
MOZ_DATA_REPORTING=0
+MOZ_NORMANDY=0
MOZ_SERVICES_SYNC=0
MOZ_DEVICES=0
MOZ_ANDROID_GOOGLE_PLAY_SERVICES=0
@@ -493,18 +487,19 @@ browser.search.order.2=Google
browser.search.order.3=Yahoo
EOF
-cp $DATA/preferences_vendor.xml ./mobile/android/app/src/main/res/xml/preferences_vendor.xml
-
-sed '/public static void checkAndNotifyPolicy/ s/{/{ if(true) return;/; /private static void notifyDataPolicy/ s/{/{ if(true) return;/ ' -i mobile/android/base/java/org/mozilla/gecko/DataReportingNotification.java
-
-cp -a $DATA/android-images/core/* mobile/android/themes/core/images/
-cp -a $DATA/android-images/resources mobile/android/base
-
-sed '/aboutDetails/,/div/d; /privacyURL/d' mobile/android/chrome/content/about.xhtml -i
-
-sed '/SENDERID/d' -i mobile/android/app/mobile.js
-
-cat $DATA/mobile.dupes >> mobile/android/installer/allowed-dupes.mn
+## FIXME: TODO: adapt the following to ESR 78.x
+# cp $DATA/preferences_vendor.xml ./mobile/android/app/src/main/res/xml/preferences_vendor.xml
+#
+# sed '/public static void checkAndNotifyPolicy/ s/{/{ if(true) return;/; /private static void notifyDataPolicy/ s/{/{ if(true) return;/ ' -i mobile/android/base/java/org/mozilla/gecko/DataReportingNotification.java
+#
+# cp -a $DATA/android-images/core/* mobile/android/themes/core/images/
+# cp -a $DATA/android-images/resources mobile/android/base
+#
+# sed '/aboutDetails/,/div/d; /privacyURL/d' mobile/android/chrome/content/about.xhtml -i
+#
+# sed '/SENDERID/d' -i mobile/android/app/mobile.js
+#
+# cat $DATA/mobile.dupes >> mobile/android/installer/allowed-dupes.mn
###############################################################################
# Macos packaging
@@ -563,16 +558,16 @@ cp $DATA/extensions/ extensions/gnu -a
cat << EOF >> browser/app/Makefile.in
libs::
mkdir -p \$(DIST)/bin/browser/extensions
- cp -a \$(topsrcdir)/extensions/gnu/* \$(DIST)/bin/browser/extensions/
+ cp -af \$(topsrcdir)/extensions/gnu/* \$(DIST)/bin/browser/extensions/
mkdir -p \$(DIST)/icecat/browser/extensions
- cp -a \$(topsrcdir)/extensions/gnu/* \$(DIST)/icecat/browser/extensions/
+ cp -af \$(topsrcdir)/extensions/gnu/* \$(DIST)/icecat/browser/extensions/
EOF
cat << EOF >> mobile/android/app/Makefile.in
libs::
mkdir -p \$(DIST)/bin/distribution
- cp -a \$(topsrcdir)/extensions/gnu/ \$(DIST)/bin/distribution/extensions/
+ cp -af \$(topsrcdir)/extensions/gnu/ \$(DIST)/bin/distribution/extensions/
EOF
#sed '/^make-package-internal:/ s%$%\n\tcp $(topsrcdir)/extensions.gnu/* $(DIST)/icecat/browser/extensions -a%' -i toolkit/mozapps/installer/packager.mk
home website