Fix Linux Builds (#4) (#447)

* Fix Linux ARM Builds (#4)

* linux fix

* platform specific sqlite dependency

* linux symlink

---------

Co-authored-by: Ubuntu <ubuntu@ip-172-31-25-90.us-east-2.compute.internal>

* symlinks for all linux archs

---------

Co-authored-by: Ubuntu <ubuntu@ip-172-31-25-90.us-east-2.compute.internal>

Author: icepaq

Dockerfile

@@ -13,6 +13,8 @@ RUN apt-get update && apt-get install -y \
     python3 python3-dev python3-pip \
     # Camoufox build system tools
     git p7zip-full golang-go aria2 curl rsync \
+    # Platform-specific libraries for Linux builds
+    libsqlite3-dev \
     # CA certificates
     ca-certificates \
     && update-ca-certificates

Makefile

@@ -4,9 +4,9 @@ export
 cf_source_dir := camoufox-$(version)-$(release)
 ff_source_tarball := firefox-$(version).source.tar.xz
 
-debs := python3 python3-dev python3-pip p7zip-full golang-go msitools wget aria2
-rpms := python3 python3-devel p7zip golang msitools wget aria2
-pacman := python python-pip p7zip go msitools wget aria2
+debs := python3 python3-dev python3-pip p7zip-full golang-go msitools wget aria2 libsqlite3-dev
+rpms := python3 python3-devel p7zip golang msitools wget aria2 sqlite-devel
+pacman := python python-pip p7zip go msitools wget aria2 sqlite
 
 .PHONY: help fetch setup setup-minimal clean set-target distclean build package \
         build-launcher check-arch revert edits run bootstrap mozbootstrap dir \

multibuild.py

@@ -19,6 +19,7 @@
 import argparse
 import glob
 import os
+from pathlib import Path
 import sys
 from dataclasses import dataclass
 from typing import List
@@ -29,6 +30,28 @@
 AVAILABLE_ARCHS = ["x86_64", "arm64", "i686"]
 
 
+def setup_linux_sysroots():
+    """
+    Set up symlinks required for Linux cross-compilation.
+    The sysroots may be missing the libsqlite3.so symlink needed for linking.
+    """
+    mozbuild = Path.home() / '.mozbuild'
+    sysroots = [
+        ('sysroot-aarch64-linux-gnu', 'aarch64-linux-gnu'),
+        ('sysroot-x86_64-linux-gnu', 'x86_64-linux-gnu'),
+        ('sysroot-i686-linux-gnu', 'i686-linux-gnu'),
+    ]
+
+    for sysroot_name, lib_arch in sysroots:
+        sysroot_lib = mozbuild / sysroot_name / 'usr' / 'lib' / lib_arch
+        sqlite_so = sysroot_lib / 'libsqlite3.so'
+        sqlite_so_0 = sysroot_lib / 'libsqlite3.so.0'
+
+        if sysroot_lib.exists() and sqlite_so_0.exists() and not sqlite_so.exists():
+            print(f"Creating libsqlite3.so symlink in {sysroot_lib}")
+            sqlite_so.symlink_to('libsqlite3.so.0')
+
+
 def run(cmd, exit_on_fail=True):
     print(f'\n------------\n{cmd}\n------------\n')
     retval = os.system(cmd)
@@ -131,6 +154,10 @@ def main():
     # Ensure dist directory exists
     os.makedirs('dist', exist_ok=True)
 
+    # Set up Linux sysroot symlinks if needed
+    if 'linux' in args.target:
+        setup_linux_sysroots()
+
     # Run build
     for target in args.target:
         for arch in args.arch:

patches/playwright/0-playwright.patch

@@ -3395,15 +3395,16 @@ diff --git a/widget/headless/HeadlessCompositorWidget.cpp b/widget/headless/Head
 index bb4ee9175e..6814ae8503 100644
 --- a/widget/headless/HeadlessCompositorWidget.cpp
 +++ b/widget/headless/HeadlessCompositorWidget.cpp
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,8 @@
   * License, v. 2.0. If a copy of the MPL was not distributed with this
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
++#include "mozilla/gfx/2D.h"
 +#include "mozilla/layers/CompositorThread.h"
  #include "mozilla/widget/PlatformWidgetTypes.h"
  #include "HeadlessCompositorWidget.h"
  #include "VsyncDispatcher.h"
-@@ -15,9 +16,30 @@ HeadlessCompositorWidget::HeadlessCompositorWidget(
+@@ -15,9 +17,30 @@ HeadlessCompositorWidget::HeadlessCompositorWidget(
      const layers::CompositorOptions& aOptions, HeadlessWidget* aWindow)
      : CompositorWidget(aOptions),
        mWidget(aWindow),
@@ -3434,7 +3435,7 @@ index bb4ee9175e..6814ae8503 100644
  void HeadlessCompositorWidget::ObserveVsync(VsyncObserver* aObserver) {
    if (RefPtr<CompositorVsyncDispatcher> cvd =
            mWidget->GetCompositorVsyncDispatcher()) {
-@@ -31,6 +53,59 @@ void HeadlessCompositorWidget::NotifyClientSizeChanged(
+@@ -31,6 +54,59 @@ void HeadlessCompositorWidget::NotifyClientSizeChanged(
      const LayoutDeviceIntSize& aClientSize) {
    auto size = mClientSize.Lock();
    *size = aClientSize;