From 9d29b356503c983487d7cf8ca5d1f7e459dd0943 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Oct 01 2024 21:33:28 +0000 Subject: [PATCH 1/3] 129.0 --- diff --git a/release.sh b/release.sh index 6cebfb0..122aad9 100755 --- a/release.sh +++ b/release.sh @@ -7,7 +7,7 @@ SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) set -eu pkgname=iceweasel -brandingver=126.0 +brandingver=129.0 brandingrel=1 srcdir=src diff --git a/src/patches/iceweasel-branding/MOZ_APP_VENDOR.patch b/src/patches/iceweasel-branding/MOZ_APP_VENDOR.patch index 85bf10b..23a8adf 100644 --- a/src/patches/iceweasel-branding/MOZ_APP_VENDOR.patch +++ b/src/patches/iceweasel-branding/MOZ_APP_VENDOR.patch @@ -1,12 +1,15 @@ # this strng is user-facing (eg: `iceweasel --version`) ---- a/browser/confvars.sh 2022-03-13 03:28:08.216443949 -0400 -+++ b/browser/confvars.sh 2022-03-13 03:26:49.573111656 -0400 -@@ -3,7 +3,7 @@ - # 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/. +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) --MOZ_APP_VENDOR=Mozilla -+MOZ_APP_VENDOR=Parabola - if test "$OS_ARCH" = "WINNT"; then - if ! test "$HAVE_64BIT_BUILD"; then +-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/Remove-Firefox-logo-from-PDF-icon.patch b/src/patches/iceweasel-branding/Remove-Firefox-logo-from-PDF-icon.patch new file mode 100644 index 0000000..ee0b2ef --- /dev/null +++ b/src/patches/iceweasel-branding/Remove-Firefox-logo-from-PDF-icon.patch @@ -0,0 +1,29 @@ +From 0cec1d91e2bdab8b4f73a08fd144211a002c9a5f Mon Sep 17 00:00:00 2001 +From: grizzlyuser +Date: Mon, 5 Aug 2024 19:49:44 +0200 +Subject: [PATCH] Remove Firefox logo from PDF icon + +--- + browser/branding/unofficial/content/document_pdf.svg | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/browser/branding/unofficial/content/document_pdf.svg b/browser/branding/unofficial/content/document_pdf.svg +index d64c4ad..f5aa71c 100644 +--- a/browser/branding/unofficial/content/document_pdf.svg ++++ b/browser/branding/unofficial/content/document_pdf.svg +@@ -3,10 +3,9 @@ + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + + +- + + + + + +- +\ No newline at end of file ++ +-- +2.46.0 + diff --git a/src/patches/series b/src/patches/series index 8c326f9..49bd80d 100644 --- a/src/patches/series +++ b/src/patches/series @@ -4,3 +4,4 @@ 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 iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch +iceweasel-branding/Remove-Firefox-logo-from-PDF-icon.patch From 678b01052212a3bc5c89ea742cb37736901a1ea5 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Oct 01 2024 21:33:28 +0000 Subject: [PATCH 2/3] 130.0 PDF icon was fixed upstream, so remove the patch for it --- diff --git a/release.sh b/release.sh index 122aad9..8f2f92b 100755 --- a/release.sh +++ b/release.sh @@ -7,7 +7,7 @@ SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) set -eu pkgname=iceweasel -brandingver=129.0 +brandingver=130.0 brandingrel=1 srcdir=src diff --git a/src/patches/iceweasel-branding/Remove-Firefox-logo-from-PDF-icon.patch b/src/patches/iceweasel-branding/Remove-Firefox-logo-from-PDF-icon.patch deleted file mode 100644 index ee0b2ef..0000000 --- a/src/patches/iceweasel-branding/Remove-Firefox-logo-from-PDF-icon.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0cec1d91e2bdab8b4f73a08fd144211a002c9a5f Mon Sep 17 00:00:00 2001 -From: grizzlyuser -Date: Mon, 5 Aug 2024 19:49:44 +0200 -Subject: [PATCH] Remove Firefox logo from PDF icon - ---- - browser/branding/unofficial/content/document_pdf.svg | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/browser/branding/unofficial/content/document_pdf.svg b/browser/branding/unofficial/content/document_pdf.svg -index d64c4ad..f5aa71c 100644 ---- a/browser/branding/unofficial/content/document_pdf.svg -+++ b/browser/branding/unofficial/content/document_pdf.svg -@@ -3,10 +3,9 @@ - - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - -- - - - - - -- -\ No newline at end of file -+ --- -2.46.0 - diff --git a/src/patches/series b/src/patches/series index 49bd80d..8c326f9 100644 --- a/src/patches/series +++ b/src/patches/series @@ -4,4 +4,3 @@ 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 iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch -iceweasel-branding/Remove-Firefox-logo-from-PDF-icon.patch From 3837818b459ca274f6b178d600cacad541f7f130 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Oct 01 2024 21:33:28 +0000 Subject: [PATCH 3/3] 131.0 --- diff --git a/release.sh b/release.sh index 8f2f92b..9746778 100755 --- a/release.sh +++ b/release.sh @@ -7,7 +7,7 @@ SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) set -eu pkgname=iceweasel -brandingver=130.0 +brandingver=131.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 e4427a0..8a67fe7 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,14 +1,16 @@ diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties -index c2443faac1..468223bd6b 100644 +index d572ac39c6..ff1b9df2ec 100644 --- a/browser/locales/en-US/chrome/overrides/appstrings.properties +++ b/browser/locales/en-US/chrome/overrides/appstrings.properties -@@ -3,25 +3,25 @@ +@@ -3,27 +3,27 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. malformedURI2=Please check that the URL is correct and try again. -fileNotFound=Firefox can’t find the file at %S. +#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 + serverError=%S might have a temporary problem or it could have moved. dnsNotFound2=We can’t connect to the server at %S. -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. @@ -37,7 +39,7 @@ index c2443faac1..468223bd6b 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 -@@ -38,7 +38,7 @@ cspBlocked=This page has a content security policy that prevents it from being l +@@ -40,7 +40,7 @@ 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".