Compare commits
65 Commits
Author | SHA1 | Date |
---|---|---|
Dominika | 8cc38aced8 | |
Dominika | 03dd51e472 | |
Dominika | 2a7c8af65f | |
Dominika Liberda | 0be3fe7abb | |
Dominika Liberda | fbd1ebe106 | |
Dominika Liberda | ddf182b041 | |
Dominika Liberda | d4f2fc5f6f | |
Dominika Liberda | 367999d9a9 | |
Dominika Liberda | a3db9047d0 | |
Dominika Liberda | b589bdd92a | |
Dominika Liberda | 1bfe6ab98e | |
Dominika Liberda | 894ee2dd85 | |
Dominika Liberda | 12fe44f097 | |
Dominika Liberda | ce9f7d7639 | |
Dominika Liberda | 97a8e62e94 | |
Dominika Liberda | 99b0e85392 | |
Dominika Liberda | d92750f28f | |
Dominika Liberda | 10612c8cc3 | |
Dominika Liberda | 83a6751e80 | |
Dominika Liberda | e7d4305a04 | |
Dominika Liberda | 7c105c8ecb | |
Dominika Liberda | b508fc9d0a | |
Dominika Liberda | bb26234350 | |
Dominika Liberda | 93b98fdacd | |
Dominika Liberda | acb29bc4e6 | |
Dominika Liberda | 144a9f1793 | |
Dominika Liberda | 2323842987 | |
Dominika Liberda | a6fa2867ae | |
Dominika Liberda | 52b2c8e955 | |
Dominika Liberda | 5d0e25f3ca | |
Dominika Liberda | a4d819e2dd | |
Dominika Liberda | 7b1fba588c | |
Dominika Liberda | 8bcd7a17f2 | |
Dominika Liberda | b0a21ef9df | |
Dominika Liberda | a52f076e10 | |
Dominika Liberda | e3e49a7da2 | |
Dominika Liberda | 6df64d7560 | |
Dominika Liberda | df3ba5ff49 | |
Dominika Liberda | e057b7c338 | |
Dominika Liberda | bd5a61ad49 | |
Dominika Liberda | 61ef268cd7 | |
Dominika Liberda | e14993de88 | |
Dominika Liberda | cc4f1b7473 | |
Dominika Liberda | ca6bad6d04 | |
Dominika Liberda | d537748ea7 | |
Dominika Liberda | 33a9b396e0 | |
Dominika Liberda | 90f0e69652 | |
Dominika Liberda | 59d553962e | |
Dominika Liberda | aeac987294 | |
Dominika Liberda | e90b3739b2 | |
Dominika Liberda | a03a53c794 | |
Dominika Liberda | f0241fda8f | |
Dominika Liberda | 0526013cdc | |
ohfp | d56b020e95 | |
ohfp | 434858650e | |
ohfp | 17e1d6daf7 | |
ohfp | 26d33367db | |
ohfp | ad9c9ecad4 | |
ohfp | f34e124596 | |
ohfp | bb4d2b8c3b | |
ohfp | abb2956b6d | |
ohfp | f6ff95a833 | |
ohfp | 238b9d0c9f | |
ohfp | 56b66d16f3 | |
ohfp | f78a1c2a36 |
|
@ -9,37 +9,28 @@ variables:
|
|||
# AARCH64: $AARCH64
|
||||
# X86_64: $X86_64
|
||||
|
||||
.carch_aarch64: &carch_aarch64
|
||||
variables:
|
||||
CARCH: 'aarch64'
|
||||
|
||||
.carch_x86_64: &carch_x86_64
|
||||
variables:
|
||||
CARCH: 'x86_64'
|
||||
|
||||
.tarball_build_config: &tarball_build_config
|
||||
tarball_x86_64:
|
||||
image: ghcr.io/void-linux/void-linux:latest-thin-bb-x86_64
|
||||
stage: build
|
||||
script:
|
||||
- ./build_tarball.sh "${CI_PROJECT_DIR}/LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
|
||||
- echo "repository=https://void.sakamoto.pl/current/" > /usr/share/xbps.d/00-repository-main.conf
|
||||
- echo "repository=https://void.sakamoto.pl/current/nonfree" >> /usr/share/xbps.d/00-repository-main.conf
|
||||
- xbps-install -Sy bash
|
||||
- bash ./build_tarball.sh "${CI_PROJECT_DIR}/Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
|
||||
artifacts:
|
||||
name: "Librewolf-Tarball-${pkgver}-${pkgrel}-${CARCH}"
|
||||
name: "Foxgirl-${pkgver}-${pkgrel}-${CARCH}"
|
||||
paths:
|
||||
- "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
|
||||
- "Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
|
||||
|
||||
tarball_x86_64:
|
||||
image: ubuntu:18.04
|
||||
tags: [x86_64b]
|
||||
<<: *carch_x86_64
|
||||
<<: *tarball_build_config
|
||||
only:
|
||||
variables:
|
||||
- $X86_64
|
||||
|
||||
tarball_aarch64:
|
||||
image: arm64v8/ubuntu:18.04
|
||||
tags: [aarch64b]
|
||||
<<: *carch_aarch64
|
||||
<<: *tarball_build_config
|
||||
only:
|
||||
variables:
|
||||
- $AARCH64
|
||||
tarball_x86_64_musl:
|
||||
image: ghcr.io/void-linux/void-linux:latest-thin-bb-x86_64-musl
|
||||
stage: build
|
||||
script:
|
||||
- echo "repository=https://void.sakamoto.pl/current/musl" > /usr/share/xbps.d/00-repository-main.conf
|
||||
- echo "repository=https://void.sakamoto.pl/current/musl/nonfree" >> /usr/share/xbps.d/00-repository-main.conf
|
||||
- xbps-install -Sy bash
|
||||
- bash ./build_tarball.sh "${CI_PROJECT_DIR}/Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
|
||||
artifacts:
|
||||
name: "Foxgirl-${pkgver}-${pkgrel}-${CARCH}_musl"
|
||||
paths:
|
||||
- "Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
|
||||
|
|
|
@ -4,7 +4,8 @@
|
|||
# - any command fails (-e | --errexit)
|
||||
# - any variable is unset (-u | --nounset)
|
||||
# - a part of a piped sequence fails (-o pipefail)
|
||||
set -euo pipefail
|
||||
#set -euo pipefail
|
||||
set -e
|
||||
|
||||
SCRIPT_FOLDER=$(realpath $(dirname $0));
|
||||
|
||||
|
|
|
@ -5,23 +5,18 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
|
|||
|
||||
--- a/build/moz.configure/toolchain.configure
|
||||
+++ b/build/moz.configure/toolchain.configure
|
||||
@@ -2349,15 +2349,17 @@
|
||||
@@ -2287,10 +2287,12 @@
|
||||
set_config("LINKER_KIND", select_linker.KIND)
|
||||
|
||||
|
||||
-@depends_if(select_linker, target, macos_sdk, sysroot_path, multiarch_dir)
|
||||
+@depends_if(select_linker, target, macos_sdk, sysroot_path, multiarch_dir, host)
|
||||
-@depends_if(select_linker, target, target_sysroot, target_multiarch_dir, c_compiler)
|
||||
+@depends_if(select_linker, target, target_sysroot, target_multiarch_dir, c_compiler, host)
|
||||
@imports("os")
|
||||
-def linker_ldflags(linker, target, macos_sdk, sysroot_path, multiarch_dir):
|
||||
+def linker_ldflags(linker, target, macos_sdk, sysroot_path, multiarch_dir, host):
|
||||
-def linker_ldflags(linker, target, sysroot, multiarch_dir, c_compiler):
|
||||
+def linker_ldflags(linker, target, sysroot, multiarch_dir, c_compiler, host):
|
||||
flags = list((linker and linker.LINKER_FLAG) or [])
|
||||
if target.kernel == "Darwin":
|
||||
if linker and linker.KIND == "ld64":
|
||||
flags.append("-Wl,-syslibroot,%s" % macos_sdk)
|
||||
else:
|
||||
flags.append("-Wl,--sysroot=%s" % macos_sdk)
|
||||
+ if host.cpu == "arm":
|
||||
+ flags.append("-Wl,--no-keep-memory")
|
||||
|
||||
if sysroot_path and multiarch_dir:
|
||||
# rpath-link is irrelevant to wasm, see for more info https://github.com/emscripten-core/emscripten/issues/11076.
|
||||
if sysroot.path and multiarch_dir and target.os != "WASI":
|
||||
for d in ("lib", "usr/lib"):
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
--- a/third_party/libwebrtc/webrtc/system_wrappers/cpu_features_linux_gn/moz.build
|
||||
+++ b/third_party/libwebrtc/webrtc/system_wrappers/cpu_features_linux_gn/moz.build
|
||||
@@ -31,10 +31,6 @@ LOCAL_INCLUDES += [
|
||||
"/third_party/libwebrtc/webrtc/"
|
||||
"/tools/profiler/public"
|
||||
]
|
||||
|
||||
-UNIFIED_SOURCES += [
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/build/moz.configure/rust.configure
|
||||
+++ b/build/moz.configure/rust.configure
|
||||
@@ -168,7 +168,7 @@
|
||||
)
|
||||
)
|
||||
rustc_min_version = Version(MINIMUM_RUST_VERSION)
|
||||
- cargo_min_version = rustc_min_version
|
||||
+ cargo_min_version = Version("1.46.0")
|
||||
|
||||
version = rustc_info.version
|
||||
is_nightly = "nightly" in version.version
|
|
@ -1,144 +0,0 @@
|
|||
From 05971bd227dc6c359657d1501711e6865e9430f9 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Denton <mpdenton@chromium.org>
|
||||
Date: Tue, 28 Jul 2020 00:29:01 +0000
|
||||
Subject: [PATCH] Linux sandbox: update arm syscall numbers
|
||||
|
||||
Change-Id: Ia2c39a86fb3516040a74de963115e73b7b1a1e0c
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2318316
|
||||
Reviewed-by: Robert Sesek <rsesek@chromium.org>
|
||||
Commit-Queue: Matthew Denton <mpdenton@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/master@{#792090}
|
||||
---
|
||||
|
||||
diff --git a/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h b/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
|
||||
index 59d0eab8..a242c18c 100644
|
||||
--- a/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
|
||||
+++ b/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
|
||||
@@ -1063,4 +1063,60 @@
|
||||
#define __NR_memfd_create 279
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_bpf)
|
||||
+#define __NR_bpf 280
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_execveat)
|
||||
+#define __NR_execveat 281
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_userfaultfd)
|
||||
+#define __NR_userfaultfd 282
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier 283
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_mlock2)
|
||||
+#define __NR_mlock2 284
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_copy_file_range)
|
||||
+#define __NR_copy_file_range 285
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_preadv2)
|
||||
+#define __NR_preadv2 286
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_pwritev2)
|
||||
+#define __NR_pwritev2 287
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_pkey_mprotect)
|
||||
+#define __NR_pkey_mprotect 288
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_pkey_alloc)
|
||||
+#define __NR_pkey_alloc 289
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_pkey_free)
|
||||
+#define __NR_pkey_free 290
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_statx)
|
||||
+#define __NR_statx 291
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_io_pgetevents)
|
||||
+#define __NR_io_pgetevents 292
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_rseq)
|
||||
+#define __NR_rseq 293
|
||||
+#endif
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
|
||||
diff --git a/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h b/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
|
||||
index 1addd53..85e2110b 100644
|
||||
--- a/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
|
||||
+++ b/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
|
||||
@@ -1385,6 +1385,62 @@
|
||||
#define __NR_memfd_create (__NR_SYSCALL_BASE+385)
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_bpf)
|
||||
+#define __NR_bpf (__NR_SYSCALL_BASE+386)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_execveat)
|
||||
+#define __NR_execveat (__NR_SYSCALL_BASE+387)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_userfaultfd)
|
||||
+#define __NR_userfaultfd (__NR_SYSCALL_BASE+388)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_mlock2)
|
||||
+#define __NR_mlock2 (__NR_SYSCALL_BASE+390)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_copy_file_range)
|
||||
+#define __NR_copy_file_range (__NR_SYSCALL_BASE+391)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_preadv2)
|
||||
+#define __NR_preadv2 (__NR_SYSCALL_BASE+392)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_pwritev2)
|
||||
+#define __NR_pwritev2 (__NR_SYSCALL_BASE+393)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_pkey_mprotect)
|
||||
+#define __NR_pkey_mprotect (__NR_SYSCALL_BASE+394)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_pkey_alloc)
|
||||
+#define __NR_pkey_alloc (__NR_SYSCALL_BASE+395)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_pkey_free)
|
||||
+#define __NR_pkey_free (__NR_SYSCALL_BASE+396)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_statx)
|
||||
+#define __NR_statx (__NR_SYSCALL_BASE+397)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_rseq)
|
||||
+#define __NR_rseq (__NR_SYSCALL_BASE+398)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(__NR_io_pgetevents)
|
||||
+#define __NR_io_pgetevents (__NR_SYSCALL_BASE+399)
|
||||
+#endif
|
||||
+
|
||||
// ARM private syscalls.
|
||||
#if !defined(__ARM_NR_BASE)
|
||||
#define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
|
|
@ -4,70 +4,60 @@ printf "\n\n-------------------------------------- DEPENDENCY INSTALLATION -----
|
|||
set -e
|
||||
|
||||
# Setup Script Variables
|
||||
_DEPENDENCIES="wget git xvfb \
|
||||
xz-utils \
|
||||
gettext-base \
|
||||
curl python3 libjack-dev \
|
||||
python3-psutil python-psutil python3-dev python-dev \
|
||||
autotools-dev \
|
||||
autoconf2.13 \
|
||||
zip \
|
||||
libx11-dev \
|
||||
libx11-xcb-dev \
|
||||
libxt-dev \
|
||||
libxext-dev \
|
||||
libgtk-3-dev \
|
||||
libglib2.0-dev \
|
||||
libpango1.0-dev \
|
||||
libfontconfig1-dev \
|
||||
libfreetype6-dev \
|
||||
libstartup-notification0-dev \
|
||||
libasound2-dev \
|
||||
libcurl4-openssl-dev \
|
||||
libdbus-glib-1-dev \
|
||||
lsb-release \
|
||||
libiw-dev \
|
||||
mesa-common-dev \
|
||||
libnotify-dev \
|
||||
libxrender-dev \
|
||||
libpulse-dev \
|
||||
libssl-dev \
|
||||
yasm \
|
||||
unzip \
|
||||
dbus-x11 \
|
||||
python \
|
||||
libffi-dev \
|
||||
nodejs-mozilla \
|
||||
cargo \
|
||||
rustc \
|
||||
nasm-mozilla"
|
||||
|
||||
# cargo \
|
||||
# rustc \
|
||||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
_DEPENDENCIES="wget git xorg-server-xvfb \
|
||||
xz grep coreutils patch tar \
|
||||
gettext pkg-config \
|
||||
curl python3 libjack \
|
||||
python3-psutil python3-devel python-devel \
|
||||
automake \
|
||||
autoconf213 \
|
||||
zip \
|
||||
libX11-devel \
|
||||
libXt-devel \
|
||||
libXext-devel \
|
||||
gtk+3-devel \
|
||||
libglib-devel \
|
||||
pango-devel \
|
||||
fontconfig-devel \
|
||||
freetype-devel \
|
||||
libcurl-devel \
|
||||
MesaLib-devel \
|
||||
libnotify-devel \
|
||||
libXrender-devel \
|
||||
pulseaudio-devel \
|
||||
openssl-devel \
|
||||
yasm \
|
||||
unzip \
|
||||
dbus-x11 \
|
||||
python \
|
||||
libffi-devel \
|
||||
nodejs-lts \
|
||||
cargo \
|
||||
rust \
|
||||
nasm \
|
||||
clang \
|
||||
llvm \
|
||||
alsa-lib-devel \
|
||||
jack-devel \
|
||||
perl \
|
||||
cbindgen \
|
||||
pixman-devel \
|
||||
libevent-devel libnotify-devel libvpx-devel \
|
||||
libXcomposite-devel libSM-devel libXdamage-devel \
|
||||
dbus-glib-devel \
|
||||
make"
|
||||
|
||||
# Installs Dependencies
|
||||
printf "\nInstalling dependencies: $_DEPENDENCIES\n";
|
||||
apt-get -qq update;
|
||||
apt-get -y -qq install $_DEPENDENCIES;
|
||||
xbps-install -Sy $_DEPENDENCIES 2>&1 >/dev/null
|
||||
|
||||
if [[ $CARCH == 'x86_64' ]];then
|
||||
# Installs (non-ancient) clang
|
||||
apt install -y software-properties-common apt-transport-https ca-certificates
|
||||
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
|
||||
apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main"
|
||||
apt-get update
|
||||
apt-get -y install clang-12 libclang-12-dev
|
||||
else
|
||||
apt install -y software-properties-common apt-transport-https ca-certificates
|
||||
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
|
||||
apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main"
|
||||
apt-get update
|
||||
apt-get -y install clang-10 libclang-10-dev
|
||||
if [[ "$(/lib/libc.so 2>&1)" == *"musl libc"* ]]; then
|
||||
xbps-install -y libfl-devel libssp-devel libssp 2>&1 >/dev/null
|
||||
fi
|
||||
|
||||
# we need a more recent rust
|
||||
# curl https://sh.rustup.rs -o rustup.sh
|
||||
# bash rustup.sh -y
|
||||
# source /root/.cargo/env
|
||||
ln -s /bin/clang /bin/cc
|
||||
mkdir /usr/lib/nodejs-mozilla/
|
||||
ln -s /usr/bin/ /usr/lib/nodejs-mozilla/bin
|
||||
mkdir /usr/lib/nasm-mozilla
|
||||
ln -s /usr/bin/ /usr/lib/nasm-mozilla/bin
|
||||
ln -s /usr/bin/make /usr/bin/gmake
|
||||
|
|
|
@ -9,11 +9,12 @@ if [[ -z ${pkgver} || -z ${pkgrel} ]]; then
|
|||
fi
|
||||
# Setup Script Variables
|
||||
SOURCE_FOLDER=$1;
|
||||
_SOURCE_CODE_URL="https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz";
|
||||
#_SOURCE_CODE_URL="https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz";
|
||||
_SOURCE_CODE_URL="https://f.sakamoto.pl/firefox-$pkgver.source.tar.xz";
|
||||
_SOURCE_TAR="firefox-${pkgver}.tar.xz"
|
||||
|
||||
# Downloading and Extracting Firefox Source Code
|
||||
printf "\nDownloading Firefox Source Code\n";
|
||||
wget -O $_SOURCE_TAR $_SOURCE_CODE_URL
|
||||
wget -O $_SOURCE_TAR $_SOURCE_CODE_URL 2>&1 > /dev/null
|
||||
mkdir -p $SOURCE_FOLDER
|
||||
tar -x --strip-components=1 -C $SOURCE_FOLDER -f $_SOURCE_TAR
|
||||
|
|
|
@ -6,7 +6,8 @@ set -e
|
|||
# Setup Script Variables
|
||||
srcdir=$1;
|
||||
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
|
||||
_COMMON_REPO='https://gitlab.com/librewolf-community/browser/common.git';
|
||||
#_COMMON_REPO='https://gitlab.com/librewolf-community/browser/common.git';
|
||||
_COMMON_REPO='https://git.sakamoto.pl/domi/foxgirl-common.git';
|
||||
_PKGVER_TAG="v${pkgver}-${pkgrel}"
|
||||
_COMMON_TAG=${COMMON_TAG:-${_PKGVER_TAG}}
|
||||
_COMMON_DIR="${CI_PROJECT_DIR}"/common
|
||||
|
@ -19,10 +20,25 @@ mkdir -p ${_MOZBUILD}
|
|||
printf "\nCopying branding and source code changes to firefox source code\n";
|
||||
git clone $_COMMON_REPO ${_COMMON_DIR}
|
||||
cd ${_COMMON_DIR}
|
||||
git checkout ${_COMMON_TAG}
|
||||
#git checkout ${_COMMON_TAG}
|
||||
cd ..
|
||||
cp -r ${_COMMON_DIR}/source_files/* $srcdir/;
|
||||
|
||||
# get foxgirl branding (ff3.6)
|
||||
wget "https://web.archive.org/web/0/http://people.mozilla.com/~faaborg/files/shiretoko/firefoxIcon/firefoxIcon.zip"
|
||||
mkdir -p icons icons/content
|
||||
pushd icons
|
||||
|
||||
unzip ../firefoxIcon.zip
|
||||
for i in firefox*noshadow.png; do
|
||||
mv "$i" "default$(grep -Poh "[0-9]+" <<< "$i").png"
|
||||
done
|
||||
mv firefox-256.png content/about-logo.png
|
||||
mv firefox-512.png "content/about-logo@2x.png"
|
||||
popd
|
||||
|
||||
cp -rlf icons/* $srcdir/browser/branding/librewolf/
|
||||
|
||||
cd $srcdir
|
||||
|
||||
cat >${CI_PROJECT_DIR}/mozconfig <<END
|
||||
|
@ -43,8 +59,8 @@ ac_add_options --enable-rust-simd
|
|||
|
||||
# Branding
|
||||
ac_add_options --enable-update-channel=release
|
||||
ac_add_options --with-app-name=librewolf
|
||||
ac_add_options --with-app-basename=LibreWolf
|
||||
ac_add_options --with-app-name=foxgirl
|
||||
ac_add_options --with-app-basename=Foxgirl
|
||||
ac_add_options --with-branding=browser/branding/librewolf
|
||||
ac_add_options --with-distribution-id=io.gitlab.librewolf-community
|
||||
ac_add_options --with-unsigned-addon-scopes=app,system
|
||||
|
@ -72,6 +88,12 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0
|
|||
# ac_add_options --enable-linker=gold
|
||||
END
|
||||
|
||||
if [[ "$(/lib/libc.so 2>&1)" == *"musl libc"* ]]; then
|
||||
echo "ac_add_options --disable-jemalloc" >> ${CI_PROJECT_DIR}/mozconfig
|
||||
echo "ac_add_options --disable-gold" >> ${CI_PROJECT_DIR}/mozconfig
|
||||
echo "ac_add_options --disable-webrtc" >> ${CI_PROJECT_DIR}/mozconfig
|
||||
fi
|
||||
|
||||
# allow setting limited resource usage via ENV / CI:
|
||||
|
||||
if [[ ! -z ${CORES_TO_USE} ]]; then
|
||||
|
@ -83,11 +105,11 @@ if [[ $CARCH == 'aarch64' ]]; then
|
|||
# taken from manjaro build:
|
||||
ac_add_options --enable-optimize="-g0 -O2"
|
||||
|
||||
export CC='clang-10'
|
||||
export CXX='clang++-10'
|
||||
export AR=llvm-ar-10
|
||||
export NM=llvm-nm-10
|
||||
export RANLIB=llvm-ranlib-10
|
||||
export CC='clang'
|
||||
export CXX='clang++'
|
||||
export AR=llvm-ar
|
||||
export NM=llvm-nm
|
||||
export RANLIB=llvm-ranlib
|
||||
END
|
||||
|
||||
export MOZ_DEBUG_FLAGS=" "
|
||||
|
@ -96,7 +118,7 @@ END
|
|||
export RUSTFLAGS="-Cdebuginfo=0"
|
||||
|
||||
export LDFLAGS+=" -Wl,--no-keep-memory -Wl"
|
||||
patch -Np1 -i ${_PATCHES_DIR}/arm.patch
|
||||
# patch -Np1 -i ${_PATCHES_DIR}/arm.patch # not required anymore?
|
||||
wget https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch -O ${_PATCHES_DIR}/build-arm-libopus.patch
|
||||
patch -Np1 -i ${_PATCHES_DIR}/build-arm-libopus.patch
|
||||
|
||||
|
@ -105,11 +127,11 @@ else
|
|||
# ubuntu seems to recommend this
|
||||
ac_add_options --disable-elf-hack
|
||||
|
||||
export CC='clang-12'
|
||||
export CXX='clang++-12'
|
||||
export AR=llvm-ar-12
|
||||
export NM=llvm-nm-12
|
||||
export RANLIB=llvm-ranlib-12
|
||||
export CC='clang'
|
||||
export CXX='clang++'
|
||||
export AR=llvm-ar
|
||||
export NM=llvm-nm
|
||||
export RANLIB=llvm-ranlib
|
||||
|
||||
# probably not needed, enabled by default?
|
||||
ac_add_options --enable-optimize
|
||||
|
@ -125,9 +147,7 @@ patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/armhf-reduce-linker-memory-use.patc
|
|||
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-armhf-webrtc-build.patch"
|
||||
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/webrtc-fix-compiler-flags-for-armhf.patch"
|
||||
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/reduce-rust-debuginfo.patch"
|
||||
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/relax-cargo-dep.patch"
|
||||
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/use-system-icupkg.patch"
|
||||
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/sandbox-update-arm-syscall-numbers.patch"
|
||||
|
||||
# Remove some pre-installed addons that might be questionable
|
||||
patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch
|
||||
|
@ -172,4 +192,22 @@ patch -Np1 -i ${_PATCHES_DIR}/allow_dark_preference_with_rfp.patch
|
|||
# fix an URL in 'about' dialog
|
||||
patch -Np1 -i ${_PATCHES_DIR}/about-dialog.patch
|
||||
|
||||
# change some hardcoded directory strings that could lead to unnecessarily
|
||||
# created directories
|
||||
patch -Np1 -i ${_PATCHES_DIR}/mozilla_dirs.patch
|
||||
|
||||
# Foxgirl-specific patches
|
||||
patch -Np1 -i "${_PATCHES_DIR}/urlbar.patch"
|
||||
patch -Np1 -i "${_PATCHES_DIR}/icons.patch"
|
||||
patch -Np1 -i "${_PATCHES_DIR}/wordmark.patch"
|
||||
patch -Np1 -i "${_PATCHES_DIR}/css.patch"
|
||||
patch -Np1 -i "${_PATCHES_DIR}/defsites.patch"
|
||||
patch -Np1 -i "${_PATCHES_DIR}/bookmarksbar.patch"
|
||||
patch -Np1 -i "${_PATCHES_DIR}/smile.patch"
|
||||
patch -Np1 -i "${_PATCHES_DIR}/strings.patch"
|
||||
patch -Np1 -i "${_PATCHES_DIR}/view-page-info.patch"
|
||||
#patch -Np1 -i "${_PATCHES_DIR}/useragent-override.patch"
|
||||
|
||||
echo '[]' > browser/components/newtab/data/content/tippytop/top_sites.json
|
||||
echo '[]' > browser/components/urlbar/content/preloaded-top-urls.json
|
||||
rm -rf common
|
||||
|
|
|
@ -7,7 +7,7 @@ set -e
|
|||
srcdir=$1;
|
||||
OUTPUT_TARBALL=$2;
|
||||
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
|
||||
_SOURCE_CODE_BINARY_TARBALL_LOCATION="${srcdir}/firefox-${pkgver}/obj/dist/librewolf*.tar.bz2";
|
||||
_SOURCE_CODE_BINARY_TARBALL_LOCATION="${srcdir}/firefox-${pkgver}/obj/dist/foxgirl*.tar.bz2";
|
||||
_MOZBUILD=$srcdir/../mozbuild
|
||||
export DEB_BUILD_HARDENING=1
|
||||
export DEB_BUILD_HARDENING_STACKPROTECTOR=1
|
||||
|
@ -16,6 +16,7 @@ export DEB_BUILD_HARDENING_FORMAT=1
|
|||
export DEB_BUILD_HARDENING_PIE=1
|
||||
# export PATH=/usr/lib/nasm-mozilla/bin:$PATH
|
||||
|
||||
# add cargo binary to path
|
||||
# source /root/.cargo/env
|
||||
|
||||
# we do change / unset some of them later, but setting them as set by Arch
|
||||
|
@ -62,11 +63,10 @@ cd $srcdir;
|
|||
|
||||
rm -f mozconfig
|
||||
|
||||
# add cargo binary to path
|
||||
# source /root/.cargo/env
|
||||
|
||||
# install cbindgen
|
||||
cargo install --version 0.19.0 cbindgen
|
||||
#if [[ "$(/lib/libc.so)" != *"musl libc"* ]]; then
|
||||
# cargo install --version 0.20.0 cbindgen
|
||||
#fi
|
||||
|
||||
if [[ $CARCH == 'aarch64' ]]; then
|
||||
|
||||
|
@ -92,7 +92,7 @@ echo "Building symbol archive..."
|
|||
# End "build()" equivalent.
|
||||
|
||||
# Packages the build into a binary tarball
|
||||
printf "\nPackaging LibreWolf\n";
|
||||
printf "\nPackaging\n";
|
||||
./mach package;
|
||||
|
||||
# Moves the packaged tarball to the specified location
|
||||
|
|
|
@ -10,9 +10,9 @@ TOGGLE_SETTINGS_SCRIPT=$2;
|
|||
LAUNCHER_SCRIPT=$3;
|
||||
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
|
||||
_SCRIPT_FOLDER=$(realpath $(dirname $0));
|
||||
_EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf;
|
||||
_SETTINGS_TAG=${SETTINGS_TAG:-'1.3'}
|
||||
_SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
|
||||
_EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/foxgirl;
|
||||
_SETTINGS_TAG=${SETTINGS_TAG:-'2.0'}
|
||||
_SETTINGS_REPO='https://git.sakamoto.pl/domi/foxgirl-settings';
|
||||
|
||||
# Extracts the binary tarball
|
||||
printf "\nExtracting librewolf binary tarball\n";
|
||||
|
@ -24,7 +24,7 @@ printf "\nCopying librewolf settings to extracted binary tarball\n";
|
|||
|
||||
git clone $_SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings;
|
||||
cd $_EXTRACTED_TARBALL_FOLDER/settings
|
||||
git checkout $_SETTINGS_TAG
|
||||
#git checkout $_SETTINGS_TAG
|
||||
cd -
|
||||
# no need to keep that in there:
|
||||
rm -rf "${_EXTRACTED_TARBALL_FOLDER}/settings/.git";
|
||||
|
@ -44,12 +44,12 @@ install -Dvm644 /dev/stdin "$distini" <<END
|
|||
[Global]
|
||||
id=io.gitlab.librewolf-community
|
||||
version=1.0
|
||||
about=LibreWolf
|
||||
about=Foxgirl
|
||||
|
||||
[Preferences]
|
||||
app.distributor="LibreWolf Community"
|
||||
app.distributor.channel=librewolf
|
||||
app.partner.librewolf=librewolf
|
||||
app.distributor="idk lmao"
|
||||
app.distributor.channel=foxgirl
|
||||
app.partner.librewolf=foxgirl
|
||||
END
|
||||
|
||||
# Create Appstream metadate file
|
||||
|
|
Loading…
Reference in New Issue