Bump to 100.0b3

1 files changed, 52 insertions, 104 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d2108c005b61..4e94be527e8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,8 @@
 # Maintainer: Francois Menning <f.menning@pm.me>
-# Contributor: Andrew Crerar <crerar@archlinux.org>
 # Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+# Contributor: Andrew Crerar <crerar@archlinux.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Jakub Schmidtke <sjakub@gmail.com>
 # Contributor: Thaodan <theodorstormgrade@gmail.com>
 # Contributor: Weng Xuetian <wengxt@gmail.com>
 
@@ -8,72 +10,45 @@ _pkgname=firefox-developer-edition
 _patchurl=https://raw.githubusercontent.com/openSUSE/firefox-maintenance/master
 
 pkgname=firefox-developer-edition-kde
-pkgver=94.0b9
+pkgver=100.0b3
 pkgrel=1
-pkgdesc="Developer Edition of the popular Firefox web browser."
-arch=('x86_64')
-license=('MPL' 'GPL' 'LGPL')
-url="https://www.mozilla.org/firefox/channel/#developer"
-depends=('gtk3' 'libxt' 'mime-types' 'dbus-glib' 'ffmpeg' 'ttf-font' 'libpulse' 'nss'
-         'hicolor-icon-theme' 'kmozillahelper' 'nspr' 'hunspell')
-makedepends=('unzip' 'zip' 'diffutils' 'python-setuptools' 'yasm' 'mesa' 'imake' 'inetutils'
-             'xorg-server-xvfb' 'libpulse' 'inetutils' 'autoconf2.13' 'rust' 'clang' 'llvm' 'jack' 'nodejs'
-             'cargo' 'mercurial' 'llvm' 'python-psutil' 'cbindgen' 'nasm' 'lld' 'python-zstandard' 'dump_syms')
+pkgdesc="Standalone web browser from mozilla.org"
+arch=(x86_64)
+license=(MPL GPL LGPL)
+url="https://www.mozilla.org/firefox/"
+depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse kmozillahelper)
+makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
+             autoconf2.13 rust clang llvm jack nodejs cbindgen nasm
+             python-setuptools python-psutil python-zstandard lld dump_syms
+             wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi)
 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')
+options=(!emptydirs !makeflags !strip !lto !debug)
 conflicts=('firefox-developer-edition')
 provides=('firefox-developer-edition')
-options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
-        firefox-install-dir.patch
-        0001-Use-remoting-name-for-GDK-application-names.patch
-        0002-Add-missing-default-scheme.patch
-        "$_pkgname".desktop
+        $_pkgname.desktop
         identity-icons-brand.svg
+        # https://github.com/archlinux/svntogit-community/tree/packages/firefox-developer-edition
+        firefox-install-dir.patch
+        psutil.patch
         # https://github.com/openSUSE/firefox-maintenance
-        mozilla-nongnome-proxies.patch::$_patchurl/mozilla-nongnome-proxies.patch
         mozilla-kde.patch::$_patchurl/mozilla-kde.patch
-        mozilla-ntlm-full-path.patch::$_patchurl/mozilla-ntlm-full-path.patch
-        mozilla-sandbox-fips.patch::$_patchurl/mozilla-sandbox-fips.patch
-        mozilla-bmo1005535.patch::$_patchurl/mozilla-bmo1005535.patch
-        mozilla-bmo1504834-part1.patch::$_patchurl/mozilla-bmo1504834-part1.patch
-        mozilla-bmo1504834-part2.patch::$_patchurl/mozilla-bmo1504834-part2.patch
-        mozilla-bmo1504834-part3.patch::$_patchurl/mozilla-bmo1504834-part3.patch
-        mozilla-bmo1504834-part4.patch::$_patchurl/mozilla-bmo1504834-part4.patch
-        mozilla-fix-top-level-asm.patch::$_patchurl/mozilla-fix-top-level-asm.patch
-        mozilla-bmo849632.patch::$_patchurl/mozilla-bmo849632.patch
-        mozilla-bmo998749.patch::$_patchurl/mozilla-bmo998749.patch
-        mozilla-bmo1626236.patch::$_patchurl/mozilla-bmo1626236.patch
-        mozilla-bmo531915.patch::$_patchurl/mozilla-bmo531915.patch        
         firefox-branded-icons.patch::$_patchurl/firefox/firefox-branded-icons.patch
-        firefox-kde.patch::$_patchurl/firefox/firefox-kde.patch
-)
-sha512sums=('3a752f0ef8816427dddbe64f26c16da12fa430dfbc94bf44945d54fd0d581a5191d8a8f0e6aaf0e078697b71b6badc386276af27c8282dcea408bc011851404c'
+        firefox-kde.patch::$_patchurl/firefox/firefox-kde.patch)
+sha256sums=('7944cf62e046902b903b3e1c36a63eff81d1441332df9f63eaaec93220691176'
             'SKIP'
-            'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e'
-            '624a2531b4b85b1ad2286f0a6529313d9ae8a543b9f799a1f06d564db003f126e7bb3b5a35c6ab2f28d0e495a399d97476df8436914ba637cf627b52c3ab6f8d'
-            '2a46f450fa230b964bc105087d578574bebccc18c337d89860740caeb00ea798c69edc70b256d87437dc4e791d1d223dbb1b70531c32333d6b23fa3550d1d941'
-            '96d56ed8d14dd16cd44df5dc156d81a4426280cdd8bd61e71831b7555c4d4a256fca523ce53852f6f98a546bf20d92b9c63aeeaff7a06174b8da7a8028394397'
-            'b579b73176c72a5ecf36e3f63bba08fdb8041ae99d54e5cab906660fed6a9cf2311f7ca1ec1649e451cc6d5a4b1e6060b974b1d7befe9c8df3c5a89c50383c17'
-            'dcdaba2b51f8e7dc4fbfeb7c707581a136d8727a64352fb09f40e62c1bba03f66d4770d21bd9ea0b9a249314fd4ce273bb42efb7108db39bbbadf1d0ddb8e3aa'
-            '70e0098da963540eb685184bf24e32c4b7ecb28a373d6c1792961bf3142f964af247c94774be0ae1e014c9e43bf4aee439cb45dcf882ad234bdb00709b3e71d9'
-            'a8d1da2d85cd59c9254cd10800957eebb2e60818968739c9711d53d651a72b7a895b3cf973e24c019ec996a1ad7e2f3e28448e4e3a43761ee00b53284274e400'
-            '4716b5e450231ba375c26177a8983c8689054df0e8889488455bb1e045ec584f7bf7b7d0779c49fca43e2a05bcf25391dc7f825fadaa1079b283d9679083854f'
-            'c46a5e05a7cfa6acceae7b3474b5fa26727b32369b1bbd93fcdb0bd3aa2b42192b7ce4ba540ecc1011317024f8005b264fa85273385e15e89c93c489f7da3c03'
-            'c84d412df15a8aeaad41000f591e504bfef054614daff3246f292be59ce3b25e724149a94bdead5bcae5f1704c7e7c987b8130fa38f8dac0df466bdc8b9bb0e2'
-            '7158ddd53b0e25e534f3df762d607c83f4e3e19385758534adcd1e3fc514d689373048fac878b8e27701bfc863ba6a52860d5dfb64902ec8ce59af427e7fb6c6'
-            '4c9df14609e16ece6cbfd321b1242e6fc4377341ea269ec68aa2747c34cc2c40e38f342bdee1f1f5a4d4c6da62233706ec3ed677bcfafdcebe94200ff71e24fd'
-            'aa3f0d0e2603d32722ba59700efdc4e618fe3ba15f4a2ecb3c63b28dc892138dbc1427b04e9f9749ff5009ca935c70d7c6cefe5b0ad6b121b82f5cf07ea45086'
-            '31738b0d7c2ae0fbdc567e84d24774e057bc0257af66e3c08a6386828051d3df4fc7aaacf71aee5a7badfa0734a8999ce1a002e639b1cf35e576b1d889edcfea'
-            '6b9e3589a7359499cf197556c00ee32193ee32b8bfb0d8811511d05105e89e107c8c0b3543a96b0234b0893c260ba6e07de23da67493505a846baf42d59cfd6e'
-            '3216e96e7cd1624945595f016fbe76a699d8627c60250768857c74c2453e66e3cc9207bfbf486ea1be5685b595bf1ae4626401502f723e94320c42c7b12d0785'
-            '773be00a1aea29527e8556b152f463e477f025785e2ca98ca12804b3a5783444bdf4f6d6765b167f64dce3110b91af5efed58c1744d35b2da187d1b4eac8ed59'
-            '7c149f99541fb9d6f67a17987ce1ef4456799ac8ad7dc9d963b7a3435f024892014e8c577e7ee79735cbcaff9b67328d4c0e22c73adebf1052102cbcc95c85a8'
-            '29eb82ff71385b299b2f1baefbb32c5add484117315245ca21d5d521ec9281d08023753d3daff731ecf93df83f9f1e945cd04a3320f0e05c0d675afbcab6ecc3'
-            '4c4c6cdc86da0a7e335526df763379e24af2caa282b25d6ea32dbbc6af6c499177b1f4ae87b2f010e38be812c2529e79ac47abc692774e19af117ccbe9a5bbb1')
+            '67e1934ed8ac0fb4bb020cde11157956151e4c48ec5405783763a5fe4b887e6d'
+            'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
+            '99dccc8a955bee85ce69c02a32888f7d79ba7dd0fe5aa6aaf6f52102286d544c'
+            'f811e6408fa8900bed80055403dec889e0249681bba2b85911f96571595f78ce'
+            'bc5397bbccf158e12e058646ab88a636040ba810e5f8270a2efa914e3b8b52d0'
+            'bcedaf4feb3ec56c86cb3b99c0fa99c3f38090485454d4beacf23bd90056433a'
+            'da420deac6bfdcbf0bba31011ec23be31cdc5ab10f95a6fef5a2d6d6defc739d')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -92,40 +67,21 @@ prepare() {
   mkdir mozbuild
   cd firefox-${pkgver%b*}
 
-  # Install location
+  # https://github.com/archlinux/svntogit-community/tree/packages/firefox-developer-edition/trunk
   patch -Np1 -i ../firefox-install-dir.patch
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
-  patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
+  patch -Np1 -i ../psutil.patch
 
   # https://github.com/openSUSE/firefox-maintenance/blob/master/firefox/MozillaFirefox.spec
   # Gecko/Toolkit
-  patch -Np1 -i ../mozilla-nongnome-proxies.patch
   patch -Np1 -i ../mozilla-kde.patch
-  patch -Np1 -i ../mozilla-ntlm-full-path.patch
-  patch -Np1 -i ../mozilla-sandbox-fips.patch
-  patch -Np1 -i ../mozilla-bmo1005535.patch
-  patch -Np1 -i ../mozilla-bmo1504834-part1.patch
-  patch -Np1 -i ../mozilla-bmo1504834-part2.patch
-  patch -Np1 -i ../mozilla-bmo1504834-part3.patch
-  patch -Np1 -i ../mozilla-bmo1504834-part4.patch
-  patch -Np1 -i ../mozilla-fix-top-level-asm.patch
-  patch -Np1 -i ../mozilla-bmo849632.patch
-  patch -Np1 -i ../mozilla-bmo998749.patch
-  patch -Np1 -i ../mozilla-bmo1626236.patch
-  patch -Np1 -i ../mozilla-bmo531915.patch
 
   # Firefox/browser
   patch -Np1 -i ../firefox-kde.patch
-  patch -Np1 -i ../firefox-branded-icons.patch
 
-  # https://github.com/openSUSE/firefox-maintenance/issues/37
-  patch -Np1 -i ../0002-Add-missing-default-scheme.patch
+  echo -n "$_google_api_key" >google-api-key
+  echo -n "$_mozilla_api_key" >mozilla-api-key
 
-  echo -n "$_google_api_key" > google-api-key
-  echo -n "$_mozilla_api_key" > mozilla-api-key
-
-  cat > ../mozconfig << END
+  cat >../mozconfig <<END
 ac_add_options --enable-application=browser
 mk_add_options MOZ_OBJDIR=${PWD@Q}/obj
 
@@ -137,24 +93,16 @@ ac_add_options --enable-rust-simd
 ac_add_options --enable-linker=lld
 ac_add_options --disable-elf-hack
 ac_add_options --disable-bootstrap
-# ac_add_options --with-ccache=sccache
-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 --with-wasi-sysroot=/usr/share/wasi-sysroot
 
 # Branding
 ac_add_options --enable-official-branding
-ac_add_options --with-branding=browser/branding/aurora
-ac_add_options --enable-update-channel=aurora
+ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=org.archlinux
 ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --allow-addon-sideload
 export MOZILLA_OFFICIAL=1
-export MOZ_APP_REMOTINGNAME=firefox-developer-edition
-export MOZ_TELEMETRY_REPORTING=1
-export MOZ_REQUIRE_SIGNING=
+export MOZ_APP_REMOTINGNAME=${_pkgname//-/}
 
 # Keys
 ac_add_options --with-google-location-service-api-keyfile=${PWD@Q}/google-api-key
@@ -166,8 +114,6 @@ ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 
 # Features
-# ac_add_options --enable-default-toolkit=cairo-gtk3
-ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
 ac_add_options --enable-alsa
 ac_add_options --enable-jack
 ac_add_options --enable-crashreporter
@@ -181,8 +127,8 @@ build() {
 
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
-  export MACH_USE_SYSTEM_PYTHON=1
   export MOZ_ENABLE_FULL_SYMBOLS=1
+  export MACH_USE_SYSTEM_PYTHON=1
 
   # LTO needs more open files
   ulimit -n 4096
@@ -228,26 +174,26 @@ package() {
   DESTDIR="$pkgdir" ./mach install
 
   local vendorjs="$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
-  install -Dm644 /dev/stdin "$vendorjs" << END
-// Use LANG environment variable to choose locale.
+  install -Dvm644 /dev/stdin "$vendorjs" <<END
+// Use LANG environment variable to choose locale
 pref("intl.locale.requested", "");
 
-// Use system-provided dictionaries.
+// Use system-provided dictionaries
 pref("spellchecker.dictionary_path", "/usr/share/hunspell");
 
 // Disable default browser checking.
 pref("browser.shell.checkDefaultBrowser", false);
 
-// Don't disable our bundled extensions in the application directory.
+// Don't disable extensions in the application directory
 pref("extensions.autoDisableScopes", 11);
 END
 
   local distini="$pkgdir/usr/lib/$_pkgname/distribution/distribution.ini"
-  install -Dm644 /dev/stdin "$distini" << END
+  install -Dvm644 /dev/stdin "$distini" <<END
 [Global]
 id=archlinux
 version=1.0
-about=Mozilla Firefox Developer Edition for Arch Linux
+about=Mozilla Firefox for Arch Linux
 
 [Preferences]
 app.distributor=archlinux
@@ -255,9 +201,9 @@ app.distributor.channel=$_pkgname
 app.partner.archlinux=archlinux
 END
 
-  local i theme=aurora
+  local i theme=official
   for i in 16 22 24 32 48 64 128 256; do
-    install -Dm644 browser/branding/$theme/default$i.png \
+    install -Dvm644 browser/branding/$theme/default$i.png \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$_pkgname.png"
   done
   install -Dvm644 browser/branding/$theme/content/about-logo.png \
@@ -269,23 +215,23 @@ END
   install -Dvm644 ../identity-icons-brand.svg \
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$_pkgname-symbolic.svg"
 
-  install -Dm644 ../$_pkgname.desktop \
+  install -Dvm644 ../$_pkgname.desktop \
     "$pkgdir/usr/share/applications/$_pkgname.desktop"
 
   # Install a wrapper to avoid confusion about binary path
-  install -Dm755 /dev/stdin "$pkgdir/usr/bin/$_pkgname" << END
+  install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$_pkgname" <<END
 #!/bin/sh
 exec /usr/lib/$_pkgname/firefox "\$@"
 END
 
   # Replace duplicate binary with wrapper
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -srf "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/lib/$_pkgname/firefox-bin"
+  ln -srfv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/lib/$_pkgname/firefox-bin"
 
   # Use system certificates
   local nssckbi="$pkgdir/usr/lib/$_pkgname/libnssckbi.so"
   if [[ -e $nssckbi ]]; then
-    ln -srf "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi"
+    ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi"
   fi
 
   export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE="$startdir/.crash-stats-api.token"
@@ -295,3 +241,5 @@ END
     cp -fvt "$startdir" obj/dist/*crashreporter-symbols-full.tar.zst
   fi
 }
+
+# vim:set sw=2 et: