diff options
| -rw-r--r-- | scripts/prep-librewolf-dpkg.conf | 6 | ||||
| -rwxr-xr-x | scripts/prep-librewolf-dpkg.sh | 64 |
2 files changed, 63 insertions, 7 deletions
diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf index c3f8c56..2ecb001 100644 --- a/scripts/prep-librewolf-dpkg.conf +++ b/scripts/prep-librewolf-dpkg.conf @@ -4,11 +4,9 @@ # Available options for DISTRO: debian DISTRO=${DISTRO:-'debian'} # current version of Firefox package in target distro -distro_firefox_version=${distro_firefox_version:-'111.0-3'} +distro_firefox_version=${distro_firefox_version:-'112.0.1-1'} # current version of Firefox, as defined by name of the orig tarball. -firefox_version=${firefox_version:-'111.0'} -# Tag for LibreWolf linux repo -librewolf_version=${librewolf_version:-'111.0-3'} +firefox_version=${firefox_version:-'112.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 32368e0..2dcd1e0 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -1,7 +1,7 @@ #!/bin/sh # File: prep-librewolf-dpkg.sh # Location: https://gitlab.com/bgstack15/librewolf-linux.git -# Latest supported version: librewolf-111.0-3 +# Latest supported version: librewolf-112.0.1-2 # Author: bgstack15 # SPDX-License-Identifier: CC-BY-SA-4.0 # Startdate: 2020-11-29 @@ -10,6 +10,7 @@ # History: # 2021-03-10 add initial Ubuntu support # 2022-01-18 modified to use "source" repo instead of "common" for version 97.0.1 +# 2023-05-07 dropped repo "linux" which is disused # Usage: # Can send these final assets up to Open Build Service # References: @@ -31,7 +32,6 @@ test ! -r "${librewolf_dpkg_conf}" && { echo "Unable to load config file, which librewolf_source_url=https://gitlab.com/librewolf-community/browser/source.git librewolf_settings_url=https://gitlab.com/librewolf-community/settings.git -librewolf_linux_url=https://gitlab.com/librewolf-community/browser/linux.git if test "${DISTRO}" = "ubuntu" ; then _mozconfig='/config/mozconfig.in' @@ -82,7 +82,6 @@ test -z "${SKIP_EXTRACT}" && { test -z "${SKIP_GIT}" && { git clone "${librewolf_source_url}" ${git_source_dir}/source || : ; ( cd "${git_source_dir}/source" ; git checkout master || git checkout main ; git pull ; git checkout "${librewolf_version}" ; ) git clone "${librewolf_settings_url}" ${git_source_dir}/settings || : ; ( cd "${git_source_dir}/settings" ; git checkout master || git checkout main ; git pull ; ) - git clone "${librewolf_linux_url}" ${git_source_dir}/linux || : ; ( cd "${git_source_dir}/linux" ; git checkout master || git checkout main ; git pull ; git checkout "v${librewolf_version}" ; ) } ##################################### @@ -199,6 +198,65 @@ else awk -F'/' '{print "librewolf/"$NF}' "${git_source_dir}"/source/assets/patches.txt | \ sed -r -e 's@$@ -p1@' -e '/vpn-ad/d' >> "${debian_dir}/patches/series" #echo "librewolf/webrender_ffi.patch -p1" >> "${debian_dir}/patches/series" + # added 112.0.1 until defuzz-112.0 gets merged + test -n "1" && 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 b32a6bf..07fd0ed 100644 +--- a/patches/ui-patches/firefox-view.patch ++++ b/patches/ui-patches/firefox-view.patch +@@ -33,8 +33,8 @@ + - + <tabs id="tabbrowser-tabs" + is="tabbrowser-tabs" +- flex="1" +-@@ -707,6 +697,16 @@ ++ aria-multiselectable="true" ++@@ -701,6 +691,16 @@ + closemenu="none" + cui-areatype="toolbar" + data-l10n-id="navbar-library"/> +@@ -82,7 +82,7 @@ + if (currentVersion < 19) { + --- a/browser/components/firefoxview/firefoxview.html + +++ b/browser/components/firefoxview/firefoxview.html +-@@ -34,7 +34,7 @@ ++@@ -31,7 +31,7 @@ + </div> + </div> + <main> +@@ -93,7 +93,7 @@ + <h1 id="collapsible-synced-tabs-header" data-l10n-id="firefoxview-tabpickup-header"></h1> + --- a/browser/components/firefoxview/firefoxview.mjs + +++ b/browser/components/firefoxview/firefoxview.mjs +-@@ -41,7 +41,26 @@ const launchFeatureTour = () => { ++@@ -15,7 +15,26 @@ const launchFeatureTour = () => { + callout.showFeatureCallout(); + }; + +@@ -122,11 +122,10 @@ + document.getElementById("recently-closed-tabs-container").onLoad(); + --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm + +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm +-@@ -92,57 +92,6 @@ const BASE_MESSAGES = () => [ +- }, ++@@ -81,57 +81,6 @@ const BASE_MESSAGES = () => [ + trigger: { id: "protectionsPanelOpen" }, + }, +-- { ++ { + - id: "CFR_FIREFOX_VIEW", + - groups: ["cfr"], + - template: "cfr_doorhanger", +@@ -177,6 +176,7 @@ + - // Avoid breaking existing tests that close tabs for now. + - targeting: `!inMr2022Holdback && fxViewButtonAreaType != null && (currentDate|date - profileAgeCreated) / 86400000 >= 2 && tabsClosedCount >= 3 && 'browser.firefox-view.view-count'|preferenceValue == 0 && !'browser.newtabpage.activity-stream.asrouter.providers.cfr'|preferenceIsUserSet`, + - }, +- { ++- { + id: "FX_MR_106_UPGRADE", + template: "spotlight", ++ targeting: "true", +EOF # added 111.0 to patch for debian 111.0 until defuzz-111.0 gets merged test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/disable-pocket.patch" <<'EOF' diff --git a/patches/librewolf/disable-pocket.patch b/patches/librewolf/disable-pocket.patch |