From f04be0c3782eab77061786ffa7a2feee219653df Mon Sep 17 00:00:00 2001 From: hawkeye116477 Date: Thu, 14 Nov 2024 22:23:59 +0100 Subject: [PATCH] Fix Focal build --- waterfox/build.sh | 6 +++++- waterfox/control | 2 +- waterfox/patches/fix-wayland-build.patch | 21 --------------------- waterfox/patches/series | 1 - waterfox/waterfox.dsc | 2 +- 5 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 waterfox/patches/fix-wayland-build.patch diff --git a/waterfox/build.sh b/waterfox/build.sh index 0418b36..e90fdb0 100755 --- a/waterfox/build.sh +++ b/waterfox/build.sh @@ -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 diff --git a/waterfox/control b/waterfox/control index b6e88b5..da00a4f 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), 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/ diff --git a/waterfox/patches/fix-wayland-build.patch b/waterfox/patches/fix-wayland-build.patch deleted file mode 100644 index f0309fa..0000000 --- a/waterfox/patches/fix-wayland-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Fix FTBFS on bionic. Compiler errors: - In file included from Unified_cpp_widget_gtk1.cpp:2: - /<>/firefox-92.0~b2+build1/widget/gtk/WaylandBuffer.cpp:261:39: error: unknown type name 'GLContext'; did you mean 'EGLContext'? - const LayoutDeviceIntSize& aSize, GLContext* aGL) { - ^~~~~~~~~ - -Author: Rico Tzschichholz - -diff --git a/widget/gtk/WaylandBuffer.cpp b/widget/gtk/WaylandBuffer.cpp -index f3fc4093623f..78d213d5d302 100644 ---- a/widget/gtk/WaylandBuffer.cpp -+++ b/widget/gtk/WaylandBuffer.cpp -@@ -197,7 +197,7 @@ void WaylandBufferSHM::DumpToFile(const char* aHint) { - - /* static */ - RefPtr WaylandBufferDMABUF::Create( -- const LayoutDeviceIntSize& aSize, GLContext* aGL) { -+ const LayoutDeviceIntSize& aSize, gl::GLContext* aGL) { - RefPtr buffer = new WaylandBufferDMABUF(aSize); - - const auto flags = diff --git a/waterfox/patches/series b/waterfox/patches/series index 2241ecc..55dcd08 100644 --- a/waterfox/patches/series +++ b/waterfox/patches/series @@ -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 diff --git a/waterfox/waterfox.dsc b/waterfox/waterfox.dsc index b06c710..55b874f 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), 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: