Please find change descriptions in commit messages from the
attached patches.
Built for x86_64 and i686. armv7h build fails with the message:
> fatal error: 'type_traits' file not found
That's probably related to my build environment, because Arch
Linux ARM have built their firefox package for the latest
release version.
From 0ed8ba52170f5b9dca13ff834ac567f7d2c62f32 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Thu, 2 Jul 2020 20:35:40 +0300
Subject: [PATCH 1/5] iceweasel: adding missed changes from latest patch
---
libre/iceweasel/iceweasel.desktop | 2 +-
libre/iceweasel/libre.patch | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libre/iceweasel/iceweasel.desktop b/libre/iceweasel/iceweasel.desktop
index ed47c283d..6798c9a53 100644
--- a/libre/iceweasel/iceweasel.desktop
+++ b/libre/iceweasel/iceweasel.desktop
@@ -117,7 +117,7 @@ Icon=iceweasel
Terminal=false
X-MultipleArgs=false
Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
StartupNotify=true
StartupWMClass=iceweasel
Categories=Network;WebBrowser;
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index f4085b4a6..1198e6c04 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -407,7 +407,7 @@ index 8d055e583f..00837e77a3 100644
-pref("browser.contentblocking.report.lockwise.mobile-android.url", "https://play.google.com/store/apps/details?id=mozilla.lockbox&referrer=utm_source%3Dprotection_report%26utm_content%3Dmobile_promotion";);
-pref("browser.contentblocking.report.mobile-ios.url", "https://apps.apple.com/app/firefox-private-safe-browser/id989804926";);
-pref("browser.contentblocking.report.mobile-android.url", "https://play.google.com/store/apps/details?id=org.mozilla.firefox&referrer=utm_source%3Dprotection_report%26utm_content%3Dmobile_promotion";);
-
+
// Protection Report's SUMO urls
pref("browser.contentblocking.report.lockwise.how_it_works.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/password-manager-report";);
@@ -1733,11 +1729,6 @@ pref("signon.management.page.os-auth.enabled", false);
@@ -516,7 +516,7 @@ index 33c380a898..fdc1ccb38c 100644
- <button role="menuitem" class="menuitem-button menuitem-mobile menuitem-mobile-ios ghost-button" data-event-name="AboutLoginsOpenMobileIos" data-l10n-id="menu-menuitem-iphone-app"></button>
</ul>
</template>
-
+
diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html
index 5f2087bbe4..ca93a4fcda 100644
--- a/browser/components/protections/content/protections.html
--
2.27.0
From ff8edb21048f436ccd9fccc7ffa87466a8bd8a84 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Thu, 2 Jul 2020 20:38:30 +0300
Subject: [PATCH 2/5] libre/iceweasel: update i686 patches for 78.0.1
---
libre/iceweasel/avoid-libxul-OOM-python-check.patch | 4 ++--
...rust-static-disable-network-test-on-static-libraries.patch | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libre/iceweasel/avoid-libxul-OOM-python-check.patch b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
index 85f32ffba..89fa3f384 100644
--- a/libre/iceweasel/avoid-libxul-OOM-python-check.patch
+++ b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
@@ -5,8 +5,8 @@ diff -rauN a/config/rules.mk b/config/rules.mk
$(RM) $@
endif
$(MKSHLIB) $($@_OBJS) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
-- $(call py3_action,check_binary,--target $@)
-+# $(call py3_action,check_binary,--target $@)
+- $(call py_action,check_binary,--target $@)
++# $(call py_action,check_binary,--target $@)
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
ifdef MSMANIFEST_TOOL
diff --git a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
index 76e12ed63..a35a8b732 100644
--- a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
+++ b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
@@ -10,7 +10,7 @@ index df11844..6f75d0a 100644
-ifeq ($(OS_ARCH), Linux)
-ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
-ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-- $(call py3_action,check_binary,--target --networking $@)
+- $(call py_action,check_binary,--target --networking $@)
-endif
-endif
-endif
@@ -19,7 +19,7 @@ index df11844..6f75d0a 100644
+# ifeq ($(OS_ARCH), Linux)
+# ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
+# ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-+# $(call py3_action,check_binary,--target --networking $@)
++# $(call py_action,check_binary,--target --networking $@)
+# endif
+# endif
+# endif
--
2.27.0
From b0e34a4a7b3de1f32bd6d82a5b0a2dd2545407ed Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Thu, 2 Jul 2020 20:48:04 +0300
Subject: [PATCH 3/5] iceweasel: remove What's New tab from DevTools
This is to reduce maintenance burden. The tab is going to have new
content in each new release, and as can be seen with this release, some
news items can contain references or mention nonfree stuff. Instead of
patching each new release, just removing it for now. Those who want to
see the news can find them (and more) on the upstream release notes
webpage.
---
libre/iceweasel/PKGBUILD | 3 +
libre/iceweasel/libre.patch | 180 ++++++++++--------------------------
2 files changed, 54 insertions(+), 129 deletions(-)
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 2e5a556e3..a8d215351 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -276,6 +276,9 @@ END
_removed_engines_regex='Bing|Google|Seznam|Twitter|Yahoo|Yandex|ЯндекÑ|amazon|bing|google|ebay|twitter'
_err_msg="search-engines patch needs re-working"
! grep -E ${_removed_engines_regex} ${_search_config_file} > /dev/null || ! echo "${_err_msg}"
+
+ # Removing What's New tab from Developer Tools, usages are removed by libre.patch
+ rm -rf devtools/client/whats-new
}
build() {
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 1198e6c04..bde8de32d 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -165,110 +165,6 @@ index 2d3c7b4..00221d3 100644
</dl>
-#endif
</dl>
-diff --git a/devtools/client/whats-new/src/main.js b/devtools/client/whats-new/src/main.js
-index e5c4676da6..adcc1708de 100644
---- a/devtools/client/whats-new/src/main.js
-+++ b/devtools/client/whats-new/src/main.js
-@@ -21,15 +21,8 @@ const utmParams = new URLSearchParams({
- utm_medium: "devtools_whatsnew",
- });
-
--const aside = {
-- header: "Instantly Send Tabs to Mobile",
-- content: `Test your site on mobile and other devices without having to copy, paste, or leave the browser.`,
-- cta: "Learn More About Send Tabs",
-- href: `https://play.google.com/store/apps/details?id=org.mozilla.fennec_aurora&referrer=utm_source%3Dmozilla%26utm_medium%3DReferral%26utm_campaign%3Dmozilla-org${utmParams}`,
--};
--
- const release = {
-- title: "Whatâs New in DevTools (Firefox 77)",
-+ title: "Whatâs New in DevTools (Iceweasel 77)",
- linkText: "Read more",
- linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/77?${utmParams}`,
- features: [
-@@ -40,7 +33,7 @@ const release = {
- },
- {
- header: `Source Maps that just work`,
-- description: `Firefox 77 has the most fixes yet to make source maps faster and more dependable so that your original CSS and JavaScript/TypeScript/etc code is always at hand. Especially improved: build outputs which previously failed to load source maps.`,
-+ description: `Iceweasel 77 has the most fixes yet to make source maps faster and more dependable so that your original CSS and JavaScript/TypeScript/etc code is always at hand. Especially improved: build outputs which previously failed to load source maps.`,
- href: `https://developer.mozilla.org/en-US/docs/Tools/Debugger/How_to/Use_a_source_map?${utmParams}`,
- },
- {
-@@ -61,19 +54,6 @@ const release = {
- ],
- };
-
--const dev = {
-- title: "Experimental Features in Firefox Developer Edition",
-- linkUrl: `https://www.mozilla.org/firefox/developer/?${utmParams}`,
-- linkText: "Get DevEdition",
-- features: [
-- {
-- header: `Cross-browser CSS compatibility audit`,
-- description: `Analyze your CSS for cross-browser compatibility with a new sidepanel in the Inspector. Let us know how well it worked for your projects via the Feedback option!`,
-- href: `https://discourse.mozilla.org/t/new-in-devedition-77-css-compatibility-in-inspector/60669`,
-- },
-- ],
--};
--
- function openLink(href, e) {
- return openDocLink(href, {
- relatedToCurrent: true,
-@@ -81,33 +61,6 @@ function openLink(href, e) {
- });
- }
-
--class Aside extends Component {
-- render() {
-- return dom.aside(
-- {},
-- dom.div(
-- { className: "call-out" },
-- dom.h3({}, aside.header),
-- dom.p({}, aside.content),
-- dom.p(
-- { className: "cta" },
-- dom.a(
-- {
-- href: aside.href,
-- className: "devtools-button",
-- onClick: e => {
-- e.preventDefault();
-- openLink(aside.href, e);
-- },
-- },
-- aside.cta
-- )
-- )
-- )
-- );
-- }
--}
--
- class Feature extends Component {
- static get propTypes() {
- return {
-@@ -154,7 +107,6 @@ class App extends Component {
- render() {
- return dom.main(
- {},
-- createFactory(Aside)(),
- dom.article(
- {},
- dom.h2(
-@@ -167,11 +119,6 @@ class App extends Component {
- ...release.features
- .filter(feature => !feature.hidden)
- .map(feature => createFactory(Feature)(feature))
-- ),
-- dom.h2({}, dom.span({}, dev.title), Link(dev.linkText, dev.linkUrl)),
-- dom.ul(
-- {},
-- ...dev.features.map(feature => createFactory(Feature)(feature))
- )
- )
- );
diff --git a/devtools/startup/aboutdevtools/aboutdevtools.xhtml b/devtools/startup/aboutdevtools/aboutdevtools.xhtml
index 5b0709e..38ea275 100644
--- a/devtools/startup/aboutdevtools/aboutdevtools.xhtml
@@ -604,30 +500,56 @@ index 03feeef059..f9580d0f8f 100644
about-logins-menu-menuitem-help = Help
-menu-menuitem-android-app = { -lockwise-brand-short-name } for Android
-menu-menuitem-iphone-app = { -lockwise-brand-short-name } for iPhone and iPad
-
+
## Login List
-
-diff --git a/browser/locales/en-US/browser/protections.ftl b/browser/locales/en-US/browser/protections.ftl
-index dc51592c0a..19e269bdd8 100644
---- a/browser/locales/en-US/browser/protections.ftl
-+++ b/browser/locales/en-US/browser/protections.ftl
-@@ -68,19 +68,12 @@ protections-close-button2 =
- .aria-label = Close
- .title = Close
-
--mobile-app-title = Block ad trackers across more devices
--mobile-app-card-content = Use the mobile browser with built-in protection against ad tracking.
--mobile-app-links = { -brand-product-name } Browser for <a data-l10n-name="android-mobile-inline-link">Android</a> and <a data-l10n-name="ios-mobile-inline-link">iOS</a>
+
+diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
+index 5cd41b3e36..ba6b2bc4d8 100644
+--- a/devtools/client/definitions.js
++++ b/devtools/client/definitions.js
+@@ -73,11 +73,6 @@ loader.lazyGetter(
+ "ApplicationPanel",
+ () => require("devtools/client/application/panel").ApplicationPanel
+ );
+-loader.lazyGetter(
+- this,
+- "WhatsNewPanel",
+- () => require("devtools/client/whats-new/panel").WhatsNewPanel
+-);
+
+ // Other dependencies
+ loader.lazyRequireGetter(
+@@ -529,7 +524,6 @@ var defaultTools = [
+ Tools.dom,
+ Tools.accessibility,
+ Tools.application,
+- Tools.whatsnew,
+ ];
+
+ exports.defaultTools = defaultTools;
+diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
+index daf4549c6e..b04d79f191 100644
+--- a/devtools/client/jar.mn
++++ b/devtools/client/jar.mn
+@@ -247,9 +247,6 @@ devtools.jar:
+ # Application panel
+ content/application/index.html (application/index.html)
+
+- # WhatsNew panel
+- content/whats-new/index.html (whats-new/index.html)
-
- lockwise-title = Never forget a password again
- lockwise-title-logged-in = { -lockwise-brand-name }
- lockwise-header-content = { -lockwise-brand-name } securely stores your passwords in your browser.
- lockwise-header-content-logged-in = Securely store and sync your passwords to all your devices.
- protection-report-view-logins-button = View Logins
- .title = Go to Saved Logins
--lockwise-mobile-app-title = Take your passwords everywhere
--lockwise-no-logins-card-content = Use passwords saved in { -brand-short-name } on any device.
--lockwise-app-links = { -lockwise-brand-name } for <a data-l10n-name="lockwise-android-inline-link">Android</a> and <a data-l10n-name="lockwise-ios-inline-link">iOS</a>
-
- # This string is displayed after a large numeral that indicates the total number
- # of email addresses being monitored. Donât add $count to
+ # about:profiling
+ skin/aboutprofiling.css (themes/aboutprofiling.css)
+ content/performance-new/aboutprofiling/initializer.js (performance-new/aboutprofiling/initializer.js)
+diff --git a/devtools/client/moz.build b/devtools/client/moz.build
+index 0dd219c13c..b589c7ac4d 100644
+--- a/devtools/client/moz.build
++++ b/devtools/client/moz.build
+@@ -28,7 +28,6 @@ DIRS += [
+ 'styleeditor',
+ 'themes',
+ 'webconsole',
+- 'whats-new',
+ ]
+
+ JAR_MANIFESTS += ['jar.mn']
--
2.27.0
From bca48e0f7ff00f462a25f7ff6309fff5638a716a Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Thu, 2 Jul 2020 20:57:23 +0300
Subject: [PATCH 4/5] libre/iceweasel: update search engines patching
Apart from upstream updates to list.json, there is also a bit of
preparation for the next significant change of how search engines are
handled upstream. 78.0 enabled this new mechanism, but 78.0.1 disabled
it again because of [1]. For details see [2]. It looks like Mozilla
can now update the list of available and visible search engines
remotely. So removing all engines except Wikipedia and DuckDuckGo just
to avoid surprises in future.
[1] https://bugzilla.mozilla.org/show_bug.cgi?id=1649393
[2] https://bugzilla.mozilla.org/show_bug.cgi?id=1542235
---
libre/iceweasel/PKGBUILD | 14 ++++++--
libre/iceweasel/libre-searchengines.patch | 44 +++++++++++------------
2 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index a8d215351..73b742ba9 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -267,15 +267,23 @@ END
# browser/components/search/extensions/<ID>/
# local _remove_engines_sed='s|.*oogle.*| "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-en", "searx", "wikipedia", "yacy"|g'
local _remove_engines_sed='s|.*oogle.*| "ddg", "wikipedia"|g'
- local _search_config_file=browser/components/search/extensions/list.json
echo "applying libre-searchengines.patch"
patch -Np1 -i "$srcdir/libre-searchengines.patch"
- sed -i "${_remove_engines_sed}" ${_search_config_file}
+
+ pushd browser/components/search/extensions
+ sed -i "${_remove_engines_sed}" list.json
# Sanity-check search-engines patching
_removed_engines_regex='Bing|Google|Seznam|Twitter|Yahoo|Yandex|ЯндекÑ|amazon|bing|google|ebay|twitter'
_err_msg="search-engines patch needs re-working"
- ! grep -E ${_removed_engines_regex} ${_search_config_file} > /dev/null || ! echo "${_err_msg}"
+ ! grep -E ${_removed_engines_regex} list.json > /dev/null || ! echo "${_err_msg}"
+
+ find -mindepth 1 -maxdepth 1 \
+ -not -name ddg \
+ -not -name wikipedia \
+ -not -name list.json \
+ -exec rm -rf {} \;
+ popd
# Removing What's New tab from Developer Tools, usages are removed by libre.patch
rm -rf devtools/client/whats-new
diff --git a/libre/iceweasel/libre-searchengines.patch b/libre/iceweasel/libre-searchengines.patch
index 220b07a95..3efc1738c 100644
--- a/libre/iceweasel/libre-searchengines.patch
+++ b/libre/iceweasel/libre-searchengines.patch
@@ -8,7 +8,7 @@ index d023e0a..15ee5f5 100644
- "searchDefault": "Google",
- "searchOrder": ["Google", "Bing"],
"visibleDefaultEngines": [
- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
+ "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "wikipedia"
]
},
"regionOverrides": {
@@ -58,30 +58,30 @@ index d023e0a..15ee5f5 100644
"locales": {
@@ -56,35 +32,6 @@
"visibleDefaultEngines": [
- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
+ "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "wikipedia"
]
- },
- "KZ": {
- "visibleDefaultEngines": [
-- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
- ],
- "searchDefault": "Yandex"
- },
- "BY": {
- "visibleDefaultEngines": [
-- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
- ],
- "searchDefault": "Yandex"
- },
- "RU": {
- "visibleDefaultEngines": [
-- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
- ],
- "searchDefault": "Yandex"
- },
- "TR": {
- "visibleDefaultEngines": [
-- "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
- ],
- "searchDefault": "Yandex"
- },
@@ -121,30 +121,30 @@ index d023e0a..15ee5f5 100644
]
@@ -266,35 +200,6 @@
"visibleDefaultEngines": [
- "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+ "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
]
- },
- "KZ": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
- ],
- "searchDefault": "Yandex"
- },
- "BY": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
- ],
- "searchDefault": "Yandex"
- },
- "RU": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
- ],
- "searchDefault": "Yandex"
- },
- "TR": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
- ],
- "searchDefault": "Yandex"
- },
@@ -157,30 +157,30 @@ index d023e0a..15ee5f5 100644
"en-GB": {
@@ -302,35 +207,6 @@
"visibleDefaultEngines": [
- "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+ "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
]
- },
- "KZ": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
- ],
- "searchDefault": "Yandex"
- },
- "BY": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
- ],
- "searchDefault": "Yandex"
- },
- "RU": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
- ],
- "searchDefault": "Yandex"
- },
- "TR": {
- "visibleDefaultEngines": [
-- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
- ],
- "searchDefault": "Yandex"
- },
@@ -219,21 +219,21 @@ index d023e0a..15ee5f5 100644
},
"ja-JP-macos": {
"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"
+ "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "wikipedia-ja", "ddg"
]
@@ -573,7 +414,6 @@
},
"ja": {
"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"
+ "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "wikipedia-ja", "ddg"
]
@@ -598,18 +438,6 @@
"visibleDefaultEngines": [
- "yandex-kk", "google-b-d", "ddg", "flip", "twitter", "wikipedia-kk"
+ "yandex-kk", "google-b-d", "ddg", "flip", "wikipedia-kk"
]
- },
- "KZ": {
@@ -283,7 +283,7 @@ index d023e0a..15ee5f5 100644
"si": {
@@ -900,18 +711,6 @@
"visibleDefaultEngines": [
- "yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr"
+ "yandex-tr", "google-b-d", "ddg", "wikipedia-tr"
]
- },
- "TR": {
--
2.27.0
From 7489c1df4245267421bc165e751bbabe5ace5bb1 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Thu, 2 Jul 2020 21:09:38 +0300
Subject: [PATCH 5/5] libre/iceweasel: sync with upstreams 78.0.1
---
libre/iceweasel/PKGBUILD | 20 +++++++--------
libre/iceweasel/libre.patch | 51 +++++++++----------------------------
2 files changed, 22 insertions(+), 49 deletions(-)
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 73b742ba9..a3b1f39cf 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -44,7 +44,7 @@
pkgname=iceweasel
epoch=1
-pkgver=77.0.1
+pkgver=78.0.1
pkgrel=1
pkgrel+=.parabola1
_brandingver=77.0
@@ -55,9 +55,9 @@ arch+=(i686 armv7h)
license=(MPL GPL LGPL)
url="https://wiki.parabola.nu/Iceweasel";
depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)
-makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils
- xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 python
- nodejs python2-psutil cbindgen nasm)
+makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
+ autoconf2.13 rust clang llvm jack gtk2 nodejs cbindgen nasm
+ python-setuptools python-psutil)
# FIXME: 'mozilla-serarchplugins' package needs re-working (see note in prepare())
makedepends+=(quilt libxslt imagemagick)
optdepends=('networkmanager: Location detection via available WiFi networks'
@@ -78,17 +78,17 @@ source_armv7h=(arm.patch
build-arm-libopus.patch)
source_i686=('rust-static-disable-network-test-on-static-libraries.patch'
'avoid-libxul-OOM-python-check.patch')
-sha256sums=('54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640'
+sha256sums=('494d277b120028e036e2aee3f658d79afc895457dc6aadb1c02f0547ef1d66ca'
'SKIP'
'3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75'
- '7525978203aa967ef9e57b5dc745f526e6fb4e077fc91e38f852e77fabc13978'
+ '44be8e819b8334ed36e9410d62dbc6c16dd8f8329a191403bfdce3cf2e9181fc'
'57ea7663a8bf3d9326cf17798db0846b987bd26f4a20670d9aa3a02a58a29471'
'SKIP'
- 'fae245fdfede4be29d305bcf9368ef060c1dba7e2e1402c0fc00c199523d0b36'
- 'd783225c311a4d64a9196d573627aeecaf02365395eea9783b1175b7613bdf6e'
+ 'f9d0a6b4ecd82d28b130a9c08dc3b060b50f1f34fc47d2a4675f9d982d15b3b3'
+ '0ed6b8efa00f73a96bceaba2d6a31fb11d416106729ab9b8289b191eb9acccfa'
'cc3d71eb493a3d53b1662567cae872f81ff99e0845d59ac402a890461c356183')
-sha256sums_i686=('26ed6fd73b14209e9bb7e8fd0998a8ef02ae9eb390e692e639badd69d702f518'
- '3ae2b45f6231d0f78a52771e110b75284b649aa72571ced7e2e062ec25163ee5')
+sha256sums_i686=('125000a8d4eec602d51eebcb9c94fb48c3ec1f5162ea28116bfdfe14d1a34cf9'
+ '6395b7e349963c9a689929b44525159328954af156ef0b9a42182e7e16baa8ba')
sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
'2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <rele...@mozilla.com>
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index bde8de32d..4464fe5fe 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -240,7 +240,7 @@ index edd871b..77870fe 100644
search-header-shortcut =
@@ -482,7 +482,7 @@ theme-heading-search-label = Find more themes
- extension-heading-search-label = Find more extensions
+
default-heading-search-label = Find more add-ons
addons-heading-search-input =
- .placeholder = Search addons.mozilla.org
@@ -292,12 +292,12 @@ index 4c4ea76..e0f2880 100644
-gecko.handlerService.schemes.ircs.0.name=Mibbit
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 8d055e583f..00837e77a3 100644
+index cd9bc92969..e35c951e67 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
-@@ -1599,10 +1599,6 @@ pref("browser.contentblocking.report.monitor.how_it_works.url", "https://monitor
- pref("browser.contentblocking.report.monitor.sign_in_url", "https://monitor.firefox.com/oauth/init?entrypoint=protection_report_monitor&utm_source=about-protections&email=";);
+@@ -1639,10 +1639,6 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi
pref("browser.contentblocking.report.manage_devices.url", "https://accounts.firefox.com/settings/clients";);
+ pref("browser.contentblocking.report.endpoint_url", "https://monitor.firefox.com/user/breach-stats?includeResolved=true";);
pref("browser.contentblocking.report.proxy_extension.url", "https://fpn.firefox.com/browser?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-protections&utm_content=about-protections";);
-pref("browser.contentblocking.report.lockwise.mobile-ios.url", "https://apps.apple.com/app/id1314000270";);
-pref("browser.contentblocking.report.lockwise.mobile-android.url", "https://play.google.com/store/apps/details?id=mozilla.lockbox&referrer=utm_source%3Dprotection_report%26utm_content%3Dmobile_promotion";);
@@ -306,7 +306,7 @@ index 8d055e583f..00837e77a3 100644
// Protection Report's SUMO urls
pref("browser.contentblocking.report.lockwise.how_it_works.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/password-manager-report";);
-@@ -1733,11 +1729,6 @@ pref("signon.management.page.os-auth.enabled", false);
+@@ -1774,11 +1770,6 @@ pref("signon.management.page.os-auth.enabled", false);
pref("signon.management.page.breach-alerts.enabled", true);
pref("signon.management.page.vulnerable-passwords.enabled", true);
pref("signon.management.page.sort", "name");
@@ -414,10 +414,10 @@ index 33c380a898..fdc1ccb38c 100644
</template>
diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html
-index 5f2087bbe4..ca93a4fcda 100644
+index e7aac37ed6..164a07988d 100644
--- a/browser/components/protections/content/protections.html
+++ b/browser/components/protections/content/protections.html
-@@ -114,24 +114,6 @@
+@@ -115,24 +115,6 @@
<div id="graph-total-summary"></div>
</div>
</div>
@@ -442,12 +442,10 @@ index 5f2087bbe4..ca93a4fcda 100644
</div>
<!-- Markup for Monitor card. -->
<section class="card card-no-hover monitor-card hidden">
-@@ -219,47 +201,6 @@
- <button id="open-about-logins-button" class="primary" data-l10n-id="protection-report-view-logins-button"></button>
- </div>
+@@ -256,20 +238,6 @@
</div>
-- <div class="card-body hidden">
-- <div id="lockwise-body-content" class="body-wrapper">
+ <div class="card-body hidden">
+ <div id="lockwise-body-content" class="body-wrapper">
- <div class="no-logins hidden">
- <button class="exit-icon" data-l10n-id="protections-close-button2"></button>
- <img class="mobile-app-icon" src="chrome://browser/content/logos/lockwise-mobile.svg"/>
@@ -462,34 +460,9 @@ index 5f2087bbe4..ca93a4fcda 100644
- </p>
- </span>
- </div>
-- <div class="has-logins hidden">
-- <span class="number-of-logins block">
-- <!-- Display number of stored logins here. -->
-- </span>
-- <span class="passwords-stored-text">
-- <img class="icon-small" src= "chrome://browser/skin/login.svg"/>
-- <span id="lockwise-passwords-stored">
-- <!-- Display message for stored logins here. -->
-- <a target="_blank" id="lockwise-how-it-works" data-l10n-name="lockwise-how-it-works" href=""></a>
-- </span>
-- </span>
-- <span class="number-of-synced-devices block">
-- <!-- Display number of synced devices here. -->
-- </span>
-- <span class="synced-devices-text">
-- <img class="icon-small" src="chrome://browser/skin/sync.svg"/>
-- <span>
-- <!-- Display message for status of synced devices here. -->
-- </span>
-- <a id="turn-on-sync" tabindex="0" class="hidden" href="" data-l10n-id="turn-on-sync"></a>
-- <a id="manage-devices" target="_blank" class="hidden" href="" data-l10n-id="manage-connected-devices"></a>
-- </span>
-- </div>
-- </div>
-- </div>
+ </div>
+ </div>
</section>
- <!-- Markup for Proxy card -->
- <section class="card card-no-hover proxy-card hidden">
diff --git a/browser/locales/en-US/browser/aboutLogins.ftl b/browser/locales/en-US/browser/aboutLogins.ftl
index 03feeef059..f9580d0f8f 100644
--- a/browser/locales/en-US/browser/aboutLogins.ftl
--
2.27.0
_______________________________________________
Dev mailing list
Dev@lists.parabola.nu
https://lists.parabola.nu/mailman/listinfo/dev
