From c08cd3febb7ef0edd87f30000e76f46c0d46130a Mon Sep 17 00:00:00 2001 From: bill-auger Date: Thu, 5 Sep 2019 19:50:22 -0400 Subject: [iceweasel][iceweasel-l10n]: upgrade to v69.0 --- libre/iceweasel/PKGBUILD | 97 +- libre/iceweasel/aboutlogins.svg | 4290 --------------------------------------- libre/iceweasel/newtab.patch | 269 --- 3 files changed, 52 insertions(+), 4604 deletions(-) delete mode 100644 libre/iceweasel/aboutlogins.svg delete mode 100644 libre/iceweasel/newtab.patch (limited to 'libre/iceweasel') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index a7e23629e..fecf3d823 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -41,11 +41,11 @@ pkgname=iceweasel replaces=('firefox') epoch=1 -pkgver=68.0.2 +pkgver=69.0 pkgrel=1 pkgrel+=.parabola1 -_brandingver=67.0 -_brandingrel=2 +_brandingver=69.0 +_brandingrel=1 pkgdesc="Libre standalone web browser based on Mozilla Firefox" arch=(x86_64) arch+=(i686 armv7h) @@ -57,7 +57,7 @@ depends+=(sqlite icu) 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) -# FIXME: 'mozilla-serarchplugins' package needs re-working +# FIXME: 'mozilla-serarchplugins' package needs re-working (see note in prepare()) makedepends+=(quilt libxslt imagemagick) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' @@ -66,32 +66,32 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'hunspell-en_US: Spell checking, American English') options=(!emptydirs !makeflags !debug) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} + 0001-Use-remoting-name-for-GDK-application-names.patch $pkgname.desktop https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig} arm.patch build-arm-libopus.patch - newtab.patch libre.patch searchengines.patch) -# FIXME: branding tarball needs re-working -source+=(aboutlogins.svg) -sha256sums=('9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840' +sha256sums=('413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5' 'SKIP' + 'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894' 'e439117380218898cd5c60a8da8947847efbd0fe64cc06b129d6ca20a392cb3d' - '0151b49e9f5d3bdce64ac0854d84fa5157a65df2d7e16eb683366cbeee021805' + 'a6a3771416a51c17e22461abef38b3032c7dc991d223bc374d5bb4d3bc93e9e2' 'SKIP' '2bb1f6b9b66a00f4f98eb5cdb2f25972018efe042153503cbc8c494780d7225e' '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9' - '294c88a7aa970f63c44dcb15cd0be12f73679b446804846825a16e4fb4a5d40f' '783e1b7c2f6f8719cc8a0751aacc823a5029c2326ac0b5ff7c659d831e286387' 'dfed11d97f1d4198a3dc608be159b6b53a11054f376cdb73bb0fe9a487ae9418') -sha256sums+=('SKIP') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353' # Mozilla Software Releases '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger prepare() { - cd "$srcdir/firefox-$pkgver" - [[ -d $srcdir/mozbuild ]] && rm -rf $srcdir/mozbuild + [[ -d mozbuild ]] && rm -rf mozbuild + cd firefox-$pkgver + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 + patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch ## build configuration cat >.mozconfig <> .mozconfig <=${_icu_ver}" "icu<$((${_icu_ver%%.*} + 1))") - cd "$srcdir/firefox-$pkgver" - + cd firefox-$pkgver DESTDIR="$pkgdir" ./mach install find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} + diff --git a/libre/iceweasel/aboutlogins.svg b/libre/iceweasel/aboutlogins.svg deleted file mode 100644 index 1e3aa6e80..000000000 --- a/libre/iceweasel/aboutlogins.svg +++ /dev/null @@ -1,4290 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libre/iceweasel/newtab.patch b/libre/iceweasel/newtab.patch deleted file mode 100644 index ef7a38c4f..000000000 --- a/libre/iceweasel/newtab.patch +++ /dev/null @@ -1,269 +0,0 @@ -diff --git a/browser/components/newtab/content-src/components/Base/Base.jsx b/browser/components/newtab/content-src/components/Base/Base.jsx -index d554a8943c..bfac8b6edf 100644 ---- a/browser/components/newtab/content-src/components/Base/Base.jsx -+++ b/browser/components/newtab/content-src/components/Base/Base.jsx -@@ -156,12 +156,26 @@ export class BaseContent extends React.PureComponent { - - return ( -
-+ LOGO HERE -+
-+
-+
-+
-+ BANNER HERE -+
-+
-+
-+
-
-
- {prefs.showSearch && -
- -- -+ - -
- } -diff --git a/browser/components/newtab/css/activity-stream-linux.css b/browser/components/newtab/css/activity-stream-linux.css -index 34bbf49fc7..b124294b4e 100644 ---- a/browser/components/newtab/css/activity-stream-linux.css -+++ b/browser/components/newtab/css/activity-stream-linux.css -@@ -253,7 +253,7 @@ body, - - body { - background-color: var(--newtab-background-color); -- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Ubuntu', 'Helvetica Neue', sans-serif; -+ font-family: sans-serif; - font-size: 16px; - overflow-y: scroll; } - -@@ -1715,7 +1715,7 @@ main { - width: 1%; - white-space: nowrap; } - .asrouter-admin table.minimal-table td:not(:first-child) { -- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; } -+ font-family: monospace; } - .asrouter-admin table.errorReporting tr { - border: 1px solid var(--newtab-textbox-background-color); } - .asrouter-admin table.errorReporting td { -@@ -1753,7 +1753,7 @@ main { - .asrouter-admin .message-item.blocked .message-id { - opacity: 0.5; } - .asrouter-admin .message-item .message-id { -- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; -+ font-family: monospace; - font-size: 12px; } - .asrouter-admin .providerUrl { - font-size: 12px; } -@@ -1764,7 +1764,7 @@ main { - font-size: 12px; - max-width: 750px; - overflow: auto; -- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; } -+ font-family: monospace; } - .asrouter-admin .errorState { - border: 1px solid #D70022; } - .asrouter-admin .helpLink { -diff --git a/browser/components/newtab/css/activity-stream-mac.css b/browser/components/newtab/css/activity-stream-mac.css -index 0fae889d0a..3baabba2d0 100644 ---- a/browser/components/newtab/css/activity-stream-mac.css -+++ b/browser/components/newtab/css/activity-stream-mac.css -@@ -256,7 +256,7 @@ body, - - body { - background-color: var(--newtab-background-color); -- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Ubuntu', 'Helvetica Neue', sans-serif; -+ font-family: sans-serif; - font-size: 16px; - overflow-y: scroll; } - -@@ -1718,7 +1718,7 @@ main { - width: 1%; - white-space: nowrap; } - .asrouter-admin table.minimal-table td:not(:first-child) { -- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; } -+ font-family: monospace; } - .asrouter-admin table.errorReporting tr { - border: 1px solid var(--newtab-textbox-background-color); } - .asrouter-admin table.errorReporting td { -@@ -1756,7 +1756,7 @@ main { - .asrouter-admin .message-item.blocked .message-id { - opacity: 0.5; } - .asrouter-admin .message-item .message-id { -- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; -+ font-family: monospace; - font-size: 12px; } - .asrouter-admin .providerUrl { - font-size: 12px; } -@@ -1767,7 +1767,7 @@ main { - font-size: 12px; - max-width: 750px; - overflow: auto; -- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; } -+ font-family: monospace; } - .asrouter-admin .errorState { - border: 1px solid #D70022; } - .asrouter-admin .helpLink { -diff --git a/browser/components/newtab/css/activity-stream-windows.css b/browser/components/newtab/css/activity-stream-windows.css -index 64e792542d..1e65a7b5d7 100644 ---- a/browser/components/newtab/css/activity-stream-windows.css -+++ b/browser/components/newtab/css/activity-stream-windows.css -@@ -253,7 +253,7 @@ body, - - body { - background-color: var(--newtab-background-color); -- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Ubuntu', 'Helvetica Neue', sans-serif; -+ font-family: sans-serif; - font-size: 16px; - overflow-y: scroll; } - -@@ -1715,7 +1715,7 @@ main { - width: 1%; - white-space: nowrap; } - .asrouter-admin table.minimal-table td:not(:first-child) { -- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; } -+ font-family: monospace; } - .asrouter-admin table.errorReporting tr { - border: 1px solid var(--newtab-textbox-background-color); } - .asrouter-admin table.errorReporting td { -@@ -1753,7 +1753,7 @@ main { - .asrouter-admin .message-item.blocked .message-id { - opacity: 0.5; } - .asrouter-admin .message-item .message-id { -- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; -+ font-family: monospace; - font-size: 12px; } - .asrouter-admin .providerUrl { - font-size: 12px; } -@@ -1764,7 +1764,7 @@ main { - font-size: 12px; - max-width: 750px; - overflow: auto; -- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; } -+ font-family: monospace; } - .asrouter-admin .errorState { - border: 1px solid #D70022; } - .asrouter-admin .helpLink { -diff --git a/browser/components/newtab/lib/ActivityStream.jsm b/browser/components/newtab/lib/ActivityStream.jsm -index a039e7d799..a1db618557 100644 ---- a/browser/components/newtab/lib/ActivityStream.jsm -+++ b/browser/components/newtab/lib/ActivityStream.jsm -@@ -29,17 +29,7 @@ const {HighlightsFeed} = ChromeUtils.import("resource://activity-stream/lib/High - const {ASRouterFeed} = ChromeUtils.import("resource://activity-stream/lib/ASRouterFeed.jsm"); - const {DiscoveryStreamFeed} = ChromeUtils.import("resource://activity-stream/lib/DiscoveryStreamFeed.jsm"); - --const DEFAULT_SITES = new Map([ -- // This first item is the global list fallback for any unexpected geos -- ["", "https://www.youtube.com/,https://www.facebook.com/,https://www.wikipedia.org/,https://www.reddit.com/,https://www.amazon.com/,https://twitter.com/"], -- ["US", "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://twitter.com/"], -- ["CA", "https://www.youtube.com/,https://www.facebook.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://www.amazon.ca/,https://twitter.com/"], -- ["DE", "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.de/,https://www.ebay.de/,https://www.wikipedia.org/,https://www.reddit.com/"], -- ["PL", "https://www.youtube.com/,https://www.facebook.com/,https://allegro.pl/,https://www.wikipedia.org/,https://www.olx.pl/,https://www.wykop.pl/"], -- ["RU", "https://vk.com/,https://www.youtube.com/,https://ok.ru/,https://www.avito.ru/,https://www.aliexpress.com/,https://www.wikipedia.org/"], -- ["GB", "https://www.youtube.com/,https://www.facebook.com/,https://www.reddit.com/,https://www.amazon.co.uk/,https://www.bbc.co.uk/,https://www.ebay.co.uk/"], -- ["FR", "https://www.youtube.com/,https://www.facebook.com/,https://www.wikipedia.org/,https://www.amazon.fr/,https://www.leboncoin.fr/,https://twitter.com/"], --]); -+const DEFAULT_SITES = new Map([[""]]); - const GEO_PREF = "browser.search.region"; - const SPOCS_GEOS = ["US"]; - const IS_NIGHTLY_OR_UNBRANDED_BUILD = ["nightly", "default"].includes(UpdateUtils.getUpdateChannel(true)); -@@ -65,10 +55,10 @@ const PREFS_CONFIG = new Map([ - hidden: !PREFS_CONFIG.get("feeds.section.topstories").getValue(args), - provider_icon: "pocket", - provider_name: "Pocket", -- read_more_endpoint: "https://getpocket.com/explore/trending?src=fx_new_tab", -- stories_endpoint: `https://getpocket.cdn.mozilla.net/v3/firefox/global-recs?version=3&consumer_key=$apiKey&locale_lang=${args.locale}&feed_variant=${showSpocs(args) ? "default_spocs_on" : "default_spocs_off"}`, -- stories_referrer: "https://getpocket.com/recommendations", -- topics_endpoint: `https://getpocket.cdn.mozilla.net/v3/firefox/trending-topics?version=2&consumer_key=$apiKey&locale_lang=${args.locale}`, -+ read_more_endpoint: "", -+ stories_endpoint: "", -+ stories_referrer: "", -+ topics_endpoint: "", - model_keys: ["nmf_model_animals", "nmf_model_business", "nmf_model_career", "nmf_model_datascience", "nmf_model_design", "nmf_model_education", "nmf_model_entertainment", "nmf_model_environment", "nmf_model_fashion", "nmf_model_finance", "nmf_model_food", "nmf_model_health", "nmf_model_home", "nmf_model_life", "nmf_model_marketing", "nmf_model_politics", "nmf_model_programming", "nmf_model_science", "nmf_model_shopping", "nmf_model_sports", "nmf_model_tech", "nmf_model_travel", "nb_model_animals", "nb_model_books", "nb_model_business", "nb_model_career", "nb_model_datascience", "nb_model_design", "nb_model_economics", "nb_model_education", "nb_model_entertainment", "nb_model_environment", "nb_model_fashion", "nb_model_finance", "nb_model_food", "nb_model_game", "nb_model_health", "nb_model_history", "nb_model_home", "nb_model_life", "nb_model_marketing", "nb_model_military", "nb_model_philosophy", "nb_model_photography", "nb_model_politics", "nb_model_productivity", "nb_model_programming", "nb_model_psychology", "nb_model_science", "nb_model_shopping", "nb_model_society", "nb_model_space", "nb_model_sports", "nb_model_tech", "nb_model_travel", "nb_model_writing"], - show_spocs: showSpocs(args), - personalized: true, -@@ -77,7 +67,7 @@ const PREFS_CONFIG = new Map([ - }], - ["showSponsored", { - title: "Show sponsored cards in spoc experiment (show_spocs in topstories.options has to be set to true as well)", -- value: true, -+ value: false, - }], - ["pocketCta", { - title: "Pocket cta and button for logged out users.", -@@ -102,7 +92,7 @@ const PREFS_CONFIG = new Map([ - }], - ["feeds.snippets", { - title: "Show snippets on activity stream", -- value: true, -+ value: false, - }], - ["topSitesRows", { - title: "Number of rows of Top Sites to display", -@@ -110,7 +100,7 @@ const PREFS_CONFIG = new Map([ - }], - ["telemetry", { - title: "Enable system error and usage data collection", -- value: true, -+ value: false, - value_local_dev: false, - }], - ["telemetry.ut.events", { -@@ -129,7 +119,7 @@ const PREFS_CONFIG = new Map([ - }], - ["telemetry.ping.endpoint", { - title: "Telemetry server endpoint", -- value: "https://tiles.services.mozilla.com/v4/links/activity-stream", -+ value: "" - }], - ["section.highlights.includeVisited", { - title: "Boolean flag that decides whether or not to show visited pages in highlights.", -@@ -141,7 +131,7 @@ const PREFS_CONFIG = new Map([ - }], - ["section.highlights.includePocket", { - title: "Boolean flag that decides whether or not to show saved Pocket stories in highlights.", -- value: true, -+ value: false, - }], - ["section.highlights.includeDownloads", { - title: "Boolean flag that decides whether or not to show saved recent Downloads in highlights.", -@@ -307,7 +297,7 @@ const FEEDS_DATA = [ - "CA": ["en-CA", "en-GB", "en-US", "en-ZA"], - "DE": ["de", "de-DE", "de-AT", "de-CH"], - })[geo]; -- return !!locales && locales.includes(locale); -+ return false; - }, - }, - { -@@ -320,7 +310,7 @@ const FEEDS_DATA = [ - name: "telemetry", - factory: () => new TelemetryFeed(), - title: "Relays telemetry-related actions to PingCentre", -- value: true, -+ value: false, - }, - { - name: "favicon", -@@ -338,13 +328,13 @@ const FEEDS_DATA = [ - name: "asrouterfeed", - factory: () => new ASRouterFeed(), - title: "Handles AS Router messages, such as snippets and onboaridng", -- value: true, -+ value: false, - }, - { - name: "discoverystreamfeed", - factory: () => new DiscoveryStreamFeed(), - title: "Handles new pocket ui for the new tab page", -- value: true, -+ value: false, - }, - ]; - -- cgit v1.2.2