commit c7c96777831e9f206577d3fc635b1bc00a7d9dc8 Author: John McQuah <jmcquah@disroot.org> Date: Mon Jun 26 06:44:35 2023 -0400 firefox: 113.0.2 -> 114.0.2 diff --git a/firefox/.footprint b/firefox/.footprint index 3059f862b..34dc05abd 100644 --- a/firefox/.footprint +++ b/firefox/.footprint @@ -45,4 +45,4 @@ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ -rw-r--r-- root/root usr/share/applications/firefox.desktop drwxr-xr-x root/root usr/share/pixmaps/ -lrwxrwxrwx root/root usr/share/pixmaps/firefox_default48.png -> /usr/lib/firefox/browser/chrome/icons/default/default48.png +lrwxrwxrwx root/root usr/share/pixmaps/firefox.png -> /usr/lib/firefox/browser/chrome/icons/default/default48.png diff --git a/firefox/.signature b/firefox/.signature index e3fccaa36..84e01669f 100644 --- a/firefox/.signature +++ b/firefox/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39ENX4FcW6bFMQLPxhRTLX6Kzcx6H+vio6TljGPQxDOXSy1EcyRe3OqtAnNMj5VUcOf8p6Vj7Eg92PS/UKUgZAY= -SHA256 (Pkgfile) = c2c1073f76ed336ec06965efbea870f83643a5f07aff0789e8c9868be93f1d06 -SHA256 (.footprint) = c8226cc240304363b6289982601426f70c5cd4e82ac62feff3485bee4f48e050 -SHA256 (firefox-113.0.2.source.tar.xz) = f132b702836311b6cc40873b69df3ce208d035dbc8ce390c390eebd63d27c7a3 -SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91 +RWSagIOpLGJF30RpQm9Mz7sRRM21MP0P7AzuKSqIZKjZWRWZLIW+X2h8MePkmZuEBe3PdFP47breSqrLocMNTLYhk3o9OY0bVAM= +SHA256 (Pkgfile) = 88d21c971a9a3334d9d7d4e39abaee3854320b1334e99ccbc05e6e1f4a13e0b1 +SHA256 (.footprint) = d932c0f2d873abbf10fe3fd1a0d1dd95bf413717d06238eae7d85e86637aae53 +SHA256 (firefox-114.0.2.source.tar.xz) = aa602032f0b7065b743ba7fabf96714398aba538bcc017a4b0fff556dc69f8fe +SHA256 (firefox.desktop) = 05bd1a4e283bc68f525f87cabf35ad0a59e5e63e107ce3901a4ac73e3d16ef33 SHA256 (node-stdout-nonblocking-wrapper) = bb8c503015e49ed1b152225bdc56cf502cd831f35962d113dcbb9121967f3523 diff --git a/firefox/Pkgfile b/firefox/Pkgfile index 168cba0ec..fb9376b77 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -1,11 +1,11 @@ # Description: The Mozilla Firefox browser with Alsa support # URL: https://www.mozilla.com/firefox/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: aom autoconf-2.13 brotli cbindgen dav1d dbus-glib ffmpeg graphite2 libevent libnotify libvpx libwebp libxkbcommon lld nodejs nss pulseaudio unzip wasi-libc++ xorg-libxcomposite xorg-libxcursor xorg-libxinerama xorg-libxt zip -# Optional: sccache jack pipewire +# Depends on: aom autoconf-2.13 brotli cbindgen dav1d dbus-glib ffmpeg graphite2 libevent libnotify libvpx libwebp libxkbcommon nodejs nss pulseaudio unzip xorg-libxcomposite xorg-libxcursor xorg-libxinerama xorg-libxt zip +# Optional: sccache lld wasi-libc++ alsa-lib jack pipewire name=firefox -version=113.0.2 +version=114.0.2 release=1 source=(https://archive.mozilla.org/pub/firefox/releases/$version/source/$name-$vers... firefox.desktop @@ -22,19 +22,22 @@ build() { # patch -p1 -i $p #done + local clangVer=$(/usr/bin/clang -dumpversion) + local cruxVer=$(/usr/bin/crux | cut -d' ' -f3) + if [ "$(/usr/bin/python3 -c "import sys; print(sys.stdout.encoding)")" != 'utf-8' ]; then printf "\e[031mError: set an UTF-8 locale to compile this!\033[0m\n" exit 1 fi if [ -e '/usr/bin/ccache' ]; then - export OS_CCACHE_COMPILERCHECK="$(/usr/bin/clang -dumpversion | sed -z 's/\n/ /g'; crux | cut -d' ' -f3)" + export OS_CCACHE_COMPILERCHECK="$clangVer $cruxVer" export CCACHE_COMPILERCHECK="string:$OS_CCACHE_COMPILERCHECK" PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//') fi prt-get isinst sccache && export RUSTC_WRAPPER='/usr/bin/sccache' - mkdir "$PKGMK_SOURCE_DIR/rust" || true + mkdir -p "$PKGMK_SOURCE_DIR/rust" export CARGO_HOME="$PKGMK_SOURCE_DIR/rust" cat <<- EOF > .mozconfig @@ -62,10 +65,8 @@ cat <<- EOF > .mozconfig ac_add_options --enable-release ac_add_options --enable-rust-simd ac_add_options --enable-sandbox - ac_add_options --disable-debug-symbols ac_add_options --enable-official-branding ac_add_options --with-distribution-id=nu.crux - ac_add_options --enable-linker=lld ac_add_options --enable-lto=thin ac_add_options --disable-tests ac_add_options --disable-debug-symbols @@ -85,10 +86,20 @@ EOF echo 'ac_add_options --enable-default-toolkit=cairo-gtk3-wayland' >> .mozconfig || \ echo 'ac_add_options --enable-default-toolkit=cairo-gtk3' >> .mozconfig + # use gold linker, if present + prt-get isinst lld && \ + { echo 'ac_add_options --enable-linker=lld' >> .mozconfig; + export LDFLAGS+=" -Wl,--thinlto-jobs=$((JOBS / 2))"; } || \ + echo 'ac_add_options --enable-linker=bfd' >> .mozconfig + + # sandboxed web apps + [ -e /usr/lib/clang/${clangVer%%.*}/lib/wasi/libclang_rt.builtins-wasm32.a ] \ + || echo 'ac_add_options --without-wasm-sandboxed-libraries' >> .mozconfig + [[ -e '/usr/bin/ccache' ]] && echo 'ac_add_options --enable-ccache' >> .mozconfig export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib RUSTFLAGS="-C opt-level=2 $RUSTFLAGS" - export MOZ_MAKE_FLAGS="-j ${JOBS-1}" LDFLAGS+=" -Wl,--thinlto-jobs=$((JOBS / 2))" + export MOZ_MAKE_FLAGS="-j ${JOBS-1}" export MOZBUILD_STATE_PATH="$SRC"/mozbuild # Disable notification when build system has finished @@ -118,7 +129,7 @@ EOF DESTDIR=$PKG ./mach install install -d $PKG/usr/share/pixmaps - ln -s /usr/lib/firefox/browser/chrome/icons/default/default48.png $PKG/usr/share/pixmaps/firefox_default48.png + ln -s /usr/lib/firefox/browser/chrome/icons/default/default48.png $PKG/usr/share/pixmaps/firefox.png install -D -m 0644 $SRC/firefox.desktop $PKG/usr/share/applications/firefox.desktop # Remove crap rm -r $PKG/usr/lib/firefox/browser/features diff --git a/firefox/firefox.desktop b/firefox/firefox.desktop index 813f693f8..42df7a1bb 100644 --- a/firefox/firefox.desktop +++ b/firefox/firefox.desktop @@ -1,8 +1,11 @@ [Desktop Entry] Name=Firefox -Comment=Browser -Exec=firefox -Icon=firefox_default48.png +Name[en_US]=Firefox +GenericName=Web Browser +GenericName[en_US]=Web Browser +Comment=Free web browser from Mozilla +Exec=firefox %U Terminal=false Type=Application -Categories=Application;Network; +Icon=firefox +Categories=Network;