commit 726be2f96272a64802af47ce3d29c9ee879b7df4 Author: John McQuah <jmcquah@disroot.org> Date: Thu Aug 17 09:20:26 2023 -0400 firefox: 116.0.2 -> 116.0.3 deleted pkg-config wrapper diff --git a/firefox/.signature b/firefox/.signature index f3e57e45a..4eccd3ba1 100644 --- a/firefox/.signature +++ b/firefox/.signature @@ -1,8 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zGCQ9BldHEOYtOQRKpuG+vDfWFSuPXNVwL2j/Hc1rAb4S/elss1R9jdhChECh7cvadIqW2wcIl1r6U2y5P/nAY= -SHA256 (Pkgfile) = 6d93fcf8cc7ce7f2546e3c76c0ab7184f4cb8a89f31830316b887084641b1a6a +RWSagIOpLGJF36K2Dk7f2Fx38CGOtLH3e0x6Z+JmyyeYCIYps4w5d28WFbbMTZIv62JBowgWINcGEfSpSCgb59ESSReCd5cHrwo= +SHA256 (Pkgfile) = 70c7c333ff84d8b36d977d50f4b61c92128711858182c7af99adc7b230fad342 SHA256 (.footprint) = d932c0f2d873abbf10fe3fd1a0d1dd95bf413717d06238eae7d85e86637aae53 -SHA256 (firefox-116.0.2.source.tar.xz) = 6708ab24a748de336aff4789f97f248452a46117e86bb6b4b9746768e52fb114 +SHA256 (firefox-116.0.3.source.tar.xz) = 575a0d11b487a03527cc90c5e6d556c09669201cbb584b73442b202ee1d3e2e6 SHA256 (firefox.desktop) = 05bd1a4e283bc68f525f87cabf35ad0a59e5e63e107ce3901a4ac73e3d16ef33 -SHA256 (pkg-config-wrapper) = 2531e5dcceb9464d0425935a7fac23d6d4cf6cdedafe8c44cf322371944fb3f4 SHA256 (node-stdout-nonblocking-wrapper) = bb8c503015e49ed1b152225bdc56cf502cd831f35962d113dcbb9121967f3523 diff --git a/firefox/Pkgfile b/firefox/Pkgfile index ccc518f88..86dedcd53 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -5,11 +5,10 @@ # Optional: apulse jack pulseaudio pipewire sndio sccache lld wasi-libc++ wayland name=firefox -version=116.0.2 +version=116.0.3 release=1 source=(https://ftp.mozilla.org/pub/firefox/releases/${version}/source/$name-${version}.source.tar.xz firefox.desktop - pkg-config-wrapper node-stdout-nonblocking-wrapper) build() { @@ -30,7 +29,6 @@ build() { cat <<- EOF > .mozconfig export NODEJS="$SRC/node-stdout-nonblocking-wrapper" - export PKG_CONFIG="$SRC/pkg-config-wrapper" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared unset MOZ_TELEMETRY_REPORTING ac_add_options --prefix=/usr diff --git a/firefox/pkg-config-wrapper b/firefox/pkg-config-wrapper deleted file mode 100755 index cdacbc95c..000000000 --- a/firefox/pkg-config-wrapper +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# -# pkgconf complains when given multiple arguments to a modversion query. -# https://github.com/pkgconf/pkgconf/issues/310 -# At least in this source tree, the expected (pkg-config-compatible) result -# can be reproduced by ignoring all but the first argument. - -if [ "$1" = "--modversion" ] && [ "$#" -gt 2 ]; then - /usr/bin/pkgconf --modversion "$2" -else - /usr/bin/pkgconf "$@" -fi