diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | PKGBUILD | 27 | ||||
| -rwxr-xr-x | binary_tarball/scripts/3_Configure_Source_Code.sh | 11 | ||||
| -rwxr-xr-x | binary_tarball/scripts/4_Build_Binary_Tarball.sh | 2 | ||||
| -rwxr-xr-x | binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 4 | ||||
| -rw-r--r-- | deb_patches/lower-python3-requirement.patch | 4 | ||||
| -rw-r--r-- | deb_patches/silence-gtk-style-assertions.patch | 34 |
7 files changed, 53 insertions, 36 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bb3fd8..363c510 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ 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. +## [82.0.2-1] - 2020-10-29 + +### Changed + +- New upstream release 82.0.2 +- New upstream release of included uBlock Origin (1.30.6) + ## [81.0.2-1] - 2020-10-18 ### Changed @@ -6,7 +6,7 @@ pkgname=librewolf _pkgname=LibreWolf # how to get ci vars instead? -pkgver=81.0.2 +pkgver=82.0.2 pkgrel=1 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom." arch=(x86_64 aarch64) @@ -23,20 +23,15 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'hunspell-en_US: Spell checking, American English') options=(!emptydirs !makeflags !strip) _arch_svn=https://git.archlinux.org/svntogit/packages.git/plain/trunk +_settings_commit=8697f589a1499598b8af5df11d82b60e8c97d981 source_x86_64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz $pkgname.desktop - "0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch::${_arch_svn}/0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch?h=packages/firefox" - "0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch::${_arch_svn}/0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch?h=packages/firefox" - "0004-Bug-1663715-Update-syn-and-proc-macro2-so-that-Firef.patch::${_arch_svn}/0004-Bug-1663715-Update-syn-and-proc-macro2-so-that-Firef.patch?h=packages/firefox" "git+https://gitlab.com/${pkgname}-community/browser/common.git" "git+https://gitlab.com/${pkgname}-community/settings.git" "megabar.patch" "remove_addons.patch") source_aarch64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz $pkgname.desktop - "0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch::${_arch_svn}/0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch?h=packages/firefox" - "0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch::${_arch_svn}/0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch?h=packages/firefox" - "0004-Bug-1663715-Update-syn-and-proc-macro2-so-that-Firef.patch::${_arch_svn}/0004-Bug-1663715-Update-syn-and-proc-macro2-so-that-Firef.patch?h=packages/firefox" "git+https://gitlab.com/${pkgname}-community/browser/common.git" "git+https://gitlab.com/${pkgname}-community/settings.git" "megabar.patch" @@ -44,20 +39,14 @@ source_aarch64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/ arm.patch https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch) -sha256sums_x86_64=('91b6482de9b193b19d1fd9a8b99015a001646a48429297bbb7fe41784f9f9b44' +sha256sums_x86_64=('8851cae2df9923844c3dc97a4f77f6f3c86cc6f298b888b38949fbf74fcf2ca9' '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' - 'c2489a4ad3bfb65c064e07180a1de9a2fbc3b1b72d6bc4cd3985484d1b6b7b29' - '52cc26cda4117f79fae1a0ad59e1404b299191a1c53d38027ceb178dab91f3dc' - '2ffa37306bf8e5d79e074e612f88b6f3f671c45215724f84dd85cbea8b91e6bd' 'SKIP' 'SKIP' '682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5' '41719289b309912c4b6bc86b41594f671427979481a90c32a9d3d0bf1cdd6d44') -sha256sums_aarch64=('91b6482de9b193b19d1fd9a8b99015a001646a48429297bbb7fe41784f9f9b44' +sha256sums_aarch64=('8851cae2df9923844c3dc97a4f77f6f3c86cc6f298b888b38949fbf74fcf2ca9' '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' - 'c2489a4ad3bfb65c064e07180a1de9a2fbc3b1b72d6bc4cd3985484d1b6b7b29' - '52cc26cda4117f79fae1a0ad59e1404b299191a1c53d38027ceb178dab91f3dc' - '2ffa37306bf8e5d79e074e612f88b6f3f671c45215724f84dd85cbea8b91e6bd' 'SKIP' 'SKIP' '682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5' @@ -69,14 +58,6 @@ prepare() { mkdir mozbuild cd firefox-$pkgver - # https://bugs.archlinux.org/task/67978 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1660901 - patch -Np1 -i ../0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch - patch -Np1 -i ../0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1663715 - patch -Np1 -i ../0004-Bug-1663715-Update-syn-and-proc-macro2-so-that-Firef.patch - cat >../mozconfig <<END ac_add_options --enable-application=browser mk_add_options MOZ_OBJDIR=${PWD@Q}/obj diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index dc04fb0..1afc5c1 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -111,16 +111,6 @@ END fi -# some patches used by Arch upstream -# https://bugs.archlinux.org/task/67978 -# https://bugzilla.mozilla.org/show_bug.cgi?id=1660901 -_arch_svn=https://git.archlinux.org/svntogit/packages.git/plain/trunk -wget "${_arch_svn}/0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch?h=packages/firefox" -O 0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch -wget "${_arch_svn}/0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch?h=packages/firefox" -O 0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch - -patch -Np1 -i ./0002-Bug-1660901-Support-the-fstat-like-subset-of-fstatat.patch -patch -Np1 -i ./0003-Bug-1660901-ignore-AT_NO_AUTOMOUNT-in-fstatat-system.patch - # hopefully the magic sauce that makes things build on 16.04 and later on work "everywhere": patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/lower-python3-requirement.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/armhf-reduce-linker-memory-use.patch" @@ -130,6 +120,7 @@ patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/webrtc-fix-compiler-flags-for-armhf. patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/python3-remove-variable-annotations.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/python3-remove-fstrings.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/python3-remove-pep487.patch" +patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/silence-gtk-style-assertions.patch" # Remove some pre-installed addons that might be questionable patch -p1 -i ${CI_PROJECT_DIR}/remove_addons.patch diff --git a/binary_tarball/scripts/4_Build_Binary_Tarball.sh b/binary_tarball/scripts/4_Build_Binary_Tarball.sh index 89a3d96..bfd536c 100755 --- a/binary_tarball/scripts/4_Build_Binary_Tarball.sh +++ b/binary_tarball/scripts/4_Build_Binary_Tarball.sh @@ -64,7 +64,7 @@ rm -f mozconfig # source /root/.cargo/env # install cbindgen -cargo install --version 0.14.3 cbindgen +cargo install --version 0.15.0 cbindgen if [[ $CARCH == 'aarch64' ]]; then diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh index c7517d1..d4826d4 100755 --- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh @@ -11,6 +11,7 @@ LAUNCHER_SCRIPT=$3; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)} _SCRIPT_FOLDER=$(realpath $(dirname $0)); _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf; +_SETTINGS_COMMIT=8697f589a1499598b8af5df11d82b60e8c97d981 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball @@ -22,6 +23,9 @@ tar --strip-components=1 -xf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER printf "\nCopying librewolf settings to extracted binary tarball\n"; git clone $_SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings; +cd $_EXTRACTED_TARBALL_FOLDER/settings +git checkout $_SETTINGS_COMMIT +cd - # no need to keep that in there: rm -rf "${_EXTRACTED_TARBALL_FOLDER}/settings/.git"; cp $TOGGLE_SETTINGS_SCRIPT $_EXTRACTED_TARBALL_FOLDER/settings; diff --git a/deb_patches/lower-python3-requirement.patch b/deb_patches/lower-python3-requirement.patch index 94f8d91..e60bf71 100644 --- a/deb_patches/lower-python3-requirement.patch +++ b/deb_patches/lower-python3-requirement.patch @@ -14,8 +14,8 @@ diff -r ede1c973aa85 build/moz.configure/init.configure -option(env='PYTHON3', nargs=1, help='Python 3 interpreter (3.6 or later)') +option(env='PYTHON3', nargs=1, help='Python 3 interpreter (3.5 or later)') - - @depends('PYTHON3', check_build_environment, mozconfig, '--help') + option(env='VIRTUALENV_NAME', nargs=1, default='init_py3', + help='Name of the in-objdir virtualenv') @@ -334,20 +334,20 @@ '(%s): %s' % (python, e)) else: diff --git a/deb_patches/silence-gtk-style-assertions.patch b/deb_patches/silence-gtk-style-assertions.patch new file mode 100644 index 0000000..bfad1cc --- /dev/null +++ b/deb_patches/silence-gtk-style-assertions.patch @@ -0,0 +1,34 @@ +Description: silence GTK style-related assertions caused by the lack of a "selection" CSS node on GtkTextView in the version of gtk3 in xenial. + These assertions were caused by the fix for https://bugzilla.mozilla.org/1654323. +Author: Olivier Tilloy <olivier.tilloy@canonical.com> + +--- a/widget/gtk/nsLookAndFeel.cpp ++++ b/widget/gtk/nsLookAndFeel.cpp +@@ -1142,7 +1142,7 @@ void nsLookAndFeel::EnsureInit() { + &color); + mTextSelectedText = GDK_RGBA_TO_NS_RGBA(color); + }; +- GrabSelectionColors(selectionStyle); ++ GrabSelectionColors(selectionStyle ? selectionStyle : style); + if (mTextSelectedBackground == mTextSelectedText) { + // Some old distros/themes don't properly use the .selection style, so + // fall back to the regular text view style. +--- a/widget/gtk/WidgetStyleCache.cpp ++++ b/widget/gtk/WidgetStyleCache.cpp +@@ -933,7 +933,7 @@ static GtkStyleContext* GetWidgetRootSty + default: + GtkWidget* widget = GetWidget(aNodeType); + MOZ_ASSERT(widget); +- return gtk_widget_get_style_context(widget); ++ return (widget ? gtk_widget_get_style_context(widget) : nullptr); + } + + MOZ_ASSERT(style); +@@ -1356,6 +1356,7 @@ GtkStyleContext* GetStyleContext(WidgetN + style = GetCssNodeStyleInternal(aNodeType); + StyleContextSetScale(style, aScale); + } ++ if (!style) return nullptr; + bool stateChanged = false; + bool stateHasDirection = gtk_get_minor_version() >= 8; + GtkStateFlags oldState = gtk_style_context_get_state(style); |