From 5e630fd7583aaa9251d340bd35affa2e18705bdf Mon Sep 17 00:00:00 2001 From: hawkeye116477 Date: Fri, 15 Nov 2024 17:43:08 +0100 Subject: [PATCH] Try fix for Focal --- waterfox/build.sh | 2 +- waterfox/control | 2 +- waterfox/waterfox.dsc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/waterfox/build.sh b/waterfox/build.sh index 31378c3..4a980db 100755 --- a/waterfox/build.sh +++ b/waterfox/build.sh @@ -27,7 +27,7 @@ fi # For successfull LTO build, we need to use matching LLVM version if test `lsb_release -sc` = "focal"; then -export PATH=/usr/lib/llvm-17/bin/:/usr/lib/rust-1.80/bin/:$PATH +export PATH=/usr/lib/llvm-17/bin/:/usr/lib/rust-1.80/bin/:/usr/lib/gcc/x86_64-linux-gnu/10/:$PATH fi if test `lsb_release -sc` = "jammy" || test `lsb_release -sc` = "buster" || test `lsb_release -sc` = "bullseye" || test `lsb_release -sc` = "bookworm"; then diff --git a/waterfox/control b/waterfox/control index 6b5e101..d9bda0b 100644 --- a/waterfox/control +++ b/waterfox/control @@ -2,7 +2,7 @@ Source: waterfox Section: web Priority: optional Maintainer: hawkeye116477 -Build-Depends: debhelper (>= 9), libgtk-3-dev, libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm, build-essential, libxt-dev, python3 (>= 3.7) | python3.7, zip, unzip, cargo (>= 0.78) | cargo-1.80, libgl1-mesa-dev, binutils-avr, clang (>= 5.0) | clang-14 | clang-15 | clang-16 | clang-17 | clang-19, llvm-dev (>= 5.0) | llvm-14-dev | llvm-15-dev | llvm-16-dev | llvm-17-dev | llvm-19-dev, lld (>= 5.0) | lld-14 | lld-15 | lld-16 | lld-17 | lld-19, rustc (>= 1.78.0~) | rustc-1.80, libxext-dev, libglib2.0-dev, libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev, libevent-dev, libjsoncpp-dev, xfonts-base, xauth, lsb-release, cbindgen (>= 0.26.0~), nodejs (>= 12.22.1) | nodejs-mozilla (>= 12.22.1), libjack-dev, nasm (>= 2.14) | nasm-mozilla (>= 2.14), libclang-dev (>= 5.0) | libclang-14-dev | libclang-15-dev | libclang-16-dev | libclang-17-dev | libclang-19-dev, libclang-rt-dev | libclang-rt-15-dev | libclang-rt-16-dev | libclang-rt-17-dev | libclang-rt-19-dev, libstdc++6 (>= 7.0) | gcc-mozilla (>= 7), bc, libpci-dev, python3-distutils | python3-setuptools, python3-typing-extensions +Build-Depends: debhelper (>= 9), libgtk-3-dev, libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm, build-essential, libxt-dev, python3 (>= 3.7) | python3.7, zip, unzip, cargo (>= 0.78) | cargo-1.80, libgl1-mesa-dev, binutils-avr, clang (>= 5.0) | clang-14 | clang-15 | clang-16 | clang-17 | clang-19, llvm-dev (>= 5.0) | llvm-14-dev | llvm-15-dev | llvm-16-dev | llvm-17-dev | llvm-19-dev, lld (>= 5.0) | lld-14 | lld-15 | lld-16 | lld-17 | lld-19, rustc (>= 1.78.0~) | rustc-1.80, libxext-dev, libglib2.0-dev, libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev, libevent-dev, libjsoncpp-dev, xfonts-base, xauth, lsb-release, cbindgen (>= 0.26.0~), nodejs (>= 12.22.1) | nodejs-mozilla (>= 12.22.1), libjack-dev, nasm (>= 2.14) | nasm-mozilla (>= 2.14), libclang-dev (>= 5.0) | libclang-14-dev | libclang-15-dev | libclang-16-dev | libclang-17-dev | libclang-19-dev, libclang-rt-dev | libclang-rt-15-dev | libclang-rt-16-dev | libclang-rt-17-dev | libclang-rt-19-dev, libstdc++6 (>= 7.0) | gcc-10, bc, libpci-dev, python3-distutils | python3-setuptools, python3-typing-extensions Standards-Version: 3.9.7 Homepage: https://www.waterfox.net/ diff --git a/waterfox/waterfox.dsc b/waterfox/waterfox.dsc index 55b874f..18744d6 100644 --- a/waterfox/waterfox.dsc +++ b/waterfox/waterfox.dsc @@ -6,7 +6,7 @@ Version: 6.5.1-0 Maintainer: hawkeye116477 Homepage: https://www.waterfox.net Standards-Version: 3.9.7 -Build-Depends: debhelper (>= 9), libgtk-3-dev, libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm, build-essential, libxt-dev, python3 (>= 3.7) | python3.7, zip, unzip, cargo (>= 0.78) | cargo-1.80, libgl1-mesa-dev, binutils-avr, clang (>= 5.0) | clang-14 | clang-15 | clang-16 | clang-17 | clang-19, llvm-dev (>= 5.0) | llvm-14-dev | llvm-15-dev | llvm-16-dev | llvm-17-dev | llvm-19-dev, lld (>= 5.0) | lld-14 | lld-15 | lld-16 | lld-17 | lld-19, rustc (>= 1.78.0~) | rustc-1.80, libxext-dev, libglib2.0-dev, libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev, libevent-dev, libjsoncpp-dev, xfonts-base, xauth, lsb-release, cbindgen (>= 0.26.0~), nodejs (>= 12.22.1) | nodejs-mozilla (>= 12.22.1), libjack-dev, nasm (>= 2.14) | nasm-mozilla (>= 2.14), libclang-dev (>= 5.0) | libclang-14-dev | libclang-15-dev | libclang-16-dev | libclang-17-dev | libclang-19-dev, libclang-rt-dev | libclang-rt-15-dev | libclang-rt-16-dev | libclang-rt-17-dev | libclang-rt-19-dev, libstdc++6 (>= 7.0) | gcc-mozilla (>= 7), bc, libpci-dev, python3-distutils | python3-setuptools, python3-typing-extensions +Build-Depends: debhelper (>= 9), libgtk-3-dev, libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm, build-essential, libxt-dev, python3 (>= 3.7) | python3.7, zip, unzip, cargo (>= 0.78) | cargo-1.80, libgl1-mesa-dev, binutils-avr, clang (>= 5.0) | clang-14 | clang-15 | clang-16 | clang-17 | clang-19, llvm-dev (>= 5.0) | llvm-14-dev | llvm-15-dev | llvm-16-dev | llvm-17-dev | llvm-19-dev, lld (>= 5.0) | lld-14 | lld-15 | lld-16 | lld-17 | lld-19, rustc (>= 1.78.0~) | rustc-1.80, libxext-dev, libglib2.0-dev, libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev, libevent-dev, libjsoncpp-dev, xfonts-base, xauth, lsb-release, cbindgen (>= 0.26.0~), nodejs (>= 12.22.1) | nodejs-mozilla (>= 12.22.1), libjack-dev, nasm (>= 2.14) | nasm-mozilla (>= 2.14), libclang-dev (>= 5.0) | libclang-14-dev | libclang-15-dev | libclang-16-dev | libclang-17-dev | libclang-19-dev, libclang-rt-dev | libclang-rt-15-dev | libclang-rt-16-dev | libclang-rt-17-dev | libclang-rt-19-dev, libstdc++6 (>= 7.0) | gcc-10, bc, libpci-dev, python3-distutils | python3-setuptools, python3-typing-extensions Package-List: waterfox deb web optional arch=any Files: