diff options
| -rw-r--r-- | CHANGELOG.md | 13 | ||||
| -rw-r--r-- | PKGBUILD | 28 | ||||
| -rwxr-xr-x | binary_tarball/scripts/3_Configure_Source_Code.sh | 5 | ||||
| -rw-r--r-- | deb_patches/armhf-reduce-linker-memory-use.patch | 4 | ||||
| -rw-r--r-- | deb_patches/python3-remove-variable-annotations.patch | 54 | ||||
| -rw-r--r-- | remove_addons.patch | 5 |
6 files changed, 83 insertions, 26 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 58b0416..a305912 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). This project follows the official Firefox releases, but also uses [Arch Linux Package Versioning](https://wiki.archlinux.org/index.php/Arch_package_guidelines#Package_versioning) to mark individual releases in between versions. +## [80.0-1] - 2020-07-30 + +### Changed + +- New upstream release 80.0 +- New upstream release of included uBlock Origin (1.29.2) + +### Fixed + +- Fixed too broad Flatpak access permissions / sandboxing (#122 and #123), thanks to @TheMainOne! +- Unlocked an important setting required to easily enable WebRTC (macOS/#8) +- Closing the last tab now closes the browser again (#121) + ## [79.0-1] - 2020-07-30 ### Changed @@ -6,7 +6,7 @@ pkgname=librewolf _pkgname=LibreWolf # how to get ci vars instead? -pkgver=79.0 +pkgver=80.0 pkgrel=1 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom." arch=(x86_64 aarch64) @@ -27,8 +27,7 @@ source_x86_64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/f "git+https://gitlab.com/${pkgname}-community/browser/common.git" "git+https://gitlab.com/${pkgname}-community/settings.git" "megabar.patch" - "remove_addons.patch" - https://raw.githubusercontent.com/archlinux/svntogit-packages/master/firefox/repos/extra-x86_64/bug1654465.diff) + "remove_addons.patch") source_aarch64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz $pkgname.desktop "git+https://gitlab.com/${pkgname}-community/browser/common.git" @@ -36,25 +35,22 @@ source_aarch64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/ "megabar.patch" "remove_addons.patch" arm.patch - https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch - https://raw.githubusercontent.com/archlinux/svntogit-packages/master/firefox/repos/extra-x86_64/bug1654465.diff) + https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch) -sha256sums_x86_64=('12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713' +sha256sums_x86_64=('380d9853e0712442ba2d4acd85c0e09c19ad36561a3ea8932705ad6b8a91146a' '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' 'SKIP' 'SKIP' '2bef819c55935f6c72a7aa28273ecddfce0888429a32465feb6c34a16ff1ed9c' - '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0' - 'e577f7e5636deda0026b0e385186f3ecb2212c9b84b6a2949a1811dab3e410d6') -sha256sums_aarch64=('12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713' + 'd191e65a0ce3eeba0a3171c143fc93e3ded6c29eb751b90d58a7d3bf1983aca6') +sha256sums_aarch64=('380d9853e0712442ba2d4acd85c0e09c19ad36561a3ea8932705ad6b8a91146a' '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' 'SKIP' 'SKIP' '2bef819c55935f6c72a7aa28273ecddfce0888429a32465feb6c34a16ff1ed9c' - '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0' + 'd191e65a0ce3eeba0a3171c143fc93e3ded6c29eb751b90d58a7d3bf1983aca6' '6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7' - '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9' - 'e577f7e5636deda0026b0e385186f3ecb2212c9b84b6a2949a1811dab3e410d6') + '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') prepare() { mkdir mozbuild @@ -62,6 +58,7 @@ prepare() { cat >../mozconfig <<END ac_add_options --enable-application=browser +mk_add_options MOZ_OBJDIR=${PWD@Q}/obj # This supposedly speeds up compilation (We test through dogfooding anyway) ac_add_options --disable-tests @@ -131,9 +128,6 @@ ac_add_options --enable-optimize END fi - # https://bugzilla.mozilla.org/show_bug.cgi?id=1654465 - patch -Np1 -i ../bug1654465.diff - # Remove some pre-installed addons that might be questionable patch -p1 -i ../remove_addons.patch @@ -172,8 +166,8 @@ build() { # -fno-plt with cross-LTO causes obscure LLVM errors # LLVM ERROR: Function Import: link error - CFLAGS="${CFLAGS/-fno-plt/}" - CXXFLAGS="${CXXFLAGS/-fno-plt/}" + # CFLAGS="${CFLAGS/-fno-plt/}" + # CXXFLAGS="${CXXFLAGS/-fno-plt/}" # Do 3-tier PGO echo "Building instrumented browser..." diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index ae34231..021220c 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -21,6 +21,7 @@ cd $srcdir cat >${CI_PROJECT_DIR}/mozconfig <<END ac_add_options --enable-application=browser +mk_add_options MOZ_OBJDIR=${PWD@Q}/obj # to build on ubuntu and pick up clang ac_add_options NODEJS=/usr/lib/nodejs-mozilla/bin/node @@ -117,10 +118,6 @@ patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/build-with-libstdc++-7.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/fix-armhf-webrtc-build.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/webrtc-fix-compiler-flags-for-armhf.patch" -# https://bugzilla.mozilla.org/show_bug.cgi?id=1654465 -wget https://raw.githubusercontent.com/archlinux/svntogit-packages/master/firefox/repos/extra-x86_64/bug1654465.diff -O ${CI_PROJECT_DIR}/bug1654465.diff -patch -p1 -i ${CI_PROJECT_DIR}/bug1654465.diff - # Remove some pre-installed addons that might be questionable patch -p1 -i ${CI_PROJECT_DIR}/remove_addons.patch diff --git a/deb_patches/armhf-reduce-linker-memory-use.patch b/deb_patches/armhf-reduce-linker-memory-use.patch index 3f20011..6449227 100644 --- a/deb_patches/armhf-reduce-linker-memory-use.patch +++ b/deb_patches/armhf-reduce-linker-memory-use.patch @@ -13,9 +13,9 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com> -def linker_ldflags(linker, macos_sdk): +@depends_if(select_linker, macos_sdk, host) +def linker_ldflags(linker, macos_sdk, host): - flags = list(linker.LINKER_FLAG or []) + flags = list((linker and linker.LINKER_FLAG) or []) if macos_sdk: - if linker.KIND == 'ld64': + if linker and linker.KIND == 'ld64': flags.append('-Wl,-syslibroot,%s' % macos_sdk) else: flags.append('-Wl,--sysroot=%s' % macos_sdk) diff --git a/deb_patches/python3-remove-variable-annotations.patch b/deb_patches/python3-remove-variable-annotations.patch new file mode 100644 index 0000000..308a298 --- /dev/null +++ b/deb_patches/python3-remove-variable-annotations.patch @@ -0,0 +1,54 @@ +Description: remove variable annotations that require Python 3.6 (https://docs.python.org/3/whatsnew/3.6.html#whatsnew36-pep526) +Author: Olivier Tilloy <olivier.tilloy@canonical.com> + +--- a/xpcom/ds/tools/incremental_dafsa.py ++++ b/xpcom/ds/tools/incremental_dafsa.py +@@ -14,12 +14,6 @@ from typing import List, Dict, Optional, + + + class Node: +- children: Dict[str, "Node"] +- parents: Dict[str, List["Node"]] +- character: str +- is_root_node: bool +- is_end_node: bool +- + def __init__(self, character, is_root_node=False, is_end_node=False): + self.children = {} + self.parents = {} +@@ -156,9 +150,6 @@ class Node: + + + class SuffixCursor: +- index: int # Current position of the cursor within the DAFSA. +- node: Node +- + def __init__(self, index, node): + self.index = index + self.node = node +@@ -227,15 +218,6 @@ class DafsaAppendStateMachine: + The next suffix node we'll attempt to find is at index "9". + """ + +- root_node: Node +- prefix_index: int +- suffix_cursor: SuffixCursor +- stack: List[Node] +- word: str +- suffix_overlaps_prefix: bool +- first_fork_index: Optional[int] +- _state: Callable +- + def __init__(self, word, root_node, end_node): + self.root_node = root_node + self.prefix_index = 0 +@@ -471,9 +453,6 @@ def _duplicate_fork_nodes(stack, fork_in + + + class Dafsa: +- root_node: Node +- end_node: Node +- + def __init__(self): + self.root_node = Node(None, is_root_node=True) + self.end_node = Node(None, is_end_node=True) diff --git a/remove_addons.patch b/remove_addons.patch index 69c4d8f..e909931 100644 --- a/remove_addons.patch +++ b/remove_addons.patch @@ -1,14 +1,13 @@ diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build -index 4c9fa78..095d199 100644 +index f71ece6..bd91686 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build -@@ -5,10 +5,7 @@ +@@ -5,9 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += [ - 'doh-rollout', 'formautofill', - 'pdfjs', - 'screenshots', - 'webcompat', - 'report-site-issue' |