Please find change descriptions in commit messages from the
attached patches.
iceweasel_branding_76.0-1.patch should be applied to [1] and
includes changes from the version 75 which for some reason
didn't make their way into the git repo.
Built for x86_64. Video calls work in Jitsi Meet, please see
[2].
Although I updated the patches and installed testing versions of
clang and rust for i686, and checked there are nothing to merge
from armv7h, builds both architectures failed with different
kinds of errors. Might want to look at them later.
[1] https://git.parabola.nu/packages/iceweasel.git/ [2]
https://labs.parabola.nu/issues/2767
From 0ea141041fa21a26df4cea66d5ae520ec136bb26 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 6 May 2020 20:40:35 +0300
Subject: [PATCH] Bump version, update patches
---
release.sh | 2 +-
.../Allowed-dupes_for_Iceweasel.patch | 12 ++++++------
.../enable-object-directory-paths.patch | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/release.sh b/release.sh
index 7dfb9ef..bb70659 100755
--- a/release.sh
+++ b/release.sh
@@ -3,7 +3,7 @@
set -eu
pkgname=iceweasel
-brandingver=73.0
+brandingver=76.0
brandingrel=1
srcdir=src
diff --git a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
index 26f1ef3..52cb29b 100644
--- a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
+++ b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
@@ -7,19 +7,19 @@ Subject: Allowed-dupes for Iceweasel
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
-index c5ab86b65..c402ab76f 100644
+index 8f699b479c..c930bed678 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
-@@ -112,9 +112,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
- components/FxAccountsPush.js
+@@ -36,9 +36,9 @@ browser/chrome.manifest
crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib
+
-# firefox/firefox-bin is bug 658850
-@MOZ_APP_NAME@
-@MOZ_APP_NAME@-bin
+# Iceweasel branding
+iceweasel
+iceweasel-bin
- modules/FxAccountsPush.js
- modules/commonjs/index.js
- modules/commonjs/sdk/ui/button/view/events.js
+
+ # Row and column icons are duplicated
+ res/table-remove-column-active.gif
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.2
From 3a658868aa1cb6bccd5228c52165f6c496d641a7 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 6 May 2020 23:36:25 +0300
Subject: [PATCH 1/3] libre/iceweasel: update patches
---
.../avoid-libxul-OOM-python-check.patch | 10 +++++-----
libre/iceweasel/libre.patch | 17 ++++++-----------
...sable-network-test-on-static-libraries.patch | 12 ++++++------
3 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/libre/iceweasel/avoid-libxul-OOM-python-check.patch b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
index 1e41e7b17..85f32ffba 100644
--- a/libre/iceweasel/avoid-libxul-OOM-python-check.patch
+++ b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
@@ -1,12 +1,12 @@
diff -rauN a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk 2019-10-25 11:08:20.757231756 +0200
-+++ b/config/rules.mk 2019-10-25 11:11:04.972821611 +0200
-@@ -663,7 +663,7 @@
+--- a/config/rules.mk 2020-04-04 12:24:34.837582901 +0200
++++ b/config/rules.mk 2020-04-04 12:26:14.227584517 +0200
+@@ -608,7 +608,7 @@
$(RM) $@
endif
$(MKSHLIB) $($@_OBJS) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
-- $(call py_action,check_binary,--target $@)
-+# $(call py_action,check_binary,--target $@)
+- $(call py3_action,check_binary,--target $@)
++# $(call py3_action,check_binary,--target $@)
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
ifdef MSMANIFEST_TOOL
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index aa74ba3a0..e4adb501a 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -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 26061a604f..a9016f6bda 100644
+index 0b62b2e74f..1afd87d0e1 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 75)",
-+ title: "Whatâs New in DevTools (Iceweasel 75)",
+- title: "Whatâs New in DevTools (Firefox 76)",
++ title: "Whatâs New in DevTools (Iceweasel 76)",
linkText: "Read more",
- linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/75?${utmParams}`,
+ linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/76?${utmParams}`,
features: [
-@@ -66,24 +66,6 @@ const release = {
+@@ -66,19 +66,6 @@ const release = {
],
};
@@ -192,18 +192,13 @@ index 26061a604f..a9016f6bda 100644
- description: `Step through event, timeout and promise-based function calls over time with the full-featured async stacks in Debugger.`,
- href: `https://developer.mozilla.org/en-US/docs/Tools/Debugger/UI_Tour?${utmParams}`,
- },
-- {
-- header: `Inspect & Debug Service Workers`,
-- 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}`,
-- },
- ],
-};
-
function openLink(href, e) {
return openDocLink(href, {
relatedToCurrent: true,
-@@ -177,11 +159,6 @@ class App extends Component {
+@@ -172,11 +159,6 @@ class App extends Component {
...release.features
.filter(feature => !feature.hidden)
.map(feature => createFactory(Feature)(feature))
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 f5e0f6a0a..bece16a04 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
@@ -1,7 +1,7 @@
-diff -rauN firefox-72.0.1/config/makefiles/rust.mk firefox-72.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk
---- firefox-72.0.1/config/makefiles/rust.mk 2020-01-08 02:23:30.000000000 +0100
-+++ firefox-72.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk 2020-01-10 12:17:40.172666172 +0100
-@@ -292,17 +292,17 @@
+diff -rauN firefox-74.0.1/config/makefiles/rust.mk firefox-74.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk
+--- firefox-74.0.1/config/makefiles/rust.mk 2020-04-03 13:10:23.000000000 +0200
++++ firefox-74.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk 2020-04-04 12:31:27.804227950 +0200
+@@ -283,17 +283,17 @@
# the chance of proxy bypasses originating from rust code.
# The check only works when rust code is built with -Clto.
# Enabling sancov or TSan also causes this to fail.
@@ -10,7 +10,7 @@ diff -rauN firefox-72.0.1/config/makefiles/rust.mk firefox-72.0.1-rust-static-di
-ifeq ($(OS_ARCH), Linux)
-ifeq (,$(rustflags_sancov))
-ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-- $(call py_action,check_binary,--target --networking $@)
+- $(call py3_action,check_binary,--target --networking $@)
-endif
-endif
-endif
@@ -21,7 +21,7 @@ diff -rauN firefox-72.0.1/config/makefiles/rust.mk firefox-72.0.1-rust-static-di
+#ifeq ($(OS_ARCH), Linux)
+#ifeq (,$(rustflags_sancov))
+#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-+# $(call py_action,check_binary,--target --networking $@)
++# $(call py3_action,check_binary,--target --networking $@)
+#endif
+#endif
+#endif
--
2.26.2
From 2a1ed9f2bbf897f029a13aa6222fc2dc24625bce Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 6 May 2020 23:40:37 +0300
Subject: [PATCH 2/3] libre/iceweasel: Remove nonfree handlers in Preferences -
Applications
All of them download and execute JavaScript code for which I couldn't
find any proof of their free licensing.
---
libre/iceweasel/libre.patch | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index e4adb501a..9e94a0ae4 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -315,3 +315,24 @@ index 02eb150..abb3af9 100644
trigger: { id: "showOnboarding" },
},
{
+diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
+index 4c4ea76..e0f2880 100644
+--- a/browser/locales/en-US/chrome/browser-region/region.properties
++++ b/browser/locales/en-US/chrome/browser-region/region.properties
+@@ -9,16 +9,3 @@
+ # don't make any spelling errors here.
+ gecko.handlerService.defaultHandlersVersion=4
+
+-# The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
+-
+-# The default set of protocol handlers for irc:
+-gecko.handlerService.schemes.irc.0.name=Mibbit
+-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
+-
+-# The default set of protocol handlers for ircs:
+-gecko.handlerService.schemes.ircs.0.name=Mibbit
+-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
--
2.26.2
From 4637b4e55bc4a7e1ce375c028dc96f9e6de2f14a Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Wed, 6 May 2020 23:45:22 +0300
Subject: [PATCH 3/3] libre/iceweasel: Bump version, sync with Arch Linux,
remove dependencies
sqlite and icu are leftovers from the times when it was built
--with-system-* flags. Works without these deps now and corresponds to
Arch Linux PKGBUILD.
---
libre/iceweasel/PKGBUILD | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index c035dbd8b..425a8ecc6 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -47,10 +47,10 @@
pkgname=iceweasel
replaces=('firefox')
epoch=1
-pkgver=75.0
-pkgrel=1
-pkgrel+=.parabola4
-_brandingver=75.0
+pkgver=76.0
+pkgrel=2
+pkgrel+=.parabola1
+_brandingver=76.0
_brandingrel=1
pkgdesc="Standalone web browser derived from Mozilla Firefox"
arch=(x86_64)
@@ -59,7 +59,6 @@ license=(MPL GPL LGPL)
url="https://wiki.parabola.nu/Iceweasel";
depends=(gtk3 libxt startup-notification mime-types dbus-glib ffmpeg nss
ttf-font libpulse)
-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)
@@ -82,17 +81,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=('bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f'
+sha256sums=('3b7b97b0b0625fc6ec23ee28d425988c679d3a56f362d62fd3b225a5d50afdc8'
'SKIP'
'5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
- 'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4'
+ '882a1eeb4895f2311f04f7abc405cfb0355ef30e1523b091355bca64f291d18a'
'b64059188836fbb9522d0d0a0d669dfa77c4f075f350554e414bb023afbaea31'
'SKIP'
- '3dbdf461f992394ca380700c229a6ce6220a07ba1c7f8475cc2ff39891447e56'
+ '443025f7ef7e1b5b506eaf4f468da7ce827696298b8b79e46151039834f5836a'
'd783225c311a4d64a9196d573627aeecaf02365395eea9783b1175b7613bdf6e'
'cc3d71eb493a3d53b1662567cae872f81ff99e0845d59ac402a890461c356183')
-sha256sums_i686=('4da71f6614dce71db8e9ec2d317514aae90838c2c65620d435f0df06b45b578b'
- '1882cd2a1689d41c3111abe45dab7215a5b292d5fff24fdde9af25af7b891a59')
+sha256sums_i686=('c4110c8851c9076c6344666cd8ead6b50ca12ce7e25acf8e90849ccece045a44'
+ '3ae2b45f6231d0f78a52771e110b75284b649aa72571ced7e2e062ec25163ee5')
sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
'2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <rele...@mozilla.com>
@@ -131,10 +130,6 @@ export MOZ_APP_REMOTINGNAME=${pkgname//-/}
export MOZ_TELEMETRY_REPORTING=
export MOZ_REQUIRE_SIGNING=
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-
# Features
ac_add_options --enable-alsa
ac_add_options --enable-jack
@@ -399,10 +394,6 @@ END
}
package() {
- local _icu_ver
- _icu_ver=$(pacman -S --print-format='%v' icu)
- depends+=("icu>=${_icu_ver}" "icu<$((${_icu_ver%%.*} + 1))")
-
cd firefox-$pkgver
DESTDIR="$pkgdir" ./mach install
--
2.26.2
_______________________________________________
Dev mailing list
Dev@lists.parabola.nu
https://lists.parabola.nu/mailman/listinfo/dev
