diff options
| -rw-r--r-- | scripts/prep-librewolf-dpkg.conf | 4 | ||||
| -rwxr-xr-x | scripts/prep-librewolf-dpkg.sh | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf index 780e510..9ce23d0 100644 --- a/scripts/prep-librewolf-dpkg.conf +++ b/scripts/prep-librewolf-dpkg.conf @@ -4,9 +4,9 @@ # Available options for DISTRO: ubuntu debian DISTRO=${DISTRO:-'debian'} # current version of Firefox package in target distro -distro_firefox_version=${distro_firefox_version:-'87.0+build3-0ubuntu0.20.04.2'} +distro_firefox_version=${distro_firefox_version:-'88.0'} # current version of Firefox, as defined by name of the orig tarball. -firefox_version=${firefox_version:-'86.0+build3'} +firefox_version=${firefox_version:-'88.0-1'} settings_commit=${settings_commit:-'master'} CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} output_dir=${CI_PROJECT_DIR}/out diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh index 2e8fe70..ede6dab 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -187,15 +187,9 @@ else "${git_source_dir}"/linux/deb_patches/*.patch \ "${debian_dir}"/patches/librewolf/ cat <<EOF >> "${debian_dir}"/patches/series -librewolf/lower-python3-requirement.patch -p1 librewolf/armhf-reduce-linker-memory-use.patch -p1 -#librewolf/build-with-libstdc++-7.patch -p1 librewolf/fix-armhf-webrtc-build.patch -p1 librewolf/webrtc-fix-compiler-flags-for-armhf.patch -p1 -librewolf/python3-remove-variable-annotations.patch -p1 -librewolf/python3-remove-fstrings.patch -p1 -librewolf/python3-remove-pep487.patch -p1 -librewolf/silence-gtk-style-assertions.patch -p1 librewolf/sandbox-update-arm-syscall-numbers.patch -p1 librewolf/remove_addons.patch -p1 librewolf/megabar.patch -p1 @@ -205,12 +199,10 @@ EOF fi # observe that build-with-libstdc++-7 is disabled for this dpkg. Debian builds Firefox with gcc, not clang. -# fix some fuzz in remove_addons.patch. The space is important! -sed -i -r -e 's/libs /l10n /;' "${debian_dir}"/patches/librewolf/remove_addons.patch # additional main LibreWolf activities # disable pocket in source -sed -i "/'pocket'/d" "${source_dir}"/browser/components/moz.build +sed -i "/\"pocket\"/d" "${source_dir}"/browser/components/moz.build sed -i "/SaveToPocket\.init/d" "${source_dir}"/browser/components/BrowserGlue.jsm # Remove internal plugin certificates sed -i -r -e '/organizationalUnit.{0,5}=.{0,5}Mozilla/{N;N;N;d}' "${source_dir}"/toolkit/mozapps/extensions/internal/XPIInstall.jsm |