Fixed package. Thanks to @dctxmei

5 files changed, 24 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be2449f02ccc..3617bba7b16c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = firefox-esr
 	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release
 	pkgver = 91.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.mozilla.org/en-US/firefox/organizations/
 	arch = x86_64
 	license = MPL
@@ -20,7 +20,6 @@ pkgbase = firefox-esr
 	makedepends = clang
 	makedepends = llvm
 	makedepends = jack
-	makedepends = gtk2
 	makedepends = nodejs
 	makedepends = cbindgen
 	makedepends = nasm
@@ -29,7 +28,6 @@ pkgbase = firefox-esr
 	makedepends = python-zstandard
 	makedepends = lld
 	makedepends = dump_syms
-	depends = gtk2
 	depends = gtk3
 	depends = libxt
 	depends = mime-types
@@ -38,13 +36,12 @@ pkgbase = firefox-esr
 	depends = nss
 	depends = ttf-font
 	depends = libpulse
-	depends = libevent
-	depends = libxt
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = libnotify: Notification integration
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
+	optdepends = xdg-desktop-portal: Screensharing with Wayland
 	provides = firefox=91.0
 	conflicts = firefox
 	options = !emptydirs
@@ -52,14 +49,14 @@ pkgbase = firefox-esr
 	options = !strip
 	source = https://archive.mozilla.org/pub/firefox/releases/91.0esr/source/firefox-91.0esr.source.tar.xz
 	source = https://archive.mozilla.org/pub/firefox/releases/91.0esr/source/firefox-91.0esr.source.tar.xz.asc
+	source = 0001-Use-remoting-name-for-GDK-application-names.patch
 	source = firefox-esr.desktop
 	source = identity-icons-brand.svg
-	source = 0001-Use-remoting-name-for-GDK-application-names.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha256sums = fa1bae287ef55416ae4ee3fbd22f923f9d1fec066c91766d60633d53db6a9959
 	sha256sums = SKIP
-	sha256sums = d86fe1636346ff003744b65e73cd3a7182618faedf3ee57023bb942e325cc726
+	sha256sums = 138b972a40a74104791783167770c4a01e62cce00bb9cc75119e152f9ea9f14d
+	sha256sums = 39c4c2d1f465e3fb08e20e3036c2284ee3e8dfbd539abe4ffea3c46b4058f16d
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
-	sha256sums = 7e7435e8171426e87a84cecf9eb017cb969c9c85d973feb78c1e05771972b6e9
 
 pkgname = firefox-esr
diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
index f85be967f374..17e0e2cfccb9 100644
--- a/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] Use remoting name for GDK application names
  2 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 3ec33c9b45417..56081f76a0074 100644
+index d3bb8096ad02e..95ccce28fa786 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4252,11 +4252,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -4262,11 +4262,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.
diff --git a/PKGBUILD b/PKGBUILD
index 015b7de1c7f9..9b45f19fa9b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,30 +5,32 @@
 
 pkgname=firefox-esr
 pkgver=91.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release"
 arch=(x86_64)
 license=(MPL GPL LGPL)
 url="https://www.mozilla.org/en-US/firefox/organizations/"
-depends=(gtk2 gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse libevent libxt)
+depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)
 makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
-             autoconf2.13 rust clang llvm jack gtk2 nodejs cbindgen nasm
+             autoconf2.13 rust clang llvm jack nodejs cbindgen nasm
              python-setuptools python-psutil python-zstandard lld dump_syms)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
             'speech-dispatcher: Text-to-Speech'
-            'hunspell-en_US: Spell checking, American English')
+            'hunspell-en_US: Spell checking, American English'
+            'xdg-desktop-portal: Screensharing with Wayland')
 provides=(firefox=${pkgver})
 conflicts=(firefox)
 options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz{,.asc}
-        ${pkgname}.desktop identity-icons-brand.svg 0001-Use-remoting-name-for-GDK-application-names.patch)
+        0001-Use-remoting-name-for-GDK-application-names.patch
+        ${pkgname}.desktop identity-icons-brand.svg)
 sha256sums=('fa1bae287ef55416ae4ee3fbd22f923f9d1fec066c91766d60633d53db6a9959'
             'SKIP'
-            'd86fe1636346ff003744b65e73cd3a7182618faedf3ee57023bb942e325cc726'
-            'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
-            '7e7435e8171426e87a84cecf9eb017cb969c9c85d973feb78c1e05771972b6e9')
+            '138b972a40a74104791783167770c4a01e62cce00bb9cc75119e152f9ea9f14d'
+            '39c4c2d1f465e3fb08e20e3036c2284ee3e8dfbd539abe4ffea3c46b4058f16d'
+            'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -44,7 +46,7 @@ _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
 _mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a
 
 prepare() {
-  mkdir -p mozbuild
+  mkdir mozbuild
   cd firefox-$pkgver
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
@@ -64,11 +66,7 @@ ac_add_options --enable-optimize
 ac_add_options --enable-rust-simd
 ac_add_options --enable-linker=lld
 ac_add_options --disable-elf-hack
-#export CC='clang --target=x86_64-unknown-linux-gnu'
-#export CXX='clang++ --target=x86_64-unknown-linux-gnu'
-#export AR=llvm-ar
-#export NM=llvm-nm
-#export RANLIB=llvm-ranlib
+ac_add_options --disable-bootstrap
 
 # Branding
 ac_add_options --enable-official-branding
@@ -78,7 +76,6 @@ ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --allow-addon-sideload
 export MOZILLA_OFFICIAL=1
 export MOZ_APP_REMOTINGNAME=${pkgname//-/}
-export MOZ_REQUIRE_SIGNING=1
 
 # Keys
 ac_add_options --with-google-location-service-api-keyfile=${PWD@Q}/google-api-key
@@ -186,6 +183,8 @@ END
     "$pkgdir/usr/share/icons/hicolor/192x192/apps/$pkgname.png"
   install -Dvm644 browser/branding/$theme/content/about-logo@2x.png \
     "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png"
+  install -Dvm644 browser/branding/$theme/content/about-logo.svg \
+    "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
   install -Dvm644 ../identity-icons-brand.svg \
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
 
@@ -212,7 +211,7 @@ END
   if [[ -f $SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE ]]; then
     make -C obj uploadsymbols
   else
-    cp -fvt "$startdir" obj/dist/*crashreporter-symbols-full.zip
+    cp -fvt "$startdir" obj/dist/*crashreporter-symbols-full.tar.zst
   fi
 }
 
diff --git a/firefox-esr.desktop b/firefox-esr.desktop
index 9ecda624569e..f0945bc319cc 100644
--- a/firefox-esr.desktop
+++ b/firefox-esr.desktop
@@ -46,7 +46,7 @@ Comment=Browse the World Wide Web
 Comment[ar]=تصفح الشبكة العنكبوتية العالمية
 Comment[ast]=Restola pela Rede
 Comment[bn]=ইন্টারনেট ব্রাউজ করুন
-Comment[ca]=Navegueu per la web
+Comment[ca]=Navegueu per el web
 Comment[cs]=Prohlížení stránek World Wide Webu
 Comment[da]=Surf på internettet
 Comment[de]=Im Internet surfen
@@ -117,7 +117,7 @@ Icon=firefox-esr
 Terminal=false
 X-MultipleArgs=false
 Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
 StartupNotify=true
 StartupWMClass=firefoxesr
 Categories=Network;WebBrowser;
diff --git a/rust_1.48.patch.gz b/rust_1.48.patch.gz
deleted file mode 100644
index eb1577e338bc..000000000000
--- a/rust_1.48.patch.gz
+++ /dev/null