Hi! Please find patches attached, with changes described in commit messages.
First thing the branding patch needs to be applied to [1] the tarball regenerated. Then please run updpkgsums on the actual PKGBUILD because it's hard to predict what the checksum will be for the tarball. Please keep in mind that it has NOT been built for any architecture yet, so may fail at any given moment. The build for x86_64 is in progress on my machine right now. [1] https://git.parabola.nu/packages/iceweasel.git/
From fc0d48dfd9c95ff24a9622535c3fc9a1ebd07117 Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Wed, 8 Apr 2020 11:17:30 +0300 Subject: [PATCH] iceweasel_75.0-1.branding: Bump version, update patch --- release.sh | 2 +- .../enable-object-directory-paths.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/release.sh b/release.sh index 7dfb9ef..c622039 100755 --- a/release.sh +++ b/release.sh @@ -3,7 +3,7 @@ set -eu pkgname=iceweasel -brandingver=73.0 +brandingver=75.0 brandingrel=1 srcdir=src diff --git a/src/patches/iceweasel-branding/enable-object-directory-paths.patch b/src/patches/iceweasel-branding/enable-object-directory-paths.patch index 74791e4..8c01e86 100644 --- a/src/patches/iceweasel-branding/enable-object-directory-paths.patch +++ b/src/patches/iceweasel-branding/enable-object-directory-paths.patch @@ -1,13 +1,13 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py -index 41ae8ae..dcc3263 100644 +index 07db8aa..8403e68 100644 --- a/python/mozbuild/mozbuild/frontend/context.py +++ b/python/mozbuild/mozbuild/frontend/context.py -@@ -640,8 +640,6 @@ class Path(ContextDerivedValue, unicode) +@@ -742,8 +742,6 @@ class SourcePath(Path): """Like Path, but limited to paths in the source directory.""" - def __init__(self, context, value): + def __new__(cls, context, value=None): - if value.startswith('!'): - raise ValueError('Object directory paths are not allowed') if value.startswith('%'): raise ValueError('Filesystem absolute paths are not allowed') - super(SourcePath, self).__init__(context, value) + self = super(SourcePath, cls).__new__(cls, context, value) -- 2.26.0
From 4d21a0678cd39d74beb8a43a27144b77e3b0c7cf Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Wed, 8 Apr 2020 11:45:44 +0300 Subject: [PATCH 1/2] libre/iceweasel 75.0-1: Bump version and refresh patch accordingly Please note checksum for patch hasn't been updated yet since more changes are needed to it. --- libre/iceweasel/PKGBUILD | 6 +++--- libre/iceweasel/libre.patch | 21 ++++++++------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index ddd047158..21c12c4d1 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -47,10 +47,10 @@ pkgname=iceweasel replaces=('firefox') epoch=1 -pkgver=74.0.1 +pkgver=75.0 pkgrel=1 pkgrel+=.parabola1 -_brandingver=73.0 +_brandingver=75.0 _brandingrel=1 pkgdesc="Standalone web browser derived from Mozilla Firefox" arch=(x86_64) @@ -82,7 +82,7 @@ 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=('62e4297b682fad1ea50d8e32fc51c811169f8edec8d12d2aab0ea60b3197f011' +sha256sums=('bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f' 'SKIP' '5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c' 'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4' diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 0870d45cb..6ac39f8b1 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -25,14 +25,14 @@ index 7d37d26..4ebbc06 100644 </hbox> - <label class="fxaMobilePromo" data-l10n-id="sync-mobile-promo"> - <html:img -- src="chrome://browser/skin/preferences/in-content/logo-android.svg" +- src="chrome://browser/skin/logo-android.svg" - data-l10n-name="android-icon" - class="androidIcon"/> - <html:a - data-l10n-name="android-link" - class="fxaMobilePromo-android text-link" target="_blank"/> - <html:img -- src="chrome://browser/skin/preferences/in-content/logo-ios.svg" +- src="chrome://browser/skin/logo-ios.svg" - data-l10n-name="ios-icon" - class="iOSIcon"/> - <html:a @@ -166,19 +166,19 @@ index 2d3c7b4..00221d3 100644 -#endif </dl> diff --git a/devtools/client/whats-new/src/main.js b/devtools/client/whats-new/src/main.js -index 1573c23a39..eed066db72 100644 +index 26061a604f..a9016f6bda 100644 --- a/devtools/client/whats-new/src/main.js +++ b/devtools/client/whats-new/src/main.js @@ -29,7 +29,7 @@ const aside = { }; const release = { -- title: "Whatâs New in DevTools (Firefox 74 & 73)", -+ title: "Whatâs New in DevTools (Iceweasel 74 & 73)", +- title: "Whatâs New in DevTools (Firefox 75)", ++ title: "Whatâs New in DevTools (Iceweasel 75)", linkText: "Read more", - linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/74?${utmParams}`, + linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/75?${utmParams}`, features: [ -@@ -71,29 +71,6 @@ const release = { +@@ -66,24 +66,6 @@ const release = { ], }; @@ -197,18 +197,13 @@ index 1573c23a39..eed066db72 100644 - description: `Start, pause and debug your Service Workers and inspect your Web App Manifests within the long-awaited Application panel.`, - href: `https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API/Using_Service_Workers?${utmParams}`, - }, -- { -- header: `Instantly evaluated Console previews`, -- description: `Peek into the results of your current Console expression and autocomplete values as you type.`, -- href: `https://developer.mozilla.org/en-US/docs/Tools/Web_Console/The_command_line_interpreter?${utmParams}`, -- }, - ], -}; - function openLink(href, e) { return openDocLink(href, { relatedToCurrent: true, -@@ -187,11 +164,6 @@ class App extends Component { +@@ -177,11 +159,6 @@ class App extends Component { ...release.features .filter(feature => !feature.hidden) .map(feature => createFactory(Feature)(feature)) -- 2.26.0 From 5160f1303a5ce6d02777f34287308cf9d9d80d70 Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Wed, 8 Apr 2020 11:48:11 +0300 Subject: [PATCH 2/2] libre/iceweasel: Remove promo card for nonfree Firefox mobile in New Tab --- libre/iceweasel/PKGBUILD | 2 +- libre/iceweasel/libre.patch | 52 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 21c12c4d1..11dd85a09 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -88,7 +88,7 @@ sha256sums=('bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f' 'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4' '091b32290e1cbb8597bd31c770f3b850d2cecc0e8ca591bb50956fde67c0a449' 'SKIP' - 'dcc25e04627842bbd160059f1c576397d688418198a225210fae8a5ea6c32a7a' + '82b6d93655f5d96d6eac526d83e95bf1620deb4202f7f0cb0ff33807df36773f' 'd783225c311a4d64a9196d573627aeecaf02365395eea9783b1175b7613bdf6e' 'f42b329e96cdf15d09844ca2541d096f56a5ca946f3d94d72dd10e3411fd5e85') sha256sums_i686=('4da71f6614dce71db8e9ec2d317514aae90838c2c65620d435f0df06b45b578b' diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 6ac39f8b1..746d098db 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -298,3 +298,55 @@ index edd871b..77870fe 100644 addon-page-options-button = .title = Tools for all add-ons +diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm +index 02eb150..20eb672 100644 +--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm ++++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm +@@ -293,30 +293,6 @@ const ONBOARDING_MESSAGES = () => [ + targeting: "trailheadTriplet == 'payoff' && isChinaRepack == false", + trigger: { id: "showOnboarding" }, + }, +- { +- id: "TRAILHEAD_CARD_6", +- template: "onboarding", +- bundled: 3, +- order: 6, +- content: { +- title: { string_id: "onboarding-mobile-phone-title" }, +- text: { string_id: "onboarding-mobile-phone-text" }, +- icon: "mobile", +- primary_button: { +- label: { string_id: "onboarding-mobile-phone-button" }, +- action: { +- type: "OPEN_URL", +- data: { +- args: "https://www.mozilla.org/firefox/mobile/";, +- where: "tabshifted", +- }, +- }, +- }, +- }, +- targeting: +- "trailheadTriplet in ['supercharge', 'static'] || ('dynamic' in trailheadTriplet && sync.mobileDevices < 1)", +- trigger: { id: "showOnboarding" }, +- }, + { + id: "TRAILHEAD_CARD_7", + template: "onboarding", +diff --git a/browser/locales/en-US/browser/newtab/onboarding.ftl b/browser/locales/en-US/browser/newtab/onboarding.ftl +index 106227c..4600bdc 100644 +--- a/browser/locales/en-US/browser/newtab/onboarding.ftl ++++ b/browser/locales/en-US/browser/newtab/onboarding.ftl +@@ -114,12 +114,6 @@ onboarding-firefox-send-title = Keep Your Shared Files Private + onboarding-firefox-send-text2 = Upload your files to { -send-brand-name } to share them with end-to-end encryption and a link that automatically expires. + onboarding-firefox-send-button = Try { -send-brand-name } + +-onboarding-mobile-phone-title = Get { -brand-product-name } on Your Phone +-onboarding-mobile-phone-text = Download { -brand-product-name } for iOS or Android and sync your data across devices. +-# "Mobile" is short for mobile/cellular phone, "Browser" is short for web +-# browser. +-onboarding-mobile-phone-button = Download Mobile Browser +- + onboarding-send-tabs-title = Instantly Send Yourself Tabs + # "Send Tabs" refers to "Send Tab to Device" feature that appears when opening a + # tab's context menu. -- 2.26.0
_______________________________________________ Dev mailing list [email protected] https://lists.parabola.nu/mailman/listinfo/dev
