95.0.1 attempt 1

2 files changed, 13 insertions, 25 deletions

diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf
index 52a284c..5515e3d 100644
--- a/scripts/prep-librewolf-dpkg.conf
+++ b/scripts/prep-librewolf-dpkg.conf
@@ -4,11 +4,12 @@
 # Available options for DISTRO: ubuntu debian
 DISTRO=${DISTRO:-'debian'}
 # current version of Firefox package in target distro
-distro_firefox_version=${distro_firefox_version:-'95.0-1'}
+distro_firefox_version=${distro_firefox_version:-'95.0.1-1'}
 # current version of Firefox, as defined by name of the orig tarball.
-firefox_version=${firefox_version:-'95.0'}
+firefox_version=${firefox_version:-'95.0.1'}
 # Tag for LibreWolf common and linux repos
-librewolf_version=${librewolf_version:-'95.0-1'}
+librewolf_version=${librewolf_version:-'95.0.2-1'}
+lw_common_version=${librewol_version:-'95.0.1-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 9859cd5..a15550d 100755
--- a/scripts/prep-librewolf-dpkg.sh
+++ b/scripts/prep-librewolf-dpkg.sh
@@ -18,7 +18,7 @@
 # Dependencies:
 #    wget, git, tar, awk, sed
 
-# Aborts the script upon any faliure
+# Aborts the script upon any failure
 set -e;
 
 #####################################
@@ -82,7 +82,8 @@ test -z "${SKIP_EXTRACT}" && {
 # test -z "${SKIP_GIT}" && (
    # yes, use a sub-shell because of this cd. pushd is a bash builtin, but we are using sh and not bash.
    # cd "${git_source_dir}"
-   git clone "${librewolf_common_url}" ${git_source_dir}/common || : ; ( cd "${git_source_dir}/common" ; git checkout master ; git pull ; git checkout "v${librewolf_version}" ; )
+   lw_cv="${lw_common_version}" ; test -z "${lw_cv}" && lw_cv=${librewolf_version}
+   git clone "${librewolf_common_url}" ${git_source_dir}/common || : ; ( cd "${git_source_dir}/common" ; git checkout master ; git pull ; git checkout "v${lw_cv}" ; )
    git clone "${librewolf_settings_url}" ${git_source_dir}/settings || : ; ( cd "${git_source_dir}/settings" ; git checkout master ; git pull ; )
    git clone "${librewolf_linux_url}" ${git_source_dir}/linux || : ; ( cd "${git_source_dir}/linux" ; git checkout master ; git pull ; git checkout "v${librewolf_version}" ; )
 
@@ -176,7 +177,6 @@ if test "${DISTRO}" = "ubuntu" ; then
       "${git_source_dir}"/common/patches/urlbarprovider-interventions.patch \
       "${git_source_dir}"/common/patches/sed-patches/remove-internal-plugin-certs.patch \
       "${git_source_dir}"/common/patches/sed-patches/allow-searchengines-non-esr.patch \
-      "${git_source_dir}"/common/patches/search-config.patch \
       "${git_source_dir}"/common/patches/sed-patches/stop-undesired-requests.patch \
       "${git_source_dir}"/common/patches/about-dialog.patch \
       "${debian_dir}"/patches/librewolf/
@@ -190,7 +190,6 @@ librewolf/browser-confvars.patch -p1
 librewolf/urlbarprovider-interventions.patch -p1
 librewolf/remove-internal-plugin-certs.patch -p1
 librewolf/allow-searchengines-non-esr.patch -p1
-#librewolf/search-config.patch -p1
 librewolf/stop-undesired-requests.patch -p1
 librewolf/about-dialog.patch -p1
 EOF
@@ -204,7 +203,6 @@ else
       "${git_source_dir}"/common/patches/urlbarprovider-interventions.patch \
       "${git_source_dir}"/common/patches/sed-patches/remove-internal-plugin-certs.patch \
       "${git_source_dir}"/common/patches/sed-patches/allow-searchengines-non-esr.patch \
-      "${git_source_dir}"/common/patches/search-config.patch \
       "${git_source_dir}"/common/patches/sed-patches/stop-undesired-requests.patch \
       "${git_source_dir}"/common/patches/about-dialog.patch \
       "${git_source_dir}"/linux/deb_patches/*.patch \
@@ -226,7 +224,6 @@ librewolf/browser-confvars.patch -p1
 librewolf/urlbarprovider-interventions.patch -p1
 librewolf/remove-internal-plugin-certs.patch -p1
 librewolf/allow-searchengines-non-esr.patch -p1
-#librewolf/search-config.patch -p1
 librewolf/stop-undesired-requests.patch -p1
 librewolf/about-dialog.patch -p1
 librewolf/mozilla_dirs.patch -p1
@@ -239,22 +236,8 @@ librewolf/remove-organization-policy-banner.patch -p1
 librewolf/remove-snippets-from-home.patch -p1
 librewolf/sanitizing-description.patch -p1
 EOF
-   # Fixes to the LibreWolf patches for version 95.0
-   patch "${debian_dir}/patches/librewolf/remove_addons.patch" <<EOF
-diff --git a/patches/remove_addons.patch b/patches/remove_addons.patch
-index a6585ed..3487f6d 100644
---- a/patches/remove_addons.patch
-+++ b/patches/remove_addons.patch
-@@ -13,7 +13,7 @@ index 269dcb2..ed7c31d 100644
- -    "report-site-issue",
-      "pictureinpicture",
-      "proxy-failover",
-- ]
-+     "search-detection",
- diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
- index 496379c..dd6f359 100644
- --- a/browser/locales/Makefile.in
-EOF
+   # Fixes to the LibreWolf patches for version 95.0.1
+   # None yet
 fi
 
 # observe that build-with-libstdc++-7 is disabled for this dpkg. Debian builds Firefox with gcc, not clang.
@@ -310,6 +293,10 @@ rm -rf "${debian_dir}"/librewolf_settings
 cp -pr "${git_source_dir}"/settings "${debian_dir}"/librewolf_settings
 rm -rf "${debian_dir}"/librewolf_settings/.git*
 
+cp -p "${git_source_dir}"/common/source_files/search-config.json "${debian_dir}"/
+sed -i -r "${debian_dir}"/rules \
+   -e '/override_dh_auto_configure/a{	cp -pf debian/search-config.json services/settings/dumps/main/'
+
 if test "${DISTRO}" = "debian" ; then
 
    cat <<EOF >> "${debian_dir}"/browser.install.in