From 6aa6e993e96d52723ad062b3a90f39a681abf540 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 20 Sep 2022 21:47:33 +0200 Subject: [iceweasel]: upgrade to v105.0 Unfortunately, Arch Linux switched to pip [1], so adding a bunch of python packages, also keeping a patch for python-zstandard as it's still needed. --- libre/iceweasel/9004-FSDG-misc.patch | 74 ++++++++++++++++++++---------------- libre/iceweasel/PKGBUILD | 40 +++++++++---------- libre/iceweasel/arc4random.diff | 33 ---------------- libre/iceweasel/cbindgen-0.24.0.diff | 17 --------- 4 files changed, 61 insertions(+), 103 deletions(-) delete mode 100644 libre/iceweasel/arc4random.diff delete mode 100644 libre/iceweasel/cbindgen-0.24.0.diff diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index 99c49dfc3..7d1da5668 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -941,46 +941,56 @@ index 7d37d26..4ebbc06 100644 -diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl -index dabfadc..3ce732e 100644 ---- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl -+++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl -@@ -96,7 +96,7 @@ policy-ExtensionSettings = Manage all aspects of extension installation. +diff --git a/browser/locales/en-US/browser/branding/brandings.ftl b/browser/locales/en-US/browser/branding/brandings.ftl +index efba683d66..9fe12b80fa 100644 +--- a/browser/locales/en-US/browser/branding/brandings.ftl ++++ b/browser/locales/en-US/browser/branding/brandings.ftl +@@ -15,28 +15,28 @@ + ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark - policy-ExtensionUpdate = Enable or disable automatic extension updates. + -facebook-container-brand-name = Facebook Container +--lockwise-brand-name = Firefox Lockwise ++-lockwise-brand-name = Iceweasel Lockwise + -lockwise-brand-short-name = Lockwise +--monitor-brand-name = Firefox Monitor ++-monitor-brand-name = Iceweasel Monitor + -monitor-brand-short-name = Monitor + -pocket-brand-name = Pocket +--send-brand-name = Firefox Send +--screenshots-brand-name = Firefox Screenshots ++-send-brand-name = Iceweasel Send ++-screenshots-brand-name = Iceweasel Screenshots + -mozilla-vpn-brand-name = Mozilla VPN +--profiler-brand-name = Firefox Profiler +--translations-brand-name = Firefox Translations ++-profiler-brand-name = Iceweasel Profiler ++-translations-brand-name = Iceweasel Translations + -rally-brand-name = Mozilla Rally + -rally-short-name = Rally +--focus-brand-name = Firefox Focus ++-focus-brand-name = Iceweasel Focus --policy-FirefoxHome = Configure Firefox Home. -+policy-FirefoxHome = Configure Iceweasel Home. +-# “Suggest” can be localized, “Firefox” must be treated as a brand ++# “Suggest” can be localized, “Iceweasel” must be treated as a brand + # and kept in English. +--firefox-suggest-brand-name = Firefox Suggest ++-firefox-suggest-brand-name = Iceweasel Suggest - policy-FlashPlugin = Allow or deny usage of the Flash plugin. +-# ”Home" can be localized, “Firefox” must be treated as a brand ++# ”Home" can be localized, “Iceweasel” must be treated as a brand + # and kept in English. +--firefox-home-brand-name = Firefox Home ++-firefox-home-brand-name = Iceweasel Home +-# View" can be localized, “Firefox” must be treated as a brand ++# View" can be localized, “Iceweasel” must be treated as a brand + # and kept in English. +--firefoxview-brand-name = Firefox View ++-firefoxview-brand-name = Iceweasel View diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl index 1b29e8d..6f7566c 100644 --- a/browser/locales/en-US/browser/preferences/preferences.ftl +++ b/browser/locales/en-US/browser/preferences/preferences.ftl -@@ -550,7 +550,7 @@ home-restore-defaults = - # "Firefox" should be treated as a brand and kept in English, - # while "Home" and "(Default)" can be localized. - home-mode-choice-default = -- .label = Firefox Home (Default) -+ .label = Iceweasel Home (Default) - - home-mode-choice-custom = - .label = Custom URLs… -@@ -577,10 +577,10 @@ choose-bookmark = - .label = Use Bookmark… - .accesskey = B - --## Home Section - Firefox Home Content Customization -+## Home Section - Iceweasel Home Content Customization - --home-prefs-content-header = Firefox Home Content --home-prefs-content-description = Choose what content you want on your Firefox Home screen. -+home-prefs-content-header = Iceweasel Home Content -+home-prefs-content-description = Choose what content you want on your Iceweasel Home screen. - - home-prefs-search-header = - .label = Web Search @@ -714,16 +714,6 @@ sync-signedout-account-signin2 = .label = Sign in to { -sync-brand-short-name }… .accesskey = i diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 08ee3ba87..f5e83d855 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -62,7 +62,7 @@ pkgname=iceweasel epoch=1 -pkgver=104.0.1 +pkgver=105.0 pkgrel=1 pkgrel+=.parabola1 _brandingver=102.0-1 @@ -73,11 +73,11 @@ 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 yasm mesa imake inetutils xorg-server-xvfb - autoconf2.13 rust clang llvm jack nodejs cbindgen nasm - python-setuptools python-zstandard lld dump_syms - wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi) -makedepends+=(quilt libxslt imagemagick git jq python-jsonschema) -makedepends+=(python-pydantic=1.9.2) # pydantic 1.10.1 has requirement typing-extensions>=4.1.0, but you have typing-extensions 3.10.0.0. - ('typing-extensions' is vendored; but 'python-pydantic' is not) + autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python + lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi + ) +makedepends+=(python-setuptools python-zstandard python-typing-extensions + quilt libxslt imagemagick git jq python-jsonschema) [[ "${CARCH}" == 'armv7h' ]] && makedepends=( ${makedepends[*]/wasi*/} ) # armv7h has no wasi compiler [[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin [[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-libc++*/} ) @@ -91,8 +91,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'xdg-desktop-portal: Screensharing with Wayland') replaces=('firefox') options=(!emptydirs !makeflags !strip !lto !debug) -source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} - zstandard-0.18.0.diff arc4random.diff +source=(https://archive.mozilla.org/pub/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.xz{,.asc} $pkgname.desktop identity-icons-brand.svg) source=(${source[*]/identity-icons-brand.svg/}) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig} @@ -101,24 +100,24 @@ source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.bra 9003-FSDG-urihandlers.patch 9004-FSDG-misc.patch process-json-files.py - vendor.js.in) + vendor.js.in + zstandard-0.18.0.diff) source_armv7h=(build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' 'rust-static-disable-network-test-on-static-libraries.patch' 'firefox-99.0.1-fdlibm-double.patch') -sha256sums=('f23f4198bd9ba1bbb7420a622080301adb924fafbd6d83b00b1e6cc687e75f4e' +sha256sums=('2b5becbb89aa2b2007ba8c86ad517aeae1b54904d007d9d3acbf054be6a0ed62' 'SKIP' - 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be' - '714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049' 'SKIP' 'bc40dc394d6de5c9db202c049c3fe24ffb547482f838d071d0b896951b25fabf' 'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b' 'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1' - '2697d54f827a493f7d74b8b8b01a10c70fd286a02924faae0d09c5f432a841a8' + '370dd0855d8ec56970fb389bdb69f5e44465e4d66be1b38f23589653923086a2' '6a0250c20a6f4cbf0ff1320c194342fe691ece56959d87de41be8f82a8feca65' - '5095942e37c4d9814788b7ac5a48661fbcf1d2ced56a02b74e5a58e7e8a5bd45') + '5095942e37c4d9814788b7ac5a48661fbcf1d2ced56a02b74e5a58e7e8a5bd45' + 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be') sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041' @@ -218,9 +217,6 @@ prepare() { # Unbreak build with python-zstandard 0.18.0 patch -Np1 -i ../zstandard-0.18.0.diff - # Unbreak build with glibc 2.36 - patch -Np1 -i ../arc4random.diff - # echo -n "$_google_api_key" >google-api-key # anti-feature # echo -n "$_mozilla_api_key" >mozilla-api-key # anti-feature @@ -377,10 +373,12 @@ END for size in 16 22 24 32 48 64 128 256 do rsvg-convert -w ${size} -h ${size} iceweasel_icon.svg -o default${size}.png done - cp iceweasel_logo.svg content/aboutlogins.svg - cp iceweasel_logo.svg content/about-logo.svg - rsvg-convert -w 192 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo.png - rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo@2x.png + cp iceweasel_logo.svg content/aboutlogins.svg + cp iceweasel_logo.svg content/about-logo.svg + rsvg-convert -w 192 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo.png + rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo@2x.png + cp content/about-logo.png content/about-logo-private.png + cp content/about-logo@2x.png content/about-logo-private@2x.png echo ${blank_svg} > content/blank.svg popd > /dev/null diff --git a/libre/iceweasel/arc4random.diff b/libre/iceweasel/arc4random.diff deleted file mode 100644 index c877d54c1..000000000 --- a/libre/iceweasel/arc4random.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff --git i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h -index 101d39d455107..3764806240f9f 100644 ---- i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h -+++ w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h -@@ -30,13 +30,13 @@ - /* #undef EVENT__HAVE_AFUNIX_H 1 */ - - /* Define to 1 if you have the `arc4random' function. */ --/* #undef EVENT__HAVE_ARC4RANDOM */ -+#define EVENT__HAVE_ARC4RANDOM 1 - - /* Define to 1 if you have the `arc4random_addrandom' function. */ - /* #undef EVENT__HAVE_ARC4RANDOM_ADDRANDOM */ - - /* Define to 1 if you have the `arc4random_buf' function. */ --/* #undef EVENT__HAVE_ARC4RANDOM_BUF */ -+#define EVENT__HAVE_ARC4RANDOM_BUF 1 - - /* Define to 1 if you have the header file. */ - #define EVENT__HAVE_ARPA_INET_H 1 -diff --git i/toolkit/crashreporter/client/ping.cpp w/toolkit/crashreporter/client/ping.cpp -index 57cf85de80b79..93a2f6e80ad0b 100644 ---- i/toolkit/crashreporter/client/ping.cpp -+++ w/toolkit/crashreporter/client/ping.cpp -@@ -53,7 +53,7 @@ static string GenerateUUID() { - - CFRelease(uuid); - #elif defined(HAVE_ARC4RANDOM_BUF) // Android, BSD, ... -- arc4random_buf(id, sizeof(UUID)); -+ arc4random_buf(&id, sizeof(UUID)); - #else // Linux - int fd = open("/dev/urandom", O_RDONLY); - diff --git a/libre/iceweasel/cbindgen-0.24.0.diff b/libre/iceweasel/cbindgen-0.24.0.diff deleted file mode 100644 index 3011e8ada..000000000 --- a/libre/iceweasel/cbindgen-0.24.0.diff +++ /dev/null @@ -1,17 +0,0 @@ -Description: Remove an extra constant definition that is now being generated by newer versions of cbindgen (0.24), and causing build failures because it is defined in several places. -Author: Olivier Tilloy -Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 -Forwarded: not-needed - ---- a/gfx/webrender_bindings/webrender_ffi.h -+++ b/gfx/webrender_bindings/webrender_ffi.h -@@ -73,8 +73,6 @@ struct WrPipelineInfo; - struct WrPipelineIdAndEpoch; - using WrPipelineIdEpochs = nsTArray; - --const uint64_t ROOT_CLIP_CHAIN = ~0; -- - } // namespace wr - } // namespace mozilla - - -- cgit v1.2.2