diff options
| -rw-r--r-- | scripts/prep-librewolf-dpkg.conf | 6 | ||||
| -rwxr-xr-x | scripts/prep-librewolf-dpkg.sh | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf index d06cda4..4528764 100644 --- a/scripts/prep-librewolf-dpkg.conf +++ b/scripts/prep-librewolf-dpkg.conf @@ -4,11 +4,11 @@ # Available options for DISTRO: debian DISTRO=${DISTRO:-'debian'} # current version of Firefox package in target distro -distro_firefox_version=${distro_firefox_version:-'107.0-1'} +distro_firefox_version=${distro_firefox_version:-'108.0-2'} # current version of Firefox, as defined by name of the orig tarball. -firefox_version=${firefox_version:-'107.0'} +firefox_version=${firefox_version:-'108.0'} # Tag for LibreWolf linux repo -librewolf_version=${librewolf_version:-'107.0-1'} +librewolf_version=${librewolf_version:-'108.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 fd5b250..6eb9c0e 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -200,7 +200,7 @@ else sed -r -e 's@$@ -p1@' -e '/vpn-ad/d' >> "${debian_dir}/patches/series" #echo "librewolf/webrender_ffi.patch -p1" >> "${debian_dir}/patches/series" # added 107.0 to patch for debian 107.0 until defuzz-105.0 gets merged - test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/bootstrap-without-vcs.patch" <<'EOF' + test -n "" && patch -p1 "${debian_dir}/patches/librewolf/bootstrap-without-vcs.patch" <<'EOF' diff --git a/patches/bootstrap-without-vcs.patch b/patches/bootstrap-without-vcs.patch index d213d70..68db89f 100644 --- a/patches/bootstrap-without-vcs.patch @@ -268,7 +268,7 @@ index d213d70..68db89f 100644 EOF # added 106.0.1 to patch for debian 106.0 until defuzz-106.0.1 gets merged - test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/website-appearance-ui-rfp.patch" <<EOF + test -n "" && patch -p1 "${debian_dir}/patches/librewolf/website-appearance-ui-rfp.patch" <<EOF diff --git a/patches/ui-patches/website-appearance-ui-rfp.patch b/patches/ui-patches/website-appearance-ui-rfp.patch index 0de5504..7915e9c 100644 --- a/patches/ui-patches/website-appearance-ui-rfp.patch @@ -303,7 +303,7 @@ index 0de5504..7915e9c 100644 this.warning.hidden = !forcingColorsAndNoColorSchemeSupport; EOF # added 106.0.1, updated for 107.0; waiting for merge of defuzz-107.0 - test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/firefox-view.patch" <<EOF + test -n "" && patch -p1 "${debian_dir}/patches/librewolf/firefox-view.patch" <<EOF diff --git a/patches/ui-patches/firefox-view.patch b/patches/ui-patches/firefox-view.patch index a6708c1..1d3391f 100644 --- a/patches/ui-patches/firefox-view.patch @@ -390,7 +390,7 @@ index a6708c1..1d3391f 100644 description: "Whether or not to show the colorway closet modal" EOF # added 106.0.1 to patch for debian 106.0 until defuzz-106.0.1 gets merged - test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/disable-pocket.patch" <<EOF + test -n "" && patch -p1 "${debian_dir}/patches/librewolf/disable-pocket.patch" <<EOF diff --git a/patches/sed-patches/disable-pocket.patch b/patches/sed-patches/disable-pocket.patch index 25e4056..c2f5182 100644 --- a/patches/sed-patches/disable-pocket.patch @@ -436,7 +436,7 @@ index 25e4056..c2f5182 100644 "preferences", EOF # added 103.0 - test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/remove-snippets-from-home.patch" <<EOF + test -n "" && patch -p1 "${debian_dir}/patches/librewolf/remove-snippets-from-home.patch" <<EOF --- ../../git/source/patches/ui-patches/remove-snippets-from-home.patch 2022-03-22 19:01:35.323802032 -0400 +++ debian/patches/librewolf/remove-snippets-from-home.patch 2022-07-29 15:41:22.727541444 -0400 @@ -1,6 +1,6 @@ |