diff --git a/main/firefox-esr/.checksums b/main/firefox-esr/.checksums index 4c9784b74..dc7b797d7 100644 --- a/main/firefox-esr/.checksums +++ b/main/firefox-esr/.checksums @@ -1,3 +1,3 @@ -8cb5c0ef68fa0f93138a6196b1d5f153 firefox-102.7.0esr.source.tar.xz +2f65e84943e97f6d56d7b07aa1ded135 firefox-102.8.0esr.source.tar.xz cf6971669f70b440cb6ff8df8b2722ae firefox.desktop 7e5ffb309e779ac50dde7bf8c6f3cb56 python3.11.patch diff --git a/main/firefox-esr/.pkgfiles b/main/firefox-esr/.pkgfiles index 04d711117..f0e316d31 100644 --- a/main/firefox-esr/.pkgfiles +++ b/main/firefox-esr/.pkgfiles @@ -1,4 +1,4 @@ -firefox-esr-102.7.0-1 +firefox-esr-102.8.0-1 drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/revdep.d/ -rw-r--r-- root/root etc/revdep.d/firefox-esr.conf diff --git a/main/firefox-esr/spkgbuild b/main/firefox-esr/spkgbuild index 8c0cd618a..6e7c38c45 100755 --- a/main/firefox-esr/spkgbuild +++ b/main/firefox-esr/spkgbuild @@ -2,7 +2,7 @@ # depends : gtk3 libxt dbus-glib alsa-lib libvpx libevent nss sqlite icu unzip zip diffutils gconf python3 yasm mesa inetutils autoconf2.13 rust cbindgen nodejs nasm which clang libxcomposite name=firefox-esr -version=102.7.0 +version=102.8.0 release=1 source="https://archive.mozilla.org/pub/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz firefox.desktop @@ -12,8 +12,6 @@ source="https://archive.mozilla.org/pub/firefox/releases/${version}esr/source/fi build() { cd firefox-$version - # Python 3.11 patch - patch -Np1 -i ../python3.11.patch cat <<- EOF > .mozconfig ac_add_options --prefix=/usr @@ -49,12 +47,21 @@ cat <<- EOF > .mozconfig ac_add_options --with-distribution-id=org.venomlinux EOF - export CC=clang - export CXX=clang++ - export AR=llvm-ar - export NM=llvm-nm - export RANLIB=llvm-ranlib + # A change in cbindgen-0.24.2 causes a symbol to now be output by cbindgen, but it has already been defined in a header. + sed -i '/ROOT_CLIP_CHAIN/d' gfx/webrender_bindings/webrender_ffi.h + + # Remove an obsolete flag in python code, that has been removed in python-3.11. + grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/' + + # Fix an issue with regular expressions in python-3.11. + sed -e 's/?s)\./?s:.)/' \ + -e '/?m)/{s/?m)/?m:/;s/\$"/$)"/}' \ + -e '/?s)%/{s/?s)/?s:/;s/?"/?)"/}' \ + -i xpcom/idl-parser/xpidl/xpidl.py + + export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib + export CFLAGS="${CFLAGS} -w" CXXFLAGS="${CXXFLAGS} -w" # disable warnings export MOZ_NOSPAM=1 export MOZBUILD_STATE_PATH=$PWD/mozbuild export CARGO_HOME=$PWD/cargo