Rewrite PKGBUILD based on the normal brave package

5 files changed, 411 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f024fe256d1..ac0f82e93a63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,66 @@
 pkgbase = brave-git
 	pkgdesc = A web browser that stops ads and trackers by default. Master branch.
-	pkgver = 0.70.26.g674d3b845
+	pkgver = 1.25.33.g0126e4e
 	pkgrel = 1
-	url = https://www.brave.com/
+	url = https://github.com/brave/brave-browser/
 	arch = x86_64
-	groups = networking
 	license = custom:MPL2
 	license = BSD
 	license = Apache
 	license = custom:others
 	makedepends = git
 	makedepends = npm
+	makedepends = python
 	makedepends = python2
 	makedepends = icu
 	makedepends = glibc
-	makedepends = python2-virtualenv
-	depends = gtk2
+	makedepends = gperf
+	makedepends = java-runtime-headless
+	makedepends = clang
+	makedepends = python2-setuptools
+	makedepends = pipewire
+	makedepends = ncurses5-compat-libs
+	depends = gtk3
 	depends = nss
 	depends = alsa-lib
-	depends = gconf
-	depends = libxtst
-	depends = libgnome-keyring
 	depends = libxss
 	depends = ttf-font
-	optdepends = cups: To print stuff
-	optdepends = pepper-flash: Adobe Flash support
+	depends = libva
+	depends = json-glib
+	optdepends = cups: Printer support
+	optdepends = pipewire: WebRTC desktop sharing under Wayland
+	optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
+	optdepends = kwallet: for storing passwords in KWallet on KDE desktops
+	optdepends = sccache: For faster builds
 	provides = brave
 	provides = brave-browser
 	conflicts = brave
-	source = brave-browser::git://github.com/brave/brave-browser.git
+	source = brave-browser::git+https://github.com/brave/brave-browser.git
+	source = chromium::git+https://github.com/chromium/chromium.git
+	source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git
+	source = git+https://github.com/brave/brave-core.git#tag=v1.25.33.g0126e4e
+	source = git+https://github.com/brave/adblock-rust.git
 	source = brave-launcher
-	source = brave.desktop
-	sha384sums = SKIP
-	sha384sums = SKIP
-	sha384sums = SKIP
+	source = brave-browser.desktop
+	source = chromium-launcher-7.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v7.tar.gz
+	source = https://github.com/stha09/chromium-patches/releases/download/chromium-90-patchset-6/chromium-90-patchset-6.tar.xz
+	source = chromium-no-history.patch
+	source = add-clang-nomerge-attribute-to-CheckError.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/add-clang-nomerge-attribute-to-CheckError.patch?h=packages/chromium&id=8d3870e027300e243471b1e508f31d16ce45553a
+	source = chromium-glibc-2.33.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-glibc-2.33.patch?h=packages/chromium&id=8d3870e027300e243471b1e508f31d16ce45553a
+	source = use-oauth2-client-switches-as-default.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/use-oauth2-client-switches-as-default.patch?h=packages/chromium&id=8d3870e027300e243471b1e508f31d16ce45553a
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = 725e2d0c32da4b3de2c27a02abaf2f5acca7a25dcea563ae458c537ac4ffc4d5
+	sha256sums = fa6ed4341e5fc092703535b8becaa3743cb33c72f683ef450edd3ef66f70d42d
+	sha256sums = 86859c11cfc8ba106a3826479c0bc759324a62150b271dd35d1a0f96e890f52f
+	sha256sums = 3eb9580ea35a96789e02815270498226fa33726f4210a5ee36f3868af2ffae1f
+	sha256sums = ea3446500d22904493f41be69e54557e984a809213df56f3cdf63178d2afb49e
+	sha256sums = 5e22afcb91b5402bc09e80630c5323d61013c3fccb0bbd9b23d1e79a400b00d0
+	sha256sums = 2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b
+	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
 
 pkgname = brave-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 4b65a74b025a..3288856ded93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,344 @@
-# Maintainer: Katherine Cumberbatch <stykers@stykers.moe>
+# Maintainer: ta180m@gmail.com
+
+##
+## The following variables can be customized at build time. Use env or export to change at your wish
+##
+##   Example: env USE_SCCACHE=1 COMPONENT=1 makepkg -sc
+##
+## sccache for faster builds - https://github.com/brave/brave-browser/wiki/sccache-for-faster-builds
+## Valid numbers between: 0 and 1
+## Default is: 0 => not use sccache
+if [ -z ${USE_SCCACHE+x} ]; then
+  USE_SCCACHE=0
+fi
+##
+## COMPONENT variable
+## 0 -> build normal (with debug symbols)
+## 1 -> release (default)
+## 2 -> static
+## 3 -> debug
+## 4 -> release with custom cflags and system libs
+## https://github.com/brave/brave-browser/wiki#clone-and-initialize-the-repo
+if [ -z ${COMPONENT+x} ]; then
+  COMPONENT=1
+fi
+##
 
 pkgname=brave-git
-pkgver=0.70.26.g674d3b845
+pkgver=1.25.33.g0126e4e
 pkgrel=1
-pkgdesc="A web browser that stops ads and trackers by default. Master branch."
-arch=('x86_64') # Upstream supports x86_64 only
-url="https://www.brave.com/"
+pkgdesc='A web browser that stops ads and trackers by default. Master branch.'
+arch=('x86_64')
+url='https://github.com/brave/brave-browser/'
 license=('custom:MPL2' 'BSD' 'Apache' 'custom:others')
-groups=('networking')
-depends=('gtk2' 'nss' 'alsa-lib' 'gconf' 'libxtst' 'libgnome-keyring' 'libxss' 'ttf-font')
-makedepends=('git' 'npm' 'python2' 'icu' 'glibc' 'python2-virtualenv')
-optdepends=('cups: To print stuff'
-            'pepper-flash: Adobe Flash support')
+depends=('gtk3' 'nss' 'alsa-lib' 'libxss' 'ttf-font' 'libva' 'json-glib')
+makedepends=('git' 'npm' 'python' 'python2' 'icu' 'glibc' 'gperf' 'java-runtime-headless' 'clang' 'python2-setuptools' 'pipewire')
+optdepends=('cups: Printer support'
+            'pipewire: WebRTC desktop sharing under Wayland'
+            'org.freedesktop.secrets: password storage backend on GNOME / Xfce'
+            'kwallet: for storing passwords in KWallet on KDE desktops'
+            'sccache: For faster builds')
 provides=('brave' 'brave-browser')
 conflicts=('brave')
-source=('brave-browser::git://github.com/brave/brave-browser.git'
+chromium_base_ver="90"
+patchset="6"
+patchset_name="chromium-${chromium_base_ver}-patchset-${patchset}"
+_launcher_ver=7
+source=("brave-browser::git+https://github.com/brave/brave-browser.git"
+        "chromium::git+https://github.com/chromium/chromium.git"
+        "git+https://chromium.googlesource.com/chromium/tools/depot_tools.git"
+        "git+https://github.com/brave/brave-core.git#tag=v${pkgver}"
+        "git+https://github.com/brave/adblock-rust.git"
         'brave-launcher'
-        'brave.desktop')
-sha384sums=('SKIP'
+        'brave-browser.desktop'
+        "chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz"
+        "https://github.com/stha09/chromium-patches/releases/download/${patchset_name}/${patchset_name}.tar.xz"
+        "chromium-no-history.patch")
+arch_revision=8d3870e027300e243471b1e508f31d16ce45553a
+Patches="
+        add-clang-nomerge-attribute-to-CheckError.patch
+        chromium-glibc-2.33.patch
+        use-oauth2-client-switches-as-default.patch
+        "
+for arch_patch in $Patches
+do
+  source+=("${arch_patch}::https://git.archlinux.org/svntogit/packages.git/plain/trunk/${arch_patch}?h=packages/chromium&id=${arch_revision}")
+done
+
+sha256sums=('SKIP'
+            'SKIP'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            'SKIP'
+            '725e2d0c32da4b3de2c27a02abaf2f5acca7a25dcea563ae458c537ac4ffc4d5'
+            'fa6ed4341e5fc092703535b8becaa3743cb33c72f683ef450edd3ef66f70d42d'
+            '86859c11cfc8ba106a3826479c0bc759324a62150b271dd35d1a0f96e890f52f'
+            '3eb9580ea35a96789e02815270498226fa33726f4210a5ee36f3868af2ffae1f'
+            'ea3446500d22904493f41be69e54557e984a809213df56f3cdf63178d2afb49e'
+            '5e22afcb91b5402bc09e80630c5323d61013c3fccb0bbd9b23d1e79a400b00d0'
+            '2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b'
+            'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
 
-pkgver() {
-  cd "$srcdir/brave-browser"
-  git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
+# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
+# Keys are the names in the above script; values are the dependencies in Arch
+declare -gA _system_libs=(
+  [ffmpeg]=ffmpeg
+  [flac]=flac
+  [fontconfig]=fontconfig
+  [freetype]=freetype2
+  [harfbuzz-ng]=harfbuzz
+  [icu]=icu
+  [libdrm]=
+  [libjpeg]=libjpeg
+  [libpng]=libpng
+  #[libvpx]=libvpx
+  [libwebp]=libwebp
+  [libxml]=libxml2
+  [libxslt]=libxslt
+  [opus]=opus
+  [re2]=re2
+  [snappy]=snappy
+  [zlib]=minizip
+)
+_unwanted_bundled_libs=(
+  $(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/')
+)
 
-build() {
-  cd "$srcdir/brave-browser"
-  python2 -m virtualenv venv
-  source venv/bin/activate
+# Add depends if user wants a release with custom cflags and system libs
+if [ "$COMPONENT" = "4" ]; then
+  echo "Build with system libs is disabled for now" && exit 1
+  brave_base_ver="$(echo $pkgver | cut -d . -f 1-2)"
+  brave_patchset="1"
+  brave_patchset_name="brave-${brave_base_ver}-patches-${brave_patchset}"
+  source+=("https://gitlab.com/hadogenes/brave-patches/-/archive/${brave_patchset_name}/brave-patches-${brave_patchset_name}.zip")
+  sha256sums+=("0f6a78c2bbe9803f57cbccdb797efded3c2b55ebcb96e931273be380aa4c264b")
+
+  depends+=('libpulse' 'pciutils')
+  depends+=(${_system_libs[@]})
+  makedepends+=('lld' 'libva' 'libpipewire02' 'python2-xcb-proto')
+else
+  makedepends+=('ncurses5-compat-libs')
+fi
+
+prepare() {
+  cd "brave-browser"
+
+  # Hack to prioritize python2 in PATH
+  mkdir -p "${srcdir}/bin"
+  ln -sf /usr/bin/python2 "${srcdir}/bin/python"
+  ln -sf /usr/bin/python2-config "${srcdir}/bin/python-config"
+  export PATH="${srcdir}/bin:${PATH}"
+
+  msg2 "Prepare the environment..."
   npm install
-  npm run init
-  npm run build Release
+  patch -Np1 -i ../chromium-no-history.patch
 
-  if [[ ! (-r /proc/sys/kernel/unprivileged_userns_clone && $(< /proc/sys/kernel/unprivileged_userns_clone) == 1 && -n $(zcat /proc/config.gz | grep CONFIG_USER_NS=y) ) ]]; then
-    echo "User namespaces are not detected as enabled on your system, brave will run with the sandbox disabled"
+  git submodule init
+  git config submodule.chromium.url "${srcdir}"/chromium
+  git config submodule.brave-core.url "${srcdir}"/brave
+  git config submodule.depot_tools.url "${srcdir}"/depot_tools
+  git config submodule.adblock-rust.url "${srcdir}"/adblock-rust
+  git submodule update
+  cp -rT "${srcdir}"/chromium src
+  cp -rT "${srcdir}"/brave-core src/brave
+  cp -r "${srcdir}"/depot_tools src/brave/vendor/
+  cp -rT "${srcdir}"/adblock-rust src/brave/vendor/adblock_rust_ffi
+
+  msg2 "Running \"npm run\""
+  if [ -d src/out/Release ]; then
+    npm run sync -- --force
+  else
+    npm run init
+  fi
+
+  msg2 "Apply Chromium patches..."
+  cd src/
+
+  # https://crbug.com/893950
+  sed -i -e 's/\<xmlMalloc\>/malloc/' -e 's/\<xmlFree\>/free/' \
+    third_party/blink/renderer/core/xml/*.cc \
+    third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \
+    third_party/libxml/chromium/*.cc
+
+  # Use the --oauth2-client-id= and --oauth2-client-secret= switches for
+  # setting GOOGLE_DEFAULT_CLIENT_ID and GOOGLE_DEFAULT_CLIENT_SECRET at
+  # runtime -- this allows signing into Chromium without baked-in values
+  patch -Np1 -i ../../use-oauth2-client-switches-as-default.patch
+
+  # https://crbug.com/1164975
+  patch -Np1 -i ../../chromium-glibc-2.33.patch
+
+  # Revert addition of [[clang::nomerge]] attribute; not supported by clang 11
+  patch -Rp1 -d base <../../add-clang-nomerge-attribute-to-CheckError.patch
+
+  # Fixes for building with libstdc++ instead of libc++
+  patch -Np1 -i ../../patches/chromium-90-quantization_utils-include.patch
+  patch -Np1 -i ../../patches/chromium-90-TokenizedOutput-include.patch
+
+  # Force script incompatible with Python 3 to use /usr/bin/python2
+  sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
+
+  # Hacky patching
+  sed -e 's/enable_distro_version_check = true/enable_distro_version_check = false/g' -i chrome/installer/linux/BUILD.gn
+
+  # Allow building against system libraries in official builds
+  if [ "$COMPONENT" = "4" ]; then
+    sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+        tools/generate_shim_headers/generate_shim_headers.py
+
+    msg2 "Add patches for custom build"
+    for _patch in "$srcdir/brave-patches-$brave_patchset_name"/*.patch; do
+        patch -Np1 -i "$_patch"
+    done
+
+    # Remove bundled libraries for which we will use the system copies; this
+    # *should* do what the remove_bundled_libraries.py script does, with the
+    # added benefit of not having to list all the remaining libraries
+    local _lib
+    for _lib in ${_unwanted_bundled_libs[@]}; do
+      find "third_party/$_lib" -type f \
+      \! -path "third_party/$_lib/chromium/*" \
+      \! -path "third_party/$_lib/google/*" \
+      \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \
+      \! -regex '.*\.\(gn\|gni\|isolate\)' \
+      -delete
+    done
+
+    ./build/linux/unbundle/replace_gn_files.py \
+      --system-libraries "${!_system_libs[@]}"
   fi
-  deactivate
 }
 
-package() {
-  cd "$srcdir/brave-browser"
+build() {
+  cd "brave-browser"
+
+  if check_buildoption ccache y; then
+    # Avoid falling back to preprocessor mode when sources contain time macros
+    export CCACHE_SLOPPINESS=time_macros
+  fi
+
+  export CC=clang
+  export CXX=clang++
+  export AR=ar
+  export NM=nm
+
+  # Hack to prioritize python2 in PATH
+  mkdir -p "${srcdir}/bin"
+  ln -sf /usr/bin/python2 "${srcdir}/bin/python"
+  ln -sf /usr/bin/python2-config "${srcdir}/bin/python-config"
+  export PATH="${srcdir}/bin:${PATH}"
+
+  if [ "$USE_SCCACHE" -eq "1" ]; then
+    echo "sccache = /usr/bin/sccache" >> .npmrc
+  fi
 
-  install -d -m0755 "$pkgdir"/usr/lib
-  cp -a --reflink=auto brave-linux-x64 "$pkgdir/usr/lib/brave"
+  echo 'brave_variations_server_url = https://variations.brave.com/seed' >> .npmrc
+  echo 'brave_stats_updater_url = https://laptop-updates.brave.com' >> .npmrc
+  echo 'brave_stats_api_key = fe033168-0ff8-4af6-9a7f-95e2cbfc' >> .npmrc
+  echo 'brave_sync_endpoint = https://sync-v2.brave.com/v2' >> .npmrc
 
-  install -Dm0755 "$srcdir/brave-launcher" "$pkgdir/usr/bin/brave"
+  npm_args=()
+  if [ "$COMPONENT" = "4" ]; then
+    local _flags=(
+      'custom_toolchain="//build/toolchain/linux/unbundle:default"'
+      'host_toolchain="//build/toolchain/linux/unbundle:default"'
+      'clang_use_chrome_plugins=false'
+      'treat_warnings_as_errors=false'
+      'fieldtrial_testing_like_official_build=true'
+      'proprietary_codecs=true'
+      'rtc_use_pipewire=true'
+      'link_pulseaudio=true'
+      'use_gnome_keyring=false'
+      'use_sysroot=false'
+      'use_custom_libcxx=false'
+      'use_vaapi=true'
+    )
 
-  install -Dm0755 "$srcdir/brave.desktop" "$pkgdir/usr/share/applications/brave.desktop"
+    if [[ -n ${_system_libs[icu]+set} ]]; then
+       _flags+=('icu_use_data_file=false')
+    fi
 
-  install -Dm0644 res/nightly/app.png "$pkgdir"/usr/share/pixmaps/brave.png
+    if check_option strip y; then
+       _flags+=('symbol_level=0')
+    fi
 
-  install -Dm0755 LICENSE.txt "$pkgdir"/usr/share/licenses/brave/MPL2
+    # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn)
+    CFLAGS+='   -Wno-builtin-macro-redefined'
+    CXXFLAGS+=' -Wno-builtin-macro-redefined'
+    CPPFLAGS+=' -D__DATE__=  -D__TIME__=  -D__TIMESTAMP__='
+
+    # Do not warn about unknown warning options
+    CFLAGS+='   -Wno-unknown-warning-option'
+    CXXFLAGS+=' -Wno-unknown-warning-option'
+
+    npm_args+=(
+      $(echo ${_flags[@]} | tr ' ' '\n' | sed -e 's/=/:/' -e 's/^/--gn=/')
+    )
+  fi
+
+  ## See explanation on top to select your build
+  case ${COMPONENT} in
+    0)
+       msg2 "Normal build (with debug)"
+       npm run build
+       ;;
+    2)
+       msg2 "Static build"
+       npm run build -- Static
+       ;;
+    3)
+       msg2 "Debug build"
+       npm run build -- Debug
+       ;;
+    4)
+       msg2 "Release custom build"
+       npm run build Release -- "${npm_args[@]}"
+       ;;
+    *)
+       msg2 "Release build"
+       npm run build Release
+       ;;
+  esac
+}
+
+package() {
+  install -d -m0755 "${pkgdir}/usr/lib/${pkgname}/"{,swiftshader,locales,resources}
+
+  # Copy necessary release files
+  cd "brave-browser/src/out/Release"
+  cp -a --reflink=auto \
+    MEIPreload \
+    brave \
+    brave_*.pak \
+    chrome_*.pak \
+    resources.pak \
+    v8_context_snapshot.bin \
+    libGLESv2.so \
+    libEGL.so \
+    "${pkgdir}/usr/lib/${pkgname}/"
+  cp -a --reflink=auto \
+    swiftshader/libGLESv2.so \
+    swiftshader/libEGL.so \
+    "${pkgdir}/usr/lib/${pkgname}/swiftshader/"
+  cp -a --reflink=auto \
+    locales/*.pak \
+    "${pkgdir}/usr/lib/${pkgname}/locales/"
+  cp -a --reflink=auto \
+    resources/brave_extension \
+    resources/brave_rewards \
+    "${pkgdir}/usr/lib/${pkgname}/resources/"
+
+  if [ "$COMPONENT" != "4" ] || [[ -z ${_system_libs[icu]+set} ]]; then
+    cp -a --reflink=auto \
+      icudtl.dat \
+      "${pkgdir}/usr/lib/${pkgname}/"
+  fi
 
-  cp -a --reflink=auto "$pkgdir"/usr/lib/brave/{LICENSE,LICENSES.chromium.html} "$pkgdir"/usr/share/licenses/brave/
-  ln -s /usr/lib/PepperFlash "$pkgdir"/usr/lib/pepperflashplugin-nonfree
+  cd "${srcdir}"
+  install -Dm0755 brave-launcher "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm0644 -t "${pkgdir}/usr/share/applications/" brave-browser.desktop
+  install -Dm0644 "brave-browser/src/brave/app/theme/brave/product_logo_128.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm0644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "brave-browser/LICENSE"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set ts=4 sw=4 et:
diff --git a/brave.desktop b/brave-browser.desktop
index a07b2c129674..9a0f56020728 100644
--- a/brave.desktop
+++ b/brave-browser.desktop
@@ -106,7 +106,7 @@ Comment[zh_CN]=访问互联网
 Comment[zh_HK]=連線到網際網路
 Comment[zh_TW]=連線到網際網路
 StartupNotify=true
-StartupWMClass=brave
+StartupWMClass=brave-browser
 TryExec=brave
 Exec=brave %U
 Terminal=false
@@ -114,3 +114,13 @@ Icon=brave
 Type=Application
 Categories=Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
+Actions=new-window;new-private-window;
+
+[Desktop Action new-window]
+Name=New Window
+Exec=brave
+
+[Desktop Action new-private-window]
+Name=New Incognito Window
+Exec=brave --incognito
+MimeType=x-scheme-handler/unknown;x-scheme-handler/about;text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
diff --git a/brave-launcher b/brave-launcher
index 78b8899a5c76..a1ddae8c7883 100644
--- a/brave-launcher
+++ b/brave-launcher
@@ -1,9 +1,29 @@
-#!/usr/bin/sh
+#!/usr/bin/env bash
+XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+BRAVE_USE_FLASH_IF_AVAILABLE="${BRAVE_USE_FLASH_IF_AVAILABLE:-true}"
 
-FLAG="--no-sandbox"
+# Allow users to override command-line options
+USER_FLAGS_FILE="$XDG_CONFIG_HOME/brave-flags.conf"
+if [[ -f $USER_FLAGS_FILE ]]; then
+   USER_FLAGS="$(cat $USER_FLAGS_FILE | sed 's/#.*//')"
+fi
+
+[[ 
+  ( -r $(echo /proc/config.*)
+    && -z $(bsdcat /proc/config.* | grep CONFIG_USER_NS=y) )
+  || ( -r /proc/sys/kernel/unprivileged_userns_clone
+    && $(< /proc/sys/kernel/unprivileged_userns_clone) != 1 )
+]] && SANDBOX_FLAG="--no-sandbox" && echo "User namespaces are not detected as enabled on your system, Brave will run with the sandbox disabled"
 
-if [[ -r /proc/sys/kernel/unprivileged_userns_clone && $(< /proc/sys/kernel/unprivileged_userns_clone) == 1 && -n $(zcat /proc/config.gz | grep CONFIG_USER_NS=y) ]]; then
-	FLAG=""
+BRAVE_PEPPER_FLASH_SO=${BRAVE_PEPPER_FLASH_SO:-/usr/lib/PepperFlash/libpepflashplayer.so}
+if [[ -f $BRAVE_PEPPER_FLASH_SO && $BRAVE_USE_FLASH_IF_AVAILABLE == "true" ]]; then
+   BRAVE_PEPPER_FLASH_VERSION=${BRAVE_PEPPER_FLASH_VERSION:-$(LANG=C pacman -Qi pepper-flash | grep Version | sed 's/.*: //; s/\-[^-]*$//')}
+   PEPPER_FLASH_FLAG="--ppapi-flash-path=$BRAVE_PEPPER_FLASH_SO --ppapi-flash-version=$BRAVE_PEPPER_FLASH_VERSION"
 fi
 
-exec /usr/lib/brave/brave "$FLAG" -- "$@"
+# OR true included because Brave currently segfaults when a second
+# window is opened from running the brave binary.
+# GH Issue: https://github.com/brave/brave-browser/issues/4142
+# NOTE: Replace with an exec call once we don't have to work around
+# this bug by having the browser be a subprocess of this script
+/usr/lib/brave/brave $@ $SANDBOX_FLAG $PEPPER_FLASH_FLAG $USER_FLAGS || true
diff --git a/chromium-no-history.patch b/chromium-no-history.patch
new file mode 100644
index 000000000000..5310ec3de25e
--- /dev/null
+++ b/chromium-no-history.patch
@@ -0,0 +1,12 @@
+--- a/scripts/init.js	2021-02-13 18:13:49.659921427 +0100
++++ b/scripts/init.js	2021-02-14 00:04:32.098634830 +0100
+@@ -17,8 +17,7 @@
+ if (!fs.existsSync(path.join(braveCoreDir, '.git'))) {
+   Log.status(`Cloning brave-core [${braveCoreRef}] into ${braveCoreDir}...`)
+   fs.mkdirSync(braveCoreDir)
+-  util.runGit(braveCoreDir, ['clone', util.getNPMConfig(['projects', 'brave-core', 'repository', 'url']), '.'])
+-  util.runGit(braveCoreDir, ['checkout', braveCoreRef])
++  util.runGit(braveCoreDir, ['clone', '--depth=1', util.getNPMConfig(['projects', 'brave-core', 'repository', 'url']), '-b', braveCoreRef, '.'])
+ }
+ 
+ let npmCommand = 'npm'