From e60dcc5893da56a39c22e72c19dd671b62bae5d6 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Mar 09 2025 22:44:28 +0000 Subject: [PATCH 1/3] 136.0: Update patch according to upstream changes --- diff --git a/release.sh b/release.sh index 9746778..ce93884 100755 --- a/release.sh +++ b/release.sh @@ -7,7 +7,7 @@ SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) set -eu pkgname=iceweasel -brandingver=131.0 +brandingver=136.0 brandingrel=1 srcdir=src diff --git a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch index 8a67fe7..27001d9 100644 --- a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch +++ b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch @@ -1,8 +1,8 @@ diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties -index d572ac39c6..ff1b9df2ec 100644 +index 3b21dcd3de..ecd7995d5c 100644 --- a/browser/locales/en-US/chrome/overrides/appstrings.properties +++ b/browser/locales/en-US/chrome/overrides/appstrings.properties -@@ -3,27 +3,27 @@ +@@ -3,29 +3,29 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. malformedURI2=Please check that the URL is correct and try again. @@ -10,8 +10,10 @@ index d572ac39c6..ff1b9df2ec 100644 +#expand fileNotFound=__MOZ_APP_DISPLAYNAME__ can’t find the file at %S. fileAccessDenied=The file at %S is not readable. # %S is replaced by the uri host + httpErrorPage=%S sent back an error. serverError=%S might have a temporary problem or it could have moved. dnsNotFound2=We can’t connect to the server at %S. + basicHttpAuthDisabled=Someone pretending to be the site could try to steal things like your username, password, or email. -unknownProtocolFound=Firefox doesn’t know how to open this address, because one of the following protocols (%S) isn’t associated with any program or is not allowed in this context. -connectionFailure=Firefox can’t establish a connection to the server at %S. +#expand unknownProtocolFound=__MOZ_APP_DISPLAYNAME__ doesn’t know how to open this address, because one of the following protocols (%S) isn’t associated with any program or is not allowed in this context. @@ -39,7 +41,7 @@ index d572ac39c6..ff1b9df2ec 100644 contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem. externalProtocolTitle=External Protocol Request -@@ -40,7 +40,7 @@ cspBlocked=This page has a content security policy that prevents it from being l +@@ -42,8 +42,8 @@ cspBlocked=This page has a content security policy that prevents it from being l xfoBlocked=This page has an X-Frame-Options policy that prevents it from being loaded in this context. corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired. ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S". @@ -47,5 +49,7 @@ index d572ac39c6..ff1b9df2ec 100644 +#expand sslv3Used=__MOZ_APP_DISPLAYNAME__ cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. inadequateSecurityError=The website tried to negotiate an inadequate level of security. blockedByPolicy=Your organization has blocked access to this page or website. +-blockedByCORP=Firefox didn’t load this page because it looks like the security configuration doesn’t match the previous page. -networkProtocolError=Firefox has experienced a network protocol violation that cannot be repaired. ++#expand blockedByCORP=__MOZ_APP_DISPLAYNAME__ didn’t load this page because it looks like the security configuration doesn’t match the previous page. +#expand networkProtocolError=__MOZ_APP_DISPLAYNAME__ has experienced a network protocol violation that cannot be repaired. From 61ebb74744e75af3f34411df556033dd0095ae0e Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: May 03 2025 03:19:02 +0000 Subject: [PATCH 2/3] 138.0.1: Update patch according to upstream changes MOZ_APP_PROFILE does not work anymore when set in configure.sh, so imply it the same way as MOZ_APP_VENDOR, otherwise it complains: ERROR: `./mach configure` failed mozbuild.configure.options.InvalidOptionError: MOZ_APP_PROFILE=local/share/parabola/iceweasel can not be set by confvars. Values are accepted from: implied --- diff --git a/release.sh b/release.sh index ce93884..78b9b6f 100755 --- a/release.sh +++ b/release.sh @@ -7,7 +7,7 @@ SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) set -eu pkgname=iceweasel -brandingver=136.0 +brandingver=138.0.1 brandingrel=1 srcdir=src diff --git a/src/branding/configure.sh b/src/branding/configure.sh index 4d25dfd..da0b06a 100755 --- a/src/branding/configure.sh +++ b/src/branding/configure.sh @@ -31,4 +31,3 @@ MOZ_APP_DISPLAYNAME=Iceweasel MOZ_APP_NAME=iceweasel MOZ_APP_BASENAME=Iceweasel -MOZ_APP_PROFILE=mozilla/iceweasel diff --git a/src/patches/iceweasel-branding/MOZ_APP_VENDOR.patch b/src/patches/iceweasel-branding/MOZ_APP_VENDOR.patch deleted file mode 100644 index 23a8adf..0000000 --- a/src/patches/iceweasel-branding/MOZ_APP_VENDOR.patch +++ /dev/null @@ -1,15 +0,0 @@ -# this strng is user-facing (eg: `iceweasel --version`) -diff --git a/browser/moz.configure b/browser/moz.configure -index e605019172..ee54670d9e 100644 ---- a/browser/moz.configure -+++ b/browser/moz.configure -@@ -13,7 +13,7 @@ imply_option("MOZ_NORMANDY", True) - imply_option("MOZ_PROFILE_MIGRATOR", True) - - --imply_option("MOZ_APP_VENDOR", "Mozilla") -+imply_option("MOZ_APP_VENDOR", "Parabola") - imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") - # Include the DevTools client, not just the server (which is the default) - imply_option("MOZ_DEVTOOLS", "all") - diff --git a/src/patches/iceweasel-branding/MOZ_APP_options.patch b/src/patches/iceweasel-branding/MOZ_APP_options.patch new file mode 100644 index 0000000..48844de --- /dev/null +++ b/src/patches/iceweasel-branding/MOZ_APP_options.patch @@ -0,0 +1,16 @@ +# this strng is user-facing (eg: `iceweasel --version`) +diff --git a/browser/moz.configure b/browser/moz.configure +index e605019172..ee54670d9e 100644 +--- a/browser/moz.configure ++++ b/browser/moz.configure +@@ -13,7 +13,8 @@ imply_option("MOZ_NORMANDY", True) + imply_option("MOZ_PROFILE_MIGRATOR", True) + + +-imply_option("MOZ_APP_VENDOR", "Mozilla") ++imply_option("MOZ_APP_VENDOR", "Parabola") ++imply_option("MOZ_APP_PROFILE", "local/share/parabola/iceweasel") + imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") + # Include the DevTools client, not just the server (which is the default) + imply_option("MOZ_DEVTOOLS", "all") + diff --git a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch index 27001d9..2e73ea6 100644 --- a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch +++ b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch @@ -41,7 +41,7 @@ index 3b21dcd3de..ecd7995d5c 100644 contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem. externalProtocolTitle=External Protocol Request -@@ -42,8 +42,8 @@ cspBlocked=This page has a content security policy that prevents it from being l +@@ -42,9 +42,9 @@ cspBlocked=This page has a content security policy that prevents it from being l xfoBlocked=This page has an X-Frame-Options policy that prevents it from being loaded in this context. corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired. ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S". @@ -50,6 +50,7 @@ index 3b21dcd3de..ecd7995d5c 100644 inadequateSecurityError=The website tried to negotiate an inadequate level of security. blockedByPolicy=Your organization has blocked access to this page or website. -blockedByCORP=Firefox didn’t load this page because it looks like the security configuration doesn’t match the previous page. --networkProtocolError=Firefox has experienced a network protocol violation that cannot be repaired. +#expand blockedByCORP=__MOZ_APP_DISPLAYNAME__ didn’t load this page because it looks like the security configuration doesn’t match the previous page. + invalidHeaderValue=%S sent back a header with empty characters not allowed by web security standards. +-networkProtocolError=Firefox has experienced a network protocol violation that cannot be repaired. +#expand networkProtocolError=__MOZ_APP_DISPLAYNAME__ has experienced a network protocol violation that cannot be repaired. diff --git a/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch index 06badf1..03e321f 100644 --- a/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch +++ b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch @@ -1,9 +1,9 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in -index cffcff1..85d28cc 100644 +index 8e02ea6ca2..df7f5760f3 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -249,13 +249,6 @@ - @RESPATH@/chrome/pdfjs/* +@@ -224,13 +224,6 @@ + @RESPATH@/browser/chrome/browser.manifest @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest -#ifdef MOZ_GTK @@ -13,12 +13,12 @@ index cffcff1..85d28cc 100644 -@RESPATH@/browser/chrome/icons/default/default64.png -@RESPATH@/browser/chrome/icons/default/default128.png -#endif - @RESPATH@/browser/features/* - ; [Webide Files] -@@ -271,15 +264,10 @@ - @RESPATH@/browser/chrome/devtools.manifest - @RESPATH@/browser/@PREF_DIR@/debugger.js + ; [DevTools Startup Files] + @RESPATH@/browser/chrome/devtools-startup@JAREXT@ +@@ -246,15 +239,10 @@ + @RESPATH@/chrome/pdfjs/* + @RESPATH@/defaults/pref/PdfJsDefaultPrefs.js -; shell icons -#ifdef XP_UNIX diff --git a/src/patches/series b/src/patches/series index 8c326f9..095e7ba 100644 --- a/src/patches/series +++ b/src/patches/series @@ -1,5 +1,5 @@ iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch -iceweasel-branding/MOZ_APP_VENDOR.patch +iceweasel-branding/MOZ_APP_options.patch iceweasel-branding/Determine-which-phishing-shavar-to-use.patch iceweasel-branding/Allowed-dupes_for_Iceweasel.patch iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch From 45cd8923505980bc23fd611b85f6514c05f3f7c8 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Mar 25 2026 19:17:24 +0000 Subject: [PATCH 3/3] 149.0.1: Update patch according to upstream changes --- diff --git a/release.sh b/release.sh index 78b9b6f..22d801d 100755 --- a/release.sh +++ b/release.sh @@ -7,7 +7,7 @@ SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) set -eu pkgname=iceweasel -brandingver=138.0.1 +brandingver=149.0 brandingrel=1 srcdir=src diff --git a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch index 2e73ea6..64d7def 100644 --- a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch +++ b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch @@ -25,8 +25,8 @@ index 3b21dcd3de..ecd7995d5c 100644 ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don’t translate "%S" confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier. resendButton.label=Resend --unknownSocketType=Firefox doesn’t know how to communicate with the server. -+#expand unknownSocketType=__MOZ_APP_DISPLAYNAME__ doesn’t know how to communicate with the server. +-clientSocketMisconfiguration=Firefox doesn’t know how to communicate with the server. ++#expand clientSocketMisconfiguration=__MOZ_APP_DISPLAYNAME__ doesn’t know how to communicate with the server. netReset=The connection to the server was reset while the page was loading. notCached=This document is no longer available. -netOffline=Firefox is currently in offline mode and can’t browse the Web.