From 60cbb0acf5b36795d49a6d3e26a82ade456c26ee Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Wed, 20 Jan 2021 15:28:10 +0100 Subject: [PATCH] fix flatpak/appimage releases using old settings --- CHANGELOG.md | 6 ++++++ PKGBUILD | 2 +- binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f835b85..58d42b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ 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. +## [84.0.2-2] - 2021-01-20 + +### Fixed + +- AppImage and Flatpak releases were not using the most recent settings. + ## [84.0.2-1] - 2021-01-08 ### Changed diff --git a/PKGBUILD b/PKGBUILD index e20fa20..f0e4a33 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -24,7 +24,7 @@ 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=25115b211d60876c43f5098ce3e88bcee2a7e521 +_settings_commit=0d0cd76c4465b4be11a3460ae4bcee3500e665e4 source_x86_64=(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" diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh index 04bc086..f589495 100755 --- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh @@ -11,7 +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=2f76ae07f7016034273f1887b7f1bedab997909c +_SETTINGS_COMMIT=0d0cd76c4465b4be11a3460ae4bcee3500e665e4 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball