[iceweasel]: wip - upgrade to v80.0

2 files changed, 30 insertions, 32 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 0d5803cdc..3fa2919ab 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -26,14 +26,14 @@
 # FSDG:
 #  - Modify the addons pages to use GNU IceCat plugins sources, rather
 #    than addons.mozilla.org, which hosts non-free addons
-#  - Disable EME, which is implemented via the non-free libWideVine
-#    CDM
+#  - Disable EME, which is implemented via the non-free libWideVine CDM
 #  - Rebrand to Iceweasel, per the mozilla trademark policy,
 #    due to these FSDG changes
 #
 # technical:
 #  - build i686 with GCC instead of clang
 #  - disable rust-SIMD, LTO, PGO, and skip profiling build for armv7h and i686
+#  - allow skipping profiling build for x86_64 (_x86_64_skip_pgo)
 #  - prefer as many system libs as possible, over their vendored couterparts
 # 
 # privacy:
@@ -44,7 +44,7 @@
 
 pkgname=iceweasel
 epoch=1
-pkgver=79.0
+pkgver=80.0
 pkgrel=1
 pkgrel+=.parabola1
 _brandingver=77.0
@@ -69,7 +69,6 @@ replaces=('firefox')
 options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
-        bug1654465.diff
         $pkgname.desktop)
 source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig}
          libre.patch
@@ -77,18 +76,17 @@ source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_
          vendor.js.in)
 source_armv7h=(arm.patch
                build-arm-libopus.patch)
-source_i686=('rust-static-disable-network-test-on-static-libraries.patch'
-             'avoid-libxul-OOM-python-check.patch')
-sha256sums=('12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713'
+source_i686=('avoid-libxul-OOM-python-check.patch'
+             'rust-static-disable-network-test-on-static-libraries.patch')
+sha256sums=('380d9853e0712442ba2d4acd85c0e09c19ad36561a3ea8932705ad6b8a91146a'
             'SKIP'
             '3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75'
-            'e577f7e5636deda0026b0e385186f3ecb2212c9b84b6a2949a1811dab3e410d6'
-            '44be8e819b8334ed36e9410d62dbc6c16dd8f8329a191403bfdce3cf2e9181fc'
-            '57ea7663a8bf3d9326cf17798db0846b987bd26f4a20670d9aa3a02a58a29471'
-            'SKIP'
-            '069f093e7aceec210b17472b65a26de6c926a50aeb3c413e532a8ec3742cf09c'
-            '0ed6b8efa00f73a96bceaba2d6a31fb11d416106729ab9b8289b191eb9acccfa'
-            '714998c5fc379f54a66ff80a845b7880169cd5b4094b77b719a99d33b65c0940')
+            '44be8e819b8334ed36e9410d62dbc6c16dd8f8329a191403bfdce3cf2e9181fc')
+sha256sums+=('57ea7663a8bf3d9326cf17798db0846b987bd26f4a20670d9aa3a02a58a29471'
+             'SKIP'
+             '5cfcadbd168c52b1b1e3f2f2c45911a4ae1a9d8a05918be68475a31985607bd8'
+             '0ed6b8efa00f73a96bceaba2d6a31fb11d416106729ab9b8289b191eb9acccfa'
+             '714998c5fc379f54a66ff80a845b7880169cd5b4094b77b719a99d33b65c0940')
 sha256sums_i686=('bf2829f280ef05a608584ce7ec95875e147f315bac9609f5e18052bc03e3c4f9'
                  'cff239cbeca6fb6171ed4849b6b42173ce6b4fd2f671e1d5dedd1d81795f3da8')
 sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
@@ -98,6 +96,9 @@ validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
 
 
+_x86_64_skip_pgo=0
+
+
 prepare() {
   mkdir mozbuild
   cd firefox-$pkgver
@@ -106,11 +107,9 @@ prepare() {
   echo "applying 0001-Use-remoting-name-for-GDK-application-names.patch"
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1654465
-  patch -Np1 -i ../bug1654465.diff
-
   cat >../mozconfig <<END
 ac_add_options --enable-application=browser
+mk_add_options MOZ_OBJDIR=${PWD@Q}/obj
 
 ac_add_options --prefix=/usr
 ac_add_options --enable-release
@@ -195,14 +194,14 @@ export NM=gcc-nm
 export RANLIB=gcc-ranlib
 END
 
+      # readelf: Error: Unable to seek to 0x801db328 for section headers
+      echo "applying avoid-libxul-OOM-python-check.patch"
+      patch -p1 -i "$srcdir"/avoid-libxul-OOM-python-check.patch
+
       # test failure in rust code (complaining about network functions) when PGO is used,
       # see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757
       echo "applying rust-static-disable-network-test-on-static-libraries.patch"
       patch -p1 -i "$srcdir"/rust-static-disable-network-test-on-static-libraries.patch
-
-      # readelf: Error: Unable to seek to 0x801db328 for section headers
-      echo "applying avoid-libxul-OOM-python-check.patch"
-      patch -p1 -i "$srcdir"/avoid-libxul-OOM-python-check.patch
     ;;
     x86_64)
     ;;
@@ -395,7 +394,6 @@ build() {
       cp ../mozconfig .mozconfig
     ;;
     x86_64)
-      _x86_64_skip_pgo=0
       if (( $_x86_64_skip_pgo ))
       then
         # skipping PGO "instrumented browser"; so we have the final .mozconfig now
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index bb0572adc..c4e9a443e 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -1,19 +1,18 @@
 diff --git a/browser/app/permissions b/browser/app/permissions
-index ecb82a2..5d522ef 100644
+index 991284081d..888cc811ce 100644
 --- a/browser/app/permissions
 +++ b/browser/app/permissions
-@@ -14,12 +14,6 @@ origin	uitour	1	https://support.mozilla.org
+@@ -15,11 +15,5 @@ origin	uitour	1	https://support.mozilla.org
  origin	uitour	1	about:home
  origin	uitour	1	about:newtab
- 
+
 -# XPInstall
 -origin	install	1	https://addons.mozilla.org
 -
  # Remote troubleshooting
  origin	remote-troubleshooting	1	https://support.mozilla.org
- 
+-
 -# addon install
--origin	install	1	https://private-network.firefox.com
 -origin	install	1	https://fpn.firefox.com
 diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
 index 7d37d26..4ebbc06 100644
@@ -492,15 +491,16 @@ index 5cd41b3e36..ba6b2bc4d8 100644
  
  exports.defaultTools = defaultTools;
 diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
-index daf4549c6e..b04d79f191 100644
+index af42ded2ae..86cf0a650f 100644
 --- a/devtools/client/jar.mn
 +++ b/devtools/client/jar.mn
-@@ -247,9 +247,6 @@ devtools.jar:
-     # Application panel
-     content/application/index.html (application/index.html)
- 
+@@ -367,10 +367,6 @@ devtools.jar:
+     content/application/src/components/service-workers/Worker.css (application/src/components/service-workers/Worker.css)
+     content/application/src/components/ui/UIButton.css (application/src/components/ui/UIButton.css)
+
 -    # WhatsNew panel
 -    content/whats-new/index.html (whats-new/index.html)
+-    content/whats-new/src/whats-new.css (whats-new/src/whats-new.css)
 -
      # about:profiling
      skin/aboutprofiling.css (themes/aboutprofiling.css)