Skip to content

Commit

Permalink
Fix Focal build
Browse files Browse the repository at this point in the history
  • Loading branch information
@hawkeye116477
hawkeye116477 committed Nov 15, 2024
1 parent b67577a commit f04be0c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 25 deletions.
6 changes: 5 additions & 1 deletion waterfox/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ export NASM=/usr/lib/nasm-mozilla/bin/nasm
fi

# For successfull LTO build, we need to use matching LLVM version
if test `lsb_release -sc` = "focal" || test `lsb_release -sc` = "jammy" || test `lsb_release -sc` = "buster" || test `lsb_release -sc` = "bullseye" || test `lsb_release -sc` = "bookworm"; then
if test `lsb_release -sc` = "focal"; then
export PATH=/usr/lib/llvm-17/bin/:$PATH
fi

if test `lsb_release -sc` = "jammy" || test `lsb_release -sc` = "buster" || test `lsb_release -sc` = "bullseye" || test `lsb_release -sc` = "bookworm"; then
export PATH=/usr/lib/llvm-19/bin/:$PATH
fi

Expand Down
2 changes: 1 addition & 1 deletion waterfox/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: waterfox
Section: web
Priority: optional
Maintainer: hawkeye116477 <hawkeye116477@gmail.com>
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), 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~), 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-mozilla (>= 7), bc, libpci-dev, python3-distutils | python3-setuptools, python3-typing-extensions
Standards-Version: 3.9.7
Homepage: https://www.waterfox.net/

Expand Down
21 changes: 0 additions & 21 deletions waterfox/patches/fix-wayland-build.patch
View file

This file was deleted.

1 change: 0 additions & 1 deletion waterfox/patches/series
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ nongnome-proxies.patch -p1
mozilla-ntlm-full-path.patch -p1
libavcodec58_91.patch -p1
fix-langpack-id.patch -p1
fix-wayland-build.patch -p1
debian-hacks/Relax-nodejs-minimum-version.patch -p1
mach-depends.patch -p1
0013-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch -p1
2 changes: 1 addition & 1 deletion waterfox/waterfox.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Version: 6.5.1-0
Maintainer: hawkeye116477 <hawkeye116477@gmail.com>
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), 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~), 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-mozilla (>= 7), bc, libpci-dev, python3-distutils | python3-setuptools, python3-typing-extensions
Package-List:
waterfox deb web optional arch=any
Files:
Expand Down

0 comments on commit f04be0c

Please sign in to comment.