From 7ca89ea8411bcd054d923f1b4b3d7281510fb9b5 Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Sun, 26 Oct 2025 17:55:06 +0200
Subject: [PATCH] Enable stripping and move mozconfig into source.sh script

---
 pkg.info                      |  2 +-
 source-files/distribution.ini |  9 -------
 source-files/mozconfig        | 36 ----------------------------
 source.sh                     | 45 ++++++++++++++++++++++++++++++-----
 4 files changed, 40 insertions(+), 52 deletions(-)
 delete mode 100644 source-files/distribution.ini
 delete mode 100644 source-files/mozconfig

diff --git a/pkg.info b/pkg.info
index f7d872d..f4a46ee 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,7 +1,7 @@
 name: librewolf
 description: A custom version of Firefox, focused on privacy, security and freedom
 version: 144.0p1
-revision: 1
+revision: 2
 url: https://librewolf.net/
 license: MPL2
 architecture: any
diff --git a/source-files/distribution.ini b/source-files/distribution.ini
deleted file mode 100644
index a4ec191..0000000
--- a/source-files/distribution.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[Global]
-id=io.gitlab.librewolf-community
-version=1.0
-about=LibreWolf
-
-[Preferences]
-app.distributor="LibreWolf Community"
-app.distributor.channel=librewolf
-app.partner.librewolf=librewolf
diff --git a/source-files/mozconfig b/source-files/mozconfig
deleted file mode 100644
index 7403f7c..0000000
--- a/source-files/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --disable-necko-wifi
-ac_add_options --enable-application=browser
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/librewolf-build-dir
-
-ac_add_options --prefix=/usr
-ac_add_options --enable-release
-ac_add_options --enable-hardening
-ac_add_options --enable-optimize
-ac_add_options --enable-rust-simd
-ac_add_options --disable-install-strip
-ac_add_options --disable-elf-hack
-ac_add_options --disable-bootstrap
-
-# Branding
-ac_add_options --enable-update-channel=release
-ac_add_options --with-app-name=librewolf
-ac_add_options --with-app-basename=librewolf
-export MOZ_APP_REMOTINGNAME=librewolf
-
-# System libraries
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
-ac_add_options --with-system-icu
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-webp
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --without-wasm-sandboxed-libraries
-
-# Features
-ac_add_options --enable-alsa
-ac_add_options --enable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
diff --git a/source.sh b/source.sh
index c642032..6b528d6 100644
--- a/source.sh
+++ b/source.sh
@@ -5,27 +5,59 @@
 # The prepare function is executed in the root of the temp directory
 # This function is used for putting downloaded files to the correct location or applying patches
 prepare() {
-  # Build config based on Arch Linux
-  mv mozconfig "$BPM_SOURCE"
+  cd "$BPM_SOURCE"
+  # Generate mozconfig
+  cat > mozconfig <<-EOF
+ac_add_options --enable-application=browser
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/librewolf-build-dir
+
+ac_add_options --prefix=/usr
+ac_add_options --enable-release
+ac_add_options --enable-hardening
+ac_add_options --enable-optimize
+ac_add_options --enable-rust-simd
+ac_add_options --disable-elf-hack
+ac_add_options --disable-bootstrap
+ac_add_options --enable-update-channel=release
+
+# Branding
+ac_add_options --with-app-name=librewolf
+ac_add_options --with-app-basename=librewolf
+export MOZ_APP_REMOTINGNAME=Librewolf
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --without-wasm-sandboxed-libraries
+
+# Features
+ac_add_options --enable-alsa
+ac_add_options --enable-jack
+ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+EOF
 }
 
 # The build function is executed in the source directory
 # This function is used to compile the source code
 build() {
+  export MOZ_NOSPAM=1
+  export MOZBUILD_STATE_PATH="$BPM_SOURCE"/mozbuild
   export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none
-  export MOZBUILD_STATE_PATH=${PWD}/mozbuild
+
   ./mach build
 }
 
 # The package function is executed in the source directory
 # This function is used to move the compiled files into the output directory
 package() {
+  export MOZBUILD_STATE_PATH="$BPM_SOURCE"/mozbuild
   export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none
   DESTDIR="$BPM_OUTPUT" ./mach install
 
-  # Install distribution file
-  install -Dm644 ../distribution.ini "$BPM_OUTPUT"/usr/lib/librewolf/distribution/distribution.ini
-
   # Install icon files
   for size in 16 32 48 64 128; do
     install -Dm644 "$BPM_SOURCE"/browser/branding/librewolf/default"$size".png "$BPM_OUTPUT"/usr/share/icons/hicolor/"$size"x"$size"/apps/librewolf.png
@@ -34,5 +66,6 @@ package() {
   # Install librewolf desktop file
   install -Dm644 ../librewolf.desktop "$BPM_OUTPUT"/usr/share/applications/librewolf.desktop
 
+  # Install package license
   install -Dm644 "$BPM_SOURCE"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/librewolf/LICENSE
 }