PR#68: libre/iceweasel: 110.0 - abslibre

abslibre

#68 libre/iceweasel: 110.0

Closed a month ago by grizzlyuser. Opened 2 months ago by grizzlyuser.

iceweasel into pull-requests

[iceweasel] 110.0

grizzlyuser • a month ago

39f0830

libre/iceweasel/0001-libwebrtc-screen-cast-sync.patch

file modified

+1 -1

		`@@ -5646,7 +5646,7 @@`
		`#endif`
		`#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)`
		`diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h`
		`- index 4d2a8da334da..bab39ccf5661 100644`
		`+ index c11efdb615d0..4ee5259bb41a 100644`
		`--- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h`
		`+++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h`
		`@@ -17,7 +17,7 @@`

libre/iceweasel/9004-FSDG-misc.patch

file modified

+20 -8

		`@@ -8,7 +8,7 @@`
		`1 file changed, 21 insertions(+), 29 deletions(-)`

		`diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html`
		`- index b2d18d3098..e2e643bcf2 100644`
		`+ index c42e81ac23..e2e643bcf2 100644`
		`--- a/browser/base/content/default-bookmarks.html`
		`+++ b/browser/base/content/default-bookmarks.html`
		`@@ -1,14 +1,14 @@`
		`@@ -35,26 +35,36 @@`
		`<!-- This Source Code Form is subject to the terms of the Mozilla Public`
		`- 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/. -->`
		`- @@ -29,31 +29,23 @@`
		`+ @@ -29,41 +29,23 @@`
		`<dl><p>`
		`<dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">default-bookmarks-toolbarfolder</h3></dt>`
		`<dd data-l10n-id="default-bookmarks-toolbarfolder-description">default-bookmarks-toolbarfolder-description</dd>`
		`-#ifndef NIGHTLY_BUILD`
		`+ -#ifdef EARLY_BETA_OR_EARLIER`
		`<dl><p>`
		`- <dt><a href="https://www.mozilla.org/firefox/central/" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>`
		`+ <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a></dt>`
		`</dl><p>`
		`- - <dt><h3 data-l10n-id="default-bookmarks-firefox-heading">default-bookmarks-firefox-heading</h3></dt>`
		`+ -#else`
		`+ <dt><h3>Parabola GNU/Linux-libre</h3></dt>`
		`<dl><p>`
		`+ - <dt><a href="https://www.mozilla.org/firefox/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users&utm_content=-global" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>`
		`+ - </dl><p>`
		`+ -#endif`
		`+ - <dt><h3 data-l10n-id="default-bookmarks-firefox-heading">default-bookmarks-firefox-heading</h3></dt>`
		`+ - <dl><p>`
		`- <dt><a href="https://support.mozilla.org/products/firefox" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-get-help">default-bookmarks-firefox-get-help</a></dt>`
		`- <dt><a href="https://support.mozilla.org/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-customize">default-bookmarks-firefox-customize</a></dt>`
		`+ -#ifdef EARLY_BETA_OR_EARLIER`
		`+ - <dt><a href="https://www.mozilla.org/contribute/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users-beta&utm_content=-global" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>`
		`+ -#else`
		`- <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>`
		`+ -#endif`
		`- <dt><a href="https://www.mozilla.org/about/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-about">default-bookmarks-firefox-about</a></dt>`
		`- </dl><p>`
		`-#else`
		`- <dl><p>`
		`- - <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>`
		`+ - <dt><a href="https://www.mozilla.org/contribute/?utm_medium=firefox-desktop&utm_source=bookmarks-toolbar&utm_campaign=new-users-nightly&utm_content=-global" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>`
		`- </dl><p>`
		`- <dt><h3 data-l10n-id="default-bookmarks-nightly-heading">default-bookmarks-nightly-heading</h3></dt>`
		`+ <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a>`
		`@@ -1101,7 +1111,7 @@`

		`<vbox id="hasFxaAccount">`
		`diff --git a/browser/locales/en-US/browser/branding/brandings.ftl b/browser/locales/en-US/browser/branding/brandings.ftl`
		`- index efba683d66..9fe12b80fa 100644`
		`+ index a52cde5532..251acad0f8 100644`
		`--- a/browser/locales/en-US/browser/branding/brandings.ftl`
		`+++ b/browser/locales/en-US/browser/branding/brandings.ftl`
		`@@ -15,28 +15,28 @@`
		`@@ -1122,12 +1132,13 @@`
		`-mozilla-vpn-brand-name = Mozilla VPN`
		`--profiler-brand-name = Firefox Profiler`
		`--translations-brand-name = Firefox Translations`
		`+ --focus-brand-name = Firefox Focus`
		`+ --relay-brand-name = Firefox Relay`
		`+-profiler-brand-name = Iceweasel Profiler`
		`+-translations-brand-name = Iceweasel Translations`
		`- -rally-brand-name = Mozilla Rally`
		`- -rally-short-name = Rally`
		`- --focus-brand-name = Firefox Focus`
		`+-focus-brand-name = Iceweasel Focus`
		`+ +-relay-brand-name = Iceweasel Relay`
		`+ -relay-brand-short-name = Relay`

		`-# “Suggest” can be localized, “Firefox” must be treated as a brand`
		`+# “Suggest” can be localized, “Iceweasel” must be treated as a brand`
		`@@ -1146,6 +1157,7 @@`
		`# and kept in English.`
		`--firefoxview-brand-name = Firefox View`
		`+-firefoxview-brand-name = Iceweasel View`
		`+`
		`diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl`
		`index 1b29e8d..6f7566c 100644`
		`--- a/browser/locales/en-US/browser/preferences/preferences.ftl`

libre/iceweasel/PKGBUILD

file modified

+7 -13

		`@@ -70,7 +70,7 @@`

		`pkgname=iceweasel`
		`epoch=1`
		`- pkgver=109.0`
		`+ pkgver=110.0`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`_brandingver=102.0-1`
		`@@ -153,7 +153,6 @@`
		`$pkgname.desktop`
		`identity-icons-brand.svg`
		`0001-libwebrtc-screen-cast-sync.patch`
		`- 0002-Bug-1804973-Wayland-Check-size-for-valid-EGLWindows-.patch`
		`)`
		`source=(${source[*]/identity-icons-brand.svg/})`
		`source+=(`
		`@@ -179,17 +178,16 @@`
		`'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin`
		`'3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger`
		`)`
		`- sha256sums=('0678a03b572b5992fb85f0923a25b236acf81e5ea2c08e549b63a56076a69351'`
		`+ sha256sums=('d3882492190e4fdcfa142772cf35de5403effb011d24357b315d643ed9168a39'`
		`'SKIP'`
		`'9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58'`
		`- 'b1ce6936749ab1614bbce4fddc87058341ed207dde77af609fdc5ac83538517a'`
		`- '34439dfb17371520e5e99444096ded97325ab2559b9039ae16055975d015ac51')`
		`+ '43c83101b7ad7dba6f5fffeb89b70a661a547d506a031ea2beada42ccf04eec7')`
		`sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049'`
		`'SKIP'`
		`'58f6cdb31df0da4c8bf599d033ceb8f97c3e19b21c72b5b4cb70f13e1dfa5139' # 9001-FSDG-sync-remote-settings-with-local-dump.patch`
		`'1e4d28bd87688334b20cce9213490111e004ea6bcf1654f550da8ebe6bdbf3ef' # 9002-FSDG-preference-defaults.patch`
		`'13b701372b6fb35b96a1d58853db64643feb9be061ebc461b41ceca5de8eea62' # 9003-FSDG-urihandlers.patch`
		`- '18a71507cabd1d02f9d1e2b78bc29f157833b2a6b3fed20457524821fed555a1' # 9004-FSDG-misc.patch`
		`+ 'b664e65ad916effcd4807f8dc11b2d74e28733118c4a189dd19da6663a99577b' # 9004-FSDG-misc.patch`
		`'591b07d4a23bf978329420b7d7f53e16824dfbbf30ef0ffe8efd73a6cd836624' # process-json-files.py`
		`'8e113fd2730be3fd11b2a24918dd62e8741513cf4dce9819d8eae358c5411adc') # vendor.js.in`
		`sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')`
		`@@ -197,17 +195,16 @@`
		`'10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041'`
		`'1c2015e9f59c2c3bc898e04c6c6d33523f835638fd314d24944a8063cbce79d8'`
		`'2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06')`
		`- b2sums=('56ec8c49f0dd1cb4ba29afb5d68fd724614b993b2a1a59b9c03bf6349bae980d558ef18dbe2170af59f3e690308b753a88619e2abe48db58af5b7fcbecfa03f5'`
		`+ b2sums=('aae3b34f1642ddab5f0fcd104b4168c9d9856a1bbbc197ff3c8e1bbae0c8d1c033db6e974e10b5352f4457e890c50f1f9d5099a6b7200c3474b71ac7e6317113'`
		`'SKIP'`
		`'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635'`
		`- '3a7de17f0a56c4ccbbd4754a63a8798f787e87acc947b0fc0c1e5086c99337979b7f66a741fdc5475b34085eaf80dbc99d742c22a95d6ed412e38012794a44c9'`
		`- 'ad4618e6c0e6ac8cca387579f26e8f9a0eaab8e6f8ac8f9e2ad179bce09f5247848a9ce78d4042f3e400771f9c0914e8d6504f792d002481529e755f5eaf8916')`
		`+ '2bf65874c8c1f41c9273b68d74f4fe5c81dca5acbad0b9a5f917df1d46e1b2a1fb25d42a419eb885e76f4d193483cdeb6294e14ed4b2e241c34b84565b6ffd72')`
		`b2sums+=('c2a2ead1b44c563583abb5cd3579e8f2724ea79e12aba1b315f201a09547d611b4a3c98de12f063b25826fd1520562d411ab917780bab4d78a1240fe56096b1b'`
		`'SKIP'`
		`'553f96ab709cfc60324829b7225f89081b0aae06fd6d52699e83ee8483dc23ff227caec68949cf62caaffad09a26e817287508000dae5df60d3062de2e6a8bce' # 9001-FSDG-sync-remote-settings-with-local-dump.patch`
		`'bdb08d681f6f17ae9f8e0bb37e23087a0401d4be26c91ead3eda4654362ad37c3b1cddf69596e2b2278f77e0fd45714b7dbb7a97aca35aae5417e916079d24bf' # 9002-FSDG-preference-defaults.patch`
		`'9e4ccfb8850d9f9a5222f5186b35f2ae7986b6c6d435de024b109a6fa01e65a1362664cfb6ea81621387cf33364cc8d3d466fae1bee24ab5fc7e23c4cb17bf2c' # 9003-FSDG-urihandlers.patch`
		`- 'd63a2a7514f305a6c42bdf8fe228cbf905f1217431c3dbac6093426b04898cd2e5b49dfb592c56179495fbd71f7d7e074b759a5b5b181dcb4f3da86cb1272236' # 9004-FSDG-misc.patch`
		`+ '3c2041eac7230a2268cd2590bbccf2d3cf66f9164b6032c039e1d2656c0331301d39fb25623d27ee9cf701867f79f9e7fec6dbf68ff46f4fc5abb4ebeb3784cc' # 9004-FSDG-misc.patch`
		`'f53c0bdd1b1e09f3e4e4e376f6ada654fc6f5a02a248c87daad1f644fc8cf9bdb1009802f352b59d76b17c6d6a81745da1e7c59a5e2421fd2b8475bb9ba34798' # process-json-files.py`
		`'5302b6abcfec3155c578e0664e6a0ac921234c5912d74c4a9b0feb3a051ed4ef5f11b93ee37739a3a92fc6693683374f92ac9c3f560780f879c4249d0718157a') # vendor.js.in`
		`b2sums_armv7h=('6e5980e56343a23bce4fcda58f6abc8f2debca0c278c87b09e53abb17ff15849c26e8df3bbff2388985f8fe5a4e9be9982c602ef7159546f0ae335fca1000a41')`
		`@@ -350,9 +347,6 @@`
		`# https://src.fedoraproject.org/rpms/firefox/blob/rawhide/f/libwebrtc-screen-cast-sync.patch`
		`patch -Np1 -i ../0001-libwebrtc-screen-cast-sync.patch`

		`- # https://bugzilla.mozilla.org/show_bug.cgi?id=1804973`
		`- patch -Np1 -i ../0002-Bug-1804973-Wayland-Check-size-for-valid-EGLWindows-.patch`
		`-`
		`# arch-specific technical patching`
		`case ${CARCH} in`
		`aarch64\|armv7h)`

grizzlyuser commented 2 months ago

Built for x86_64 in fresh clean librechroot. Had to modify /usr/lib/libretools/chroot/mkarchroot to remove deprecated option 'd' dropped by pacstrap, so that it's now pacstrap -GMc

Didn't try to build on i686 and armv7h, also didn't check if there were any updates from their upstreams, sorry.

Changes:
1. Update version and patches according to upstream changes