From e4c5f76f55deef5481712b9fa4c2ddb05d4a49f9 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
Date: Jun 02 2024 18:41:19 +0000
Subject: [PATCH 1/3] 126.0.1.parabola1: sync with upstream


---

diff --git a/release.sh b/release.sh
index ff2d33f..6cebfb0 100755
--- a/release.sh
+++ b/release.sh
@@ -7,7 +7,7 @@ SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
 set -eu
 
 pkgname=iceweasel
-brandingver=123.0
+brandingver=126.0
 brandingrel=1
 
 srcdir=src
diff --git a/src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch b/src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch
index ef66411..b798100 100644
--- a/src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch
+++ b/src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch
@@ -1,12 +1,12 @@
 diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
-index fc6c382171..059bc7b65d 100644
+index 55de242415..9cd8a59256 100644
 --- a/browser/base/content/aboutDialog.xhtml
 +++ b/browser/base/content/aboutDialog.xhtml
-@@ -151,8 +151,8 @@
+@@ -138,8 +138,8 @@
              <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/>
            </description>
            <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
--            <label is="text-link" href="https://donate.mozilla.org/?utm_source=firefox&#38;utm_medium=referral&#38;utm_campaign=firefox_about&#38;utm_content=firefox_about" data-l10n-name="helpus-donateLink"/>
+-            <label is="text-link" href="https://foundation.mozilla.org/?form=firefox-about" data-l10n-name="helpus-donateLink"/>
 -            <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>
 +            <label is="text-link" href="https://wiki.parabola.nu/Donations" data-l10n-name="helpus-donateLink"/>
 +            <label is="text-link" href="https://wiki.parabola.nu/How_to_help" data-l10n-name="helpus-getInvolvedLink"/>

