78.8.0

4 files changed, 17 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4f3810f3a71..b39c32e1b9fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = icecat
 	pkgdesc = GNU version of the Firefox browser.
-	pkgver = 78.7.1
+	pkgver = 78.8.0
 	pkgrel = 1
 	url = http://www.gnu.org/software/gnuzilla/
 	arch = x86_64
@@ -50,18 +50,16 @@ pkgbase = icecat
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-bb1c105f4416c2973f394680c2d579918a1da77a.tar.gz
+	source = https://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-d5df5618fbf6f6ea0c49b6bfdcb098846d2cd777.tar.gz
 	source = icecat.desktop
 	source = icecat-safe.desktop
 	source = 0001-Use-remoting-name-for-GDK-application-names.patch::https://raw.githubusercontent.com/archlinux/svntogit-packages/0adcedc05ce67d53268575f8801c8de872206901/firefox/trunk/0001-Use-remoting-name-for-GDK-application-names.patch
 	source = rust_1.48.patch.gz
-	source = rust_1.50.patch
-	sha256sums = f8fc6889a0d6c7ebec076d90f7fe4804abb6efb03fc086e5d526b325cb1c5c37
+	sha256sums = c1d4249f52805740ddf3a1724da946fa4c412316868f76cb614a1db774f0d8e4
 	sha256sums = e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d
 	sha256sums = 33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208
 	sha256sums = e0eaec8ddd24bbebf4956563ebc6d7a56f8dada5835975ee4d320dd3d0c9c442
-	sha256sums = d32c87c4526e897d64453914da43f99366d1d0b7d71e43b4027a6cb5aa274040
-	sha256sums = 12b677de5181466634aff6e68b9a189b21a1b3a7ea1dbf666462602320442c02
+	sha256sums = c7f867ccee684939c9f0a9c30ea69127077bbe43af545a03f09dfbbdc02545a9
 
 pkgname = icecat
 
diff --git a/PKGBUILD b/PKGBUILD
index de1f89a479f9..d7751bcaa3d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
 pkgname=icecat
-pkgver=78.7.1
+pkgver=78.8.0
 pkgrel=1
-_commit=bb1c105f4416c2973f394680c2d579918a1da77a
+_commit=d5df5618fbf6f6ea0c49b6bfdcb098846d2cd777
 pkgdesc="GNU version of the Firefox browser."
 arch=(x86_64)
 url="http://www.gnu.org/software/gnuzilla/"
@@ -26,14 +26,13 @@ options=(!emptydirs !makeflags !strip)
 source=(https://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-${_commit}.tar.gz
         icecat.desktop icecat-safe.desktop
         "0001-Use-remoting-name-for-GDK-application-names.patch::https://raw.githubusercontent.com/archlinux/svntogit-packages/0adcedc05ce67d53268575f8801c8de872206901/firefox/trunk/0001-Use-remoting-name-for-GDK-application-names.patch"
-        rust_1.48.patch.gz rust_1.50.patch)
+        rust_1.48.patch.gz)
 
-sha256sums=('f8fc6889a0d6c7ebec076d90f7fe4804abb6efb03fc086e5d526b325cb1c5c37'
+sha256sums=('c1d4249f52805740ddf3a1724da946fa4c412316868f76cb614a1db774f0d8e4'
             'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d'
             '33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208'
             'e0eaec8ddd24bbebf4956563ebc6d7a56f8dada5835975ee4d320dd3d0c9c442'
-            'd32c87c4526e897d64453914da43f99366d1d0b7d71e43b4027a6cb5aa274040'
-            '12b677de5181466634aff6e68b9a189b21a1b3a7ea1dbf666462602320442c02')
+            'c7f867ccee684939c9f0a9c30ea69127077bbe43af545a03f09dfbbdc02545a9')
 
 prepare() {
   cd gnuzilla-${_commit}
@@ -70,9 +69,6 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1667736
   patch -Np1 -i ../../../rust_1.48.patch
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1684261
-  patch -Np1 -i ../../../rust_1.50.patch
-
   # Patch to move files directly to /usr/lib/icecat. No more symlinks.
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk
@@ -120,16 +116,20 @@ END
 build() {
   cd gnuzilla-${_commit}/output/icecat-${pkgver}
 
+  export MOZ_NOSPAM=1
+  export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
+  export MACH_USE_SYSTEM_PYTHON=1
+
   # LTO needs more open files
   ulimit -n 4096
 
   # -fno-plt with cross-LTO causes obscure LLVM errors
   # LLVM ERROR: Function Import: link error
-  #CFLAGS="${CFLAGS/-fno-plt/}"
-  #CXXFLAGS="${CXXFLAGS/-fno-plt/}"
+  CFLAGS="${CFLAGS/-fno-plt/}"
+  CXXFLAGS="${CXXFLAGS/-fno-plt/}"
 
-  xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build
-  ./mach buildsymbols
+  ./mach build
+  #./mach buildsymbols
 
 }
 
diff --git a/rust_1.48.patch.gz b/rust_1.48.patch.gz
index a384764c65c0..eb1577e338bc 100644
--- a/rust_1.48.patch.gz
+++ b/rust_1.48.patch.gz
diff --git a/rust_1.50.patch b/rust_1.50.patch
deleted file mode 100644
index 943ae940185c..000000000000
--- a/rust_1.50.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1609006565 0
-# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
-# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
-Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
-
-Fixes errors like:
-
-  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
-
-I've left the most specific dependency, but for wgpu the rev is not
-right, so I've kept the branch which effectively preserves behavior.
-
-Differential Revision: https://phabricator.services.mozilla.com/D100485
-
-diff --git a/.cargo/config.in b/.cargo/config.in
---- a/.cargo/config.in
-+++ b/.cargo/config.in
-@@ -1,16 +1,16 @@
- # This file contains vendoring instructions for cargo.
- # It was generated by `mach vendor rust`.
- # Please do not edit.
- 
- [source."https://github.com/shravanrn/nix/"]
--branch = "r0.13.1"
- git = "https://github.com/shravanrn/nix/"
- replace-with = "vendored-sources"
-+rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
- 
- [source."https://github.com/mozilla/rkv"]
- git = "https://github.com/mozilla/rkv"
- replace-with = "vendored-sources"
- rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
- 
- [source."https://github.com/mozilla/neqo"]
- git = "https://github.com/mozilla/neqo"
-diff --git a/Cargo.lock b/Cargo.lock
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -3195,17 +3195,17 @@ source = "registry+https://github.com/ru
- checksum = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
- dependencies = [
-  "unreachable",
- ]
- 
- [[package]]
- name = "nix"
- version = "0.13.1"
--source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
- dependencies = [
-  "bitflags",
-  "cc",
-  "cfg-if",
-  "libc",
-  "void",
- ]
- 
-diff --git a/Cargo.toml b/Cargo.toml
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -68,8 +68,8 @@
- libudev-sys = { path = "dom/webauthn/libudev-sys" }
- packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" }
- rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
--nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
--spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4" }
- # failure's backtrace feature might break our builds, see bug 1608157.
- failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
- failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }