firefox (#110)

* firefox: drop yasm * firefox: re-add rpath * firefox: unbundle zip, unzip * zip: add * unzip: add * firefox: 105.0 * firefox: remove useless rm's - the files arent present anymore * firefox: merge changes from testing, use system webp, standalone (un)zip not req'd * firefox: remove unzip dependency * Revert "unzip: add" This reverts commit 4441f7a572. * Revert "zip: add" This reverts commit a00d9d30ed. Co-authored-by: Owen Rafferty <owen@owenrafferty.com>
2022-09-20 06:31:13 +05:30 · 2022-09-20 06:31:13 +05:30 · dfe0936769
parent 42344f9f94
commit dfe0936769
7 changed files with 14 additions and 95 deletions
--- a/extra/firefox/build
+++ b/extra/firefox/build
@ -4,42 +4,8 @@ for p in *.patch; do
    patch -p1 < "$p"
 done

-# Build yasm for Firefox's sole use. Firefox is the only package which needs it
-# and upstream is kinda dead.
-(
-    cd yasm
-
-    ./configure \
-        --prefix=/
-
-    make
-    make DESTDIR="$PWD/../junk" install
-)
-
-# Build zip/unzip for Firefox's sole use.
-for f in zip unzip; do (
-    cd "$f"
-
-    make \
-        CC="$CC $CFLAGS $CXXFLAGS" \
-        -f unix/Makefile generic
-
-    make \
-        prefix="$PWD/../junk" \
-        -f unix/Makefile install
-) done
-
-export PATH="$PWD/junk/bin:$PATH"
-
-for p in \
-    audioipc \
-    audioipc-client \
-    audioipc-server
-do
-    sed 's/\("files":{\)[^}]*/\1/' \
-        "third_party/rust/$p/.cargo-checksum.json" > _
-    mv -f _ "third_party/rust/$p/.cargo-checksum.json"
-done
+sed '/UNZIP/d' toolkit/moz.configure > _
+mv -f _ toolkit/moz.configure

 # If using libc++, CXXSTDLIB needs to be set manually.
 case $("$CC" -print-file-name=libc++.so) in */*)
@ -53,6 +19,7 @@ export CXXFLAGS="$CXXFLAGS -w"
 # change them to relative paths ($PWD/... ./...).
 export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix=$PWD=."

+export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox,--enable-new-dtags"
 export RUSTFLAGS="$RUSTFLAGS -Cdebuginfo=0"
 export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 export MOZ_DEBUG_FLAGS=-g0
@ -71,14 +38,15 @@ ac_add_options --enable-install-strip
 ac_add_options --enable-official-branding
 ac_add_options --enable-application=browser
 ac_add_options --enable-optimize
-ac_add_options --with-system-libvpx
 ac_add_options --with-system-ffi
-ac_add_options --with-system-png
 ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-pixman
-ac_add_options --with-system-nss
+ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-pixman
+ac_add_options --with-system-png
+ac_add_options --with-system-webp
+ac_add_options --with-system-zlib
 ac_add_options --without-wasm-sandboxed-libraries
 ac_add_options --disable-eme
 ac_add_options --disable-dbus
@ -105,12 +73,4 @@ EOF
 rm -rf \
    "$1/usr/include" \
    "$1/usr/lib/firefox-devel" \
-    "$1/usr/share/idl" \
-    "$1/usr/lib/firefox/browser/features/fxmonitor@mozilla.org.xpi" \
-    "$1/usr/lib/firefox/browser/features/screenshots@mozilla.org.xpi" \
-    "$1/usr/lib/firefox/browser/features/webcompat-reporter@mozilla.org.xpi" \
-    "$1/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi" \
-    "$1/usr/lib/firefox/browser/features/doh-rollout@mozilla.org.xpi"
-
-rm "$1/usr/bin/firefox"
-cp firefox.sh "$1/usr/bin/firefox"
+    "$1/usr/share/idl"
--- a/extra/firefox/checksums
+++ b/extra/firefox/checksums
@ -1,10 +1,6 @@
-72bba06f04e7745f6b02951906413eb1c15a7e253e06e373302162c6219f286a
-3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
-f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
-036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37
+2b5becbb89aa2b2007ba8c86ad517aeae1b54904d007d9d3acbf054be6a0ed62
 ba6e380bc3d2cbd1b3a505ab97687498335c334d8a4be7f465ad30ee366806c7
 86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b
-bed3f4e39dcb8065dba174d37fb15f2a75887a6dd7ce6b872e5ab287c8bc386f
+42d489e60eae7d2807ef109a4eb1dd3d0e52e8ea9a8a19074495453e588f0625
 4a232e3aa3973894a58c126b9e901c924d4e1ca3e00c4fc82d08de4b880183a9
 ed51ce8a6730c489ea9dda354f02c579fb3632925096a0260bfae7a6b82ceace
-a68295affbd2c9abac063127bba06e50d007a6a0f2fad9ec30aa5a841e521bb5
--- a/extra/firefox/depends
+++ b/extra/firefox/depends
@ -15,6 +15,7 @@ libffi
 libjpeg-turbo
 libpng
 libvpx
+libwebp
 llvm          make
 m4            make
 mesa
--- a/extra/firefox/files/firefox.sh
+++ b/extra/firefox/files/firefox.sh
@ -1,4 +0,0 @@
-#!/bin/sh
-
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/firefox"
-exec /usr/lib/firefox/firefox
--- a/extra/firefox/patches/no-dbus.patch
+++ b/extra/firefox/patches/no-dbus.patch
@ -1,33 +1,3 @@
-diff -r fc5ee47dac3e third_party/rust/audioipc-client/Cargo.toml
--- a/third_party/rust/audioipc-client/Cargo.toml	Tue Jun 28 12:00:27 2022 -0500
-+++ b/third_party/rust/audioipc-client/Cargo.toml	Thu Jun 30 00:35:24 2022 -0500
-@@ -19,3 +19,5 @@
- 
- [dependencies.audio_thread_priority]
- version = "0.26.1"
-+default_features = false
-+features = ["winapi"]
-diff -r fc5ee47dac3e third_party/rust/audioipc-server/Cargo.toml
--- a/third_party/rust/audioipc-server/Cargo.toml	Tue Jun 28 12:00:27 2022 -0500
-+++ b/third_party/rust/audioipc-server/Cargo.toml	Thu Jun 30 00:35:24 2022 -0500
-@@ -24,3 +24,5 @@
- 
- [dependencies.audio_thread_priority]
- version = "0.26.1"
-+default_features = false
-+features = ["winapi"]
-diff -r fc5ee47dac3e third_party/rust/audioipc/Cargo.toml
--- a/third_party/rust/audioipc/Cargo.toml	Tue Jun 28 12:00:27 2022 -0500
-+++ b/third_party/rust/audioipc/Cargo.toml	Thu Jun 30 00:35:24 2022 -0500
-@@ -30,6 +30,8 @@
- 
- [target.'cfg(target_os = "linux")'.dependencies.audio_thread_priority]
- version = "0.26.1"
-+default_features = false
-+features = ["winapi"]
- 
- [target.'cfg(windows)'.dependencies]
- mio = "0.6.19"
 diff -r fc5ee47dac3e toolkit/components/remote/moz.build
 --- a/toolkit/components/remote/moz.build	Tue Jun 28 12:00:27 2022 -0500
 +++ b/toolkit/components/remote/moz.build	Thu Jun 30 00:35:24 2022 -0500
--- a/extra/firefox/sources
+++ b/extra/firefox/sources
@ -1,10 +1,6 @@
 https://ftp.mozilla.org/pub/firefox/releases/VERSION/source/firefox-VERSION.source.tar.xz
-https://github.com/yasm/yasm/releases/download/v1.3.0/yasm-1.3.0.tar.gz yasm
-https://fossies.org/linux/misc/zip30.tar.gz zip
-https://fossies.org/linux/misc/unzip60.tar.gz unzip
 patches/fix-clang-as.patch
 patches/fix-linux-header.patch
 patches/no-dbus.patch
 patches/no-fribidi.patch
 patches/no-perl.patch
-files/firefox.sh
--- a/extra/firefox/version
+++ b/extra/firefox/version
@ -1 +1 @@
-104.0.2 1
+105.0 1
 @ -1 +1 @@
 .0.2 1
 .0 1