From 33aab7d0118f8c3701fc8e4124bddb71fdc9d6c4 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
Date: Aug 05 2024 23:02:51 +0000
Subject: [PATCH 2/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 <grizzlyuser@protonmail.com>
+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/. -->
+ <svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+   <path d="M37.5 9.53728C37.5 9.26197 37.7226 9.03846 37.9979 9.03729L163.745 8.50263L218.5 62.7471V247.317C218.5 247.593 218.276 247.817 218 247.817H38C37.7239 247.817 37.5 247.593 37.5 247.317V9.53728Z" fill="#FAFAFA" stroke="#80808E" stroke-width="3"/>
+-  <path d="M181.782 95.9097C179.39 90.1143 175.337 85.1559 170.134 81.6587C172.983 86.9975 174.967 92.7544 176.012 98.715V98.8382C169.489 82.9997 158.319 76.6136 149.194 62.7105L147.824 60.5359C147.57 60.1082 147.367 59.7241 147.186 59.3689C146.809 58.6676 146.519 57.9227 146.324 57.1508C146.322 57.1213 146.313 57.0929 146.296 57.0686C146.279 57.0443 146.256 57.025 146.229 57.013C146.185 56.9957 146.136 56.9957 146.092 57.013L146.048 57.013C140.491 60.2719 135.784 64.8005 132.313 70.2282C128.843 75.6559 126.706 81.8284 126.079 88.2406C126.761 88.1971 127.435 88.1391 128.123 88.1391C133.247 88.1185 138.288 89.4332 142.749 91.9537C147.21 94.4743 150.938 98.1136 153.564 102.513C149.446 99.7709 144.477 98.6051 139.568 99.2296C144.403 101.743 148.198 105.878 150.288 110.91C152.379 115.942 152.632 121.55 151.002 126.749C149.372 131.949 145.964 136.408 141.375 139.346C136.786 142.284 131.309 143.513 125.905 142.816C123.331 142.703 120.786 142.215 118.353 141.366C117.787 141.164 117.215 140.939 116.649 140.692C116.316 140.547 115.99 140.402 115.671 140.243C112.03 138.582 108.868 136.029 106.476 132.821C104.084 129.612 102.54 125.853 101.986 121.889C101.986 121.889 104.661 112.219 121.172 112.219C124.151 111.022 126.621 108.826 128.16 106.007C123.241 103.724 118.534 101.012 114.091 97.9031C111.989 95.8952 110.989 94.9239 110.097 94.199C109.619 93.8076 109.169 93.4741 108.597 93.0972C107.276 88.6235 107.22 83.8712 108.437 79.3681C103.109 81.8565 98.3499 85.4145 94.4554 89.8208C92.6618 85.3588 91.9754 80.5288 92.4549 75.7437C91.7792 76.0142 91.1311 76.3491 90.5197 76.7441C88.493 78.142 86.5939 79.7163 84.8443 81.4485C82.8658 83.3918 81.0523 85.4964 79.4227 87.7404C75.6911 92.827 73.0283 98.6167 71.5946 104.76C71.5946 104.826 71.0437 107.116 70.6451 109.943L70.4639 111.263C70.3262 112.111 70.2247 113.038 70.116 114.481V114.648C70.0797 115.199 70.0362 115.807 70 116.518V116.808C70.2536 131.955 76.5107 146.382 87.3961 156.917C98.2815 167.453 112.904 173.235 128.051 172.993C141.555 173.166 154.69 168.585 165.158 160.051C175.626 151.517 182.76 139.574 185.312 126.311L185.573 124.136C186.763 114.558 185.457 104.834 181.782 95.9097Z" fill="#CFCFD8"/>
+   <rect x="28" y="136" width="200" height="100" fill="#FF0000"/>
+   <rect x="29.5" y="137.5" width="197" height="97" stroke="black" stroke-opacity="0.25" stroke-width="3"/>
+   <path d="M65.4878 194.342V213.441H53V158H72.5629C86.5327 158 93.5176 163.889 93.5176 175.668C93.5176 181.236 91.5072 185.746 87.4864 189.2C83.4913 192.628 78.1431 194.342 71.4417 194.342H65.4878ZM65.4878 167.588V184.87H70.3978C77.0477 184.87 80.3726 181.957 80.3726 176.132C80.3726 170.436 77.0477 167.588 70.3978 167.588H65.4878Z" fill="white"/>
+   <path d="M107.767 213.441V158H127.407C147.099 158 156.945 167.008 156.945 185.025C156.945 193.659 154.251 200.554 148.864 205.709C143.503 210.864 136.351 213.441 127.407 213.441H107.767ZM120.255 168.168V203.312H126.441C131.853 203.312 136.093 201.688 139.16 198.44C142.253 195.193 143.8 190.772 143.8 185.179C143.8 179.896 142.266 175.746 139.199 172.73C136.158 169.689 131.879 168.168 126.363 168.168H120.255Z" fill="white"/>
+   <path d="M203.051 168.624H183.488V182.233H201.466V192.362H183.488V213.897H171V158.456H203.051V168.624Z" fill="white"/>
+-</svg>
+\ No newline at end of file
++</svg>
+-- 
+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 fc6214eed8bc9d3161bae7ea5b5c75c8144cff7f Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
Date: Sep 20 2024 17:10:33 +0000
Subject: [PATCH 3/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 <grizzlyuser@protonmail.com>
-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/. -->
- <svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-   <path d="M37.5 9.53728C37.5 9.26197 37.7226 9.03846 37.9979 9.03729L163.745 8.50263L218.5 62.7471V247.317C218.5 247.593 218.276 247.817 218 247.817H38C37.7239 247.817 37.5 247.593 37.5 247.317V9.53728Z" fill="#FAFAFA" stroke="#80808E" stroke-width="3"/>
--  <path d="M181.782 95.9097C179.39 90.1143 175.337 85.1559 170.134 81.6587C172.983 86.9975 174.967 92.7544 176.012 98.715V98.8382C169.489 82.9997 158.319 76.6136 149.194 62.7105L147.824 60.5359C147.57 60.1082 147.367 59.7241 147.186 59.3689C146.809 58.6676 146.519 57.9227 146.324 57.1508C146.322 57.1213 146.313 57.0929 146.296 57.0686C146.279 57.0443 146.256 57.025 146.229 57.013C146.185 56.9957 146.136 56.9957 146.092 57.013L146.048 57.013C140.491 60.2719 135.784 64.8005 132.313 70.2282C128.843 75.6559 126.706 81.8284 126.079 88.2406C126.761 88.1971 127.435 88.1391 128.123 88.1391C133.247 88.1185 138.288 89.4332 142.749 91.9537C147.21 94.4743 150.938 98.1136 153.564 102.513C149.446 99.7709 144.477 98.6051 139.568 99.2296C144.403 101.743 148.198 105.878 150.288 110.91C152.379 115.942 152.632 121.55 151.002 126.749C149.372 131.949 145.964 136.408 141.375 139.346C136.786 142.284 131.309 143.513 125.905 142.816C123.331 142.703 120.786 142.215 118.353 141.366C117.787 141.164 117.215 140.939 116.649 140.692C116.316 140.547 115.99 140.402 115.671 140.243C112.03 138.582 108.868 136.029 106.476 132.821C104.084 129.612 102.54 125.853 101.986 121.889C101.986 121.889 104.661 112.219 121.172 112.219C124.151 111.022 126.621 108.826 128.16 106.007C123.241 103.724 118.534 101.012 114.091 97.9031C111.989 95.8952 110.989 94.9239 110.097 94.199C109.619 93.8076 109.169 93.4741 108.597 93.0972C107.276 88.6235 107.22 83.8712 108.437 79.3681C103.109 81.8565 98.3499 85.4145 94.4554 89.8208C92.6618 85.3588 91.9754 80.5288 92.4549 75.7437C91.7792 76.0142 91.1311 76.3491 90.5197 76.7441C88.493 78.142 86.5939 79.7163 84.8443 81.4485C82.8658 83.3918 81.0523 85.4964 79.4227 87.7404C75.6911 92.827 73.0283 98.6167 71.5946 104.76C71.5946 104.826 71.0437 107.116 70.6451 109.943L70.4639 111.263C70.3262 112.111 70.2247 113.038 70.116 114.481V114.648C70.0797 115.199 70.0362 115.807 70 116.518V116.808C70.2536 131.955 76.5107 146.382 87.3961 156.917C98.2815 167.453 112.904 173.235 128.051 172.993C141.555 173.166 154.69 168.585 165.158 160.051C175.626 151.517 182.76 139.574 185.312 126.311L185.573 124.136C186.763 114.558 185.457 104.834 181.782 95.9097Z" fill="#CFCFD8"/>
-   <rect x="28" y="136" width="200" height="100" fill="#FF0000"/>
-   <rect x="29.5" y="137.5" width="197" height="97" stroke="black" stroke-opacity="0.25" stroke-width="3"/>
-   <path d="M65.4878 194.342V213.441H53V158H72.5629C86.5327 158 93.5176 163.889 93.5176 175.668C93.5176 181.236 91.5072 185.746 87.4864 189.2C83.4913 192.628 78.1431 194.342 71.4417 194.342H65.4878ZM65.4878 167.588V184.87H70.3978C77.0477 184.87 80.3726 181.957 80.3726 176.132C80.3726 170.436 77.0477 167.588 70.3978 167.588H65.4878Z" fill="white"/>
-   <path d="M107.767 213.441V158H127.407C147.099 158 156.945 167.008 156.945 185.025C156.945 193.659 154.251 200.554 148.864 205.709C143.503 210.864 136.351 213.441 127.407 213.441H107.767ZM120.255 168.168V203.312H126.441C131.853 203.312 136.093 201.688 139.16 198.44C142.253 195.193 143.8 190.772 143.8 185.179C143.8 179.896 142.266 175.746 139.199 172.73C136.158 169.689 131.879 168.168 126.363 168.168H120.255Z" fill="white"/>
-   <path d="M203.051 168.624H183.488V182.233H201.466V192.362H183.488V213.897H171V158.456H203.051V168.624Z" fill="white"/>
--</svg>
-\ No newline at end of file
-+</svg>
--- 
-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

