diff options
| -rw-r--r-- | scripts/prep-librewolf-dpkg.conf | 6 | ||||
| -rwxr-xr-x | scripts/prep-librewolf-dpkg.sh | 176 |
2 files changed, 105 insertions, 77 deletions
diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf index 6dc3e18..915e3fc 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:-'116.0-2'} +distro_firefox_version=${distro_firefox_version:-'117.0-1'} # current version of Firefox, as defined by name of the orig tarball. -firefox_version=${firefox_version:-'116.0'} +firefox_version=${firefox_version:-'117.0'} # input git tag of source repo -source_version=${source_version:-'116.0-1'} +source_version=${source_version:-'117.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 8b250f8..4b3ef99 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -11,6 +11,7 @@ # 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 +# 2023-08-30 point to codeberg source repo # Usage: # Can send these final assets up to Open Build Service # References: @@ -31,8 +32,8 @@ test -z "${librewolf_dpkg_conf}" && export librewolf_dpkg_conf="$( find "$( dirn test ! -r "${librewolf_dpkg_conf}" && { echo "Unable to load config file, which should be named the same as this script but with a .conf ending. Aborted." 1>&2 ; exit 1 ; } . "${librewolf_dpkg_conf}" -librewolf_source_url=https://gitlab.com/librewolf-community/browser/source.git -librewolf_settings_url=https://gitlab.com/librewolf-community/settings.git +librewolf_source_url=https://codeberg.org/librewolf/source.git +librewolf_settings_url=https://codeberg.org/librewolf/settings.git if test "${DISTRO}" = "ubuntu" ; then _mozconfig='/config/mozconfig.in' @@ -309,59 +310,47 @@ else template: "spotlight", + targeting: "true", EOF - # added 115.0.2; just defuzzing this patch + # added 115.0.2, updated 117.0; just defuzzing this patch test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/stop-undesired-requests.patch" <<EOF --- a/patches/librewolf/stop-undesired-requests.patch 2023-07-13 15:01:06.444375138 -0400 +++ b/patches/librewolf/stop-undesired-requests.patch 2023-07-13 15:35:17.271195985 -0400 -@@ -1,8 +1,8 @@ +@@ -1,8 +1,6 @@ -diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js -index cb7c26e..b1a56e9 100644 ----- a/browser/components/newtab/data/content/activity-stream.bundle.js --+++ b/browser/components/newtab/data/content/activity-stream.bundle.js + --- a/browser/components/newtab/data/content/activity-stream.bundle.js + +++ b/browser/components/newtab/data/content/activity-stream.bundle.js -@@ -1576,7 +1576,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { -+Index: librewolf_115.0.2/browser/components/newtab/data/content/activity-stream.bundle.js -+=================================================================== -+--- librewolf_115.0.2.orig/browser/components/newtab/data/content/activity-stream.bundle.js -++++ librewolf_115.0.2/browser/components/newtab/data/content/activity-stream.bundle.js -+@@ -1783,7 +1783,7 @@ class ASRouterAdminInner extends (extern ++@@ -1787,7 +1787,7 @@ class ASRouterAdminInner extends (extern label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", { className: "providerUrl", target: "_blank", -@@ -11,11 +11,11 @@ +@@ -11,11 +9,9 @@ rel: "noopener noreferrer" }, "nimbus-desktop-experiments"), ")"); } -diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm -index 23d6bf1..4affc89 100644 ----- a/services/settings/Utils.sys.mjs --+++ b/services/settings/Utils.sys.mjs --@@ -62,6 +62,9 @@ XPCOMUtils.defineLazyGetter(lazy, "isRunningTests", () => { -+Index: librewolf_115.0.2/services/settings/Utils.sys.mjs -+=================================================================== -+--- librewolf_115.0.2.orig/services/settings/Utils.sys.mjs -++++ librewolf_115.0.2/services/settings/Utils.sys.mjs -+@@ -51,6 +51,9 @@ XPCOMUtils.defineLazyGetter(lazy, "isRun + --- a/services/settings/Utils.sys.mjs + +++ b/services/settings/Utils.sys.mjs +-@@ -51,6 +51,9 @@ ChromeUtils.defineLazyGetter(lazy, "isRunningTests", () => { ++@@ -51,6 +51,9 @@ ChromeUtils.defineLazyGetter(lazy, "isRu // Overriding the server URL is normally disabled on Beta and Release channels, // except under some conditions. - XPCOMUtils.defineLazyGetter(lazy, "allowServerURLOverride", () => { -@@ -25,11 +25,11 @@ + ChromeUtils.defineLazyGetter(lazy, "allowServerURLOverride", () => { +@@ -25,11 +21,9 @@ if (!AppConstants.RELEASE_OR_BETA) { // Always allow to override the server URL on Nightly/DevEdition. return true; -diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs -index a3100fa..c7bf03b 100644 ----- a/toolkit/components/search/SearchUtils.sys.mjs --+++ b/toolkit/components/search/SearchUtils.sys.mjs + --- a/toolkit/components/search/SearchUtils.sys.mjs + +++ b/toolkit/components/search/SearchUtils.sys.mjs -@@ -157,9 +157,9 @@ var SearchUtils = { -+Index: librewolf_115.0.2/toolkit/components/search/SearchUtils.sys.mjs -+=================================================================== -+--- librewolf_115.0.2.orig/toolkit/components/search/SearchUtils.sys.mjs -++++ librewolf_115.0.2/toolkit/components/search/SearchUtils.sys.mjs +@@ -152,9 +152,9 @@ export var SearchUtils = { ENGINES_URLS: { "prod-main": -@@ -39,5 +39,5 @@ +@@ -39,5 +33,5 @@ - "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records", + "https://%.invalid", "stage-main": @@ -397,64 +386,103 @@ diff -aur a/patches/librewolf/hide-passwordmgr.patch b/patches/librewolf/hide-pa + document.getElementById("passwordsGroup")?.remove(); EOF - # added 112.0.1 until defuzz-112.0 gets merged - test -n "" && patch -p1 "${debian_dir}/patches/librewolf/firefox-view.patch" <<'EOF' + # added 112.0.1, updated 117.0. Just for de-fuzzing librewolf patches + 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 @@ - - +@@ -15,10 +15,8 @@ + # The tab pickup feature is hidden if Firefox Sync is disabled. It can also + # be forced to always be disabled by setting `librewolf.firefoxView.hideTabPickup` + # to `true`. +-Index: librewolf_115.0.2/browser/base/content/navigator-toolbox.inc.xhtml +-=================================================================== +---- librewolf_115.0.2.orig/browser/base/content/navigator-toolbox.inc.xhtml +-+++ librewolf_115.0.2/browser/base/content/navigator-toolbox.inc.xhtml ++--- a/browser/base/content/navigator-toolbox.inc.xhtml +++++ b/browser/base/content/navigator-toolbox.inc.xhtml + @@ -41,16 +41,6 @@ + <hbox flex="1" align="end" class="toolbar-items"> + <toolbartabstop/> +@@ -36,7 +34,7 @@ <tabs id="tabbrowser-tabs" is="tabbrowser-tabs" -- flex="1" --@@ -707,6 +697,16 @@ -+ aria-multiselectable="true" -+@@ -701,6 +691,16 @@ + aria-multiselectable="true" +-@@ -723,6 +713,16 @@ ++@@ -714,6 +704,16 @@ closemenu="none" cui-areatype="toolbar" data-l10n-id="navbar-library"/> -@@ -82,7 +82,7 @@ +@@ -53,11 +51,9 @@ + </html:template> + </toolbox> + </box> +-Index: librewolf_115.0.2/browser/components/customizableui/CustomizableUI.sys.mjs +-=================================================================== +---- librewolf_115.0.2.orig/browser/components/customizableui/CustomizableUI.sys.mjs +-+++ librewolf_115.0.2/browser/components/customizableui/CustomizableUI.sys.mjs +-@@ -282,7 +282,6 @@ var CustomizableUIInternal = { ++--- a/browser/components/customizableui/CustomizableUI.sys.mjs +++++ b/browser/components/customizableui/CustomizableUI.sys.mjs ++@@ -279,7 +279,6 @@ var CustomizableUIInternal = { + { + type: CustomizableUI.TYPE_TOOLBAR, + defaultPlacements: [ +@@ -65,7 +61,7 @@ + "tabbrowser-tabs", + "new-tab-button", + "alltabs-button", +-@@ -611,18 +610,6 @@ var CustomizableUIInternal = { ++@@ -608,18 +607,6 @@ var CustomizableUIInternal = { + } + } + +@@ -84,10 +80,8 @@ + // Unified Extensions addon button migration, which puts any browser action + // buttons in the overflow menu into the addons panel instead. 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(); - }; +-Index: librewolf_115.0.2/browser/components/firefoxview/firefoxview.html +-=================================================================== +---- librewolf_115.0.2.orig/browser/components/firefoxview/firefoxview.html +-+++ librewolf_115.0.2/browser/components/firefoxview/firefoxview.html ++--- a/browser/components/firefoxview/firefoxview.html +++++ b/browser/components/firefoxview/firefoxview.html + @@ -62,6 +62,7 @@ + is="tab-pickup-container" + id="tab-pickup-container" +@@ -96,13 +90,11 @@ + > + <summary class="page-section-header"> + <span +-Index: librewolf_115.0.2/browser/components/firefoxview/firefoxview.mjs +-=================================================================== +---- librewolf_115.0.2.orig/browser/components/firefoxview/firefoxview.mjs +-+++ librewolf_115.0.2/browser/components/firefoxview/firefoxview.mjs +-@@ -16,7 +16,26 @@ const launchFeatureTour = () => { +- callout.showFeatureCallout(); +- }; ++--- a/browser/components/firefoxview/firefoxview.mjs +++++ b/browser/components/firefoxview/firefoxview.mjs ++@@ -2,7 +2,26 @@ ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -@@ -122,11 +122,10 @@ + +function onPrefChange() { + + document.getElementById("tab-pickup-container").hidden = +@@ -127,10 +119,8 @@ + Services.telemetry.setEventRecordingEnabled("firefoxview", true); + Services.telemetry.recordEvent("firefoxview", "entered", "firefoxview", null); 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 = () => [ +-Index: librewolf_115.0.2/browser/components/newtab/lib/OnboardingMessageProvider.jsm +-=================================================================== +---- librewolf_115.0.2.orig/browser/components/newtab/lib/OnboardingMessageProvider.jsm +-+++ librewolf_115.0.2/browser/components/newtab/lib/OnboardingMessageProvider.jsm ++--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm +++++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm + @@ -78,57 +78,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' @@ -849,7 +877,7 @@ sed -r \ firefox_"${distro_firefox_version}".dsc > librewolf_"${distro_firefox_version}".dsc { echo "Files:" - for word in librewolf*z ; + for word in librewolf*${firefox_version}*z ; do printf "%s %s\n" "$( stat -c '%s' "${word}" )" "$( md5sum "${word}" )" done | awk '{print " "$2,$1,$3}' |