commit 47cb509145e2ea368822d9d88f1444a292f344d8 Author: John McQuah <jmcquah@disroot.org> Date: Thu Aug 10 12:06:44 2023 -0400 firefox: 116.0.1 -> 116.0.2 add wrapper to fix pkgconf regression diff --git a/firefox/.signature b/firefox/.signature index e3fcef6b4..81ab190fa 100644 --- a/firefox/.signature +++ b/firefox/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39yxJEgDgH8DnIQWNA2GD/QpAYNJcQcgU6WuAytlnxs45AfiH9UL+qIYSnMnbg7ECGXji3H1aB0fJ7QyT/Tr8w0= -SHA256 (Pkgfile) = d7558748e5231c2f6e02f7e28e6ffee8e8c7da8a10abd6ade8b899758ea1eb79 +RWSagIOpLGJF3+bTv+cLULWfsFniUPdEeUdX3Ha/gq+QNx/HQeGGmADn/ntNQxkGe2soq+4AdaY1kVw/Hddx9RrCOMSCyaDmqQg= +SHA256 (Pkgfile) = 98688efcd70ee8270e4e33d57b8b5274f4e72d3b02a093768fd7605be38c74c8 SHA256 (.footprint) = d932c0f2d873abbf10fe3fd1a0d1dd95bf413717d06238eae7d85e86637aae53 -SHA256 (firefox-116.0.1.source.tar.xz) = 1f6e27954da1102bffa9d60209ab87b050efc0e5f4ef5ed1047352cb01732b50 +SHA256 (firefox-116.0.2.source.tar.xz) = 6708ab24a748de336aff4789f97f248452a46117e86bb6b4b9746768e52fb114 SHA256 (firefox.desktop) = 05bd1a4e283bc68f525f87cabf35ad0a59e5e63e107ce3901a4ac73e3d16ef33 +SHA256 (pkg-config-wrapper) = 2531e5dcceb9464d0425935a7fac23d6d4cf6cdedafe8c44cf322371944fb3f4 SHA256 (node-stdout-nonblocking-wrapper) = bb8c503015e49ed1b152225bdc56cf502cd831f35962d113dcbb9121967f3523 diff --git a/firefox/Pkgfile b/firefox/Pkgfile index ff45e9690..6a03885ab 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -5,16 +5,13 @@ # Optional: apulse jack pulseaudio pipewire sndio sccache lld wasi-libc++ wayland name=firefox -version=116.0.1 +version=116.0.2 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) -_clear_vendor_checksums() { - sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json -} - build() { cd $name-$version @@ -33,6 +30,7 @@ build() { cat <<- EOF > .mozconfig export NODEJS="$SRC/node-stdout-nonblocking-wrapper" + export PKG_CONFIG_PATH="$SRC/pkg-config-wrapper" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared unset MOZ_TELEMETRY_REPORTING ac_add_options --prefix=/usr @@ -127,7 +125,7 @@ EOF echo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}" # python/mach/mach/mixin/process.py fails to detect SHELL - export SHELL='/usr/bin/bash' + export SHELL='/bin/bash' ./mach build #./mach build toolkit/library/rust diff --git a/firefox/pkg-config-wrapper b/firefox/pkg-config-wrapper new file mode 100755 index 000000000..cdacbc95c --- /dev/null +++ b/firefox/pkg-config-wrapper @@ -0,0 +1,12 @@ +#!/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 diff --git a/wasi-compiler-rt/.signature b/wasi-compiler-rt/.signature index 605e69b0b..1b0a6a05d 100644 --- a/wasi-compiler-rt/.signature +++ b/wasi-compiler-rt/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zUnP+yeKlNSe9q9C8HLem4uYy/LXQxlqmsB63MV2qU70T/A0p+Qw59qpEfXYM7cw+RPPpHqPqfT6y6D/lbGYA0= -SHA256 (Pkgfile) = 4ae452f2377dfe0c39efc09444223ad6e4c9473ea996af86ca74fb088960aad1 +RWSagIOpLGJF39bPqazqWSlaleH2nOWaN6gnZT2BOiqSh2WU88lzYxseOBegbG0l8mq0OpPo0s3FJDMsmMub4QBLuTxukXkcrgM= +SHA256 (Pkgfile) = 784b100d77c5e0f2f8af6e17cb75d25e8c473d4ed2d5222b01dd170f49a31b7b SHA256 (.footprint) = b04b6aaa855d88e034478d7aed48ddc83b788c5e37dce85483285d832c24f666 SHA256 (compiler-rt-16.0.6.src.tar.xz) = 7911a2a9cca10393a17f637c01a6f5555b0a38f64ff47dc9168413a4190bc2db SHA256 (llvm-16.0.6.src.tar.xz) = e91db44d1b3bb1c33fcea9a7d1f2423b883eaa9163d3d56ca2aa6d2f0711bc29 diff --git a/wasi-compiler-rt/Pkgfile b/wasi-compiler-rt/Pkgfile index 5f1fd2016..1ba01c23f 100644 --- a/wasi-compiler-rt/Pkgfile +++ b/wasi-compiler-rt/Pkgfile @@ -1,6 +1,6 @@ # Description: WASI LLVM compiler runtime # URL: https://compiler-rt.llvm.org/ -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: wasi-libc name=wasi-compiler-rt diff --git a/wasi-libc++/.signature b/wasi-libc++/.signature index a15e073de..4305248e8 100644 --- a/wasi-libc++/.signature +++ b/wasi-libc++/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35sglHvv5fR92GaNiuaf8IV6W6AbH+g1PHvYdoxaT9FBZRnlLZtc5HS5YtidVbH3JO8UMrrGgFTNMmJxXtNsjgU= -SHA256 (Pkgfile) = 7f906c579509fe3ce15a43bd69fdaf83ec3009707791d6e4b47014b8784acbfb +RWSagIOpLGJF3/b8iLUvBnnPufABMSwuCXD+rPU+O3pu0D0M4qO+cyXHlxwgyz35UDxQngCbm9Nv3DFyyBVTvxaXCWUN1zXxmAk= +SHA256 (Pkgfile) = 1e08aeb33f388b88258a4c572e8b110dad93c5bb7061c8095439c4cea8093e09 SHA256 (.footprint) = 5cfabe7f867bee3ee87f468653b346524064a4dec199cff3d7a6f1e4d4c1dd1a SHA256 (llvm-project-16.0.6.src.tar.xz) = ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e SHA256 (wasi-sdk-20.tar.gz) = 28f317520d9b522134f7a014b84833d91ab1329fbd697bad05aa4fcfa2746c83 diff --git a/wasi-libc++/Pkgfile b/wasi-libc++/Pkgfile index 4782bbabd..5ef4aad35 100644 --- a/wasi-libc++/Pkgfile +++ b/wasi-libc++/Pkgfile @@ -1,6 +1,6 @@ # Description: WASI libc++ implementation for WebAssembly # URL: https://libcxx.llvm.org/ -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: clang wasi-libc wasi-compiler-rt name=wasi-libc++ diff --git a/wasi-libc/.signature b/wasi-libc/.signature index 5d0968561..6f83fe460 100644 --- a/wasi-libc/.signature +++ b/wasi-libc/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36I57LfxL/uI4/v96XEfeBcC/TlBy82XaWFFdBQ3uPTvI7lQs5lvSJ6PxnXrl1rK14hU2uHoV48rHl76ZSZ5Rgo= -SHA256 (Pkgfile) = c364273a108111d2c7129a8b47a0b28e4825e9cfc0423ba21ac5939088d7b40c +RWSagIOpLGJF3xrjjc9prM3Imsv2kDDHgCC4wNA7zosuHRHsCyLf8rwA2zs6L7U3WVen/nA+MgwbFfAEuO0EzWgdqBUlK9/SFwk= +SHA256 (Pkgfile) = 23af17f90f5290072eb05312cba94b75f718676a1d4fde7f7ce00c1e202c898a SHA256 (.footprint) = c0628cc7294ebe05a3a7f4c43cffc9aa31ac513281cccbd92ba96f4f9c9ea87b SHA256 (wasi-libc-0.20230621.tar.gz) = a2396373aefb407534993fa5d06f0337d952e91a0ec49d947b746e490478acca SHA256 (no-double-build.patch) = 875fd0131997dfdec737ba7a2df93d6d243def5ad0b60aac6d48fab9c902b464 diff --git a/wasi-libc/Pkgfile b/wasi-libc/Pkgfile index 831054edd..9a189a3e4 100644 --- a/wasi-libc/Pkgfile +++ b/wasi-libc/Pkgfile @@ -1,6 +1,6 @@ # Description: WASI libc implementation for WebAssembly # URL: https://github.com/WebAssembly/wasi-libc -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: clang name=wasi-libc