Fixed brave-custom-build.patch and enabled system build in PKGBUILD

3 files changed, 114 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b997213f8e9..10a7923c497a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,10 @@ pkgbase = brave
 	makedepends = java-runtime-headless
 	makedepends = clang
 	makedepends = python2-setuptools
-	makedepends = ncurses5-compat-libs
+	makedepends = lld
+	makedepends = libva
+	makedepends = libpipewire02
+	makedepends = python2-xcb-proto
 	depends = gtk3
 	depends = nss
 	depends = alsa-lib
@@ -23,6 +26,23 @@ pkgbase = brave
 	depends = ttf-font
 	depends = libva
 	depends = json-glib
+	depends = libpulse
+	depends = pciutils
+	depends = fontconfig
+	depends = libjpeg
+	depends = icu
+	depends = flac
+	depends = snappy
+	depends = libxml2
+	depends = ffmpeg
+	depends = libwebp
+	depends = minizip
+	depends = opus
+	depends = harfbuzz
+	depends = re2
+	depends = libxslt
+	depends = libpng
+	depends = freetype2
 	optdepends = cups: Printer support
 	optdepends = libpipewire02: WebRTC desktop sharing under Wayland
 	optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
@@ -40,7 +60,7 @@ pkgbase = brave
 	sha256sums = fa6ed4341e5fc092703535b8becaa3743cb33c72f683ef450edd3ef66f70d42d
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
 	sha256sums = e5a60a4c9d0544d3321cc241b4c7bd4adb0a885f090c6c6c21581eac8e3b4ba9
-	sha256sums = d888be0e297bb768ba0bac99616c1180377b7030ac1b8fcb4436a39aca7c7acf
+	sha256sums = f206177b78f42bd2b5e28bf13ffacf9e555914ca6f7b65f0e15781712825c0b8
 	sha256sums = 1e2913e21c491d546e05f9b4edf5a6c7a22d89ed0b36ef692ca6272bcd5faec6
 
 pkgname = brave
diff --git a/PKGBUILD b/PKGBUILD
index a0e33ed14c19..a955c66870fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -65,7 +65,7 @@ sha256sums=('88be8ce4119b46fa26f4b0385b5fa0f672a946c6b2e5aacfc4378dc4a4e0ade3'
             'fa6ed4341e5fc092703535b8becaa3743cb33c72f683ef450edd3ef66f70d42d'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
             'e5a60a4c9d0544d3321cc241b4c7bd4adb0a885f090c6c6c21581eac8e3b4ba9'
-            'd888be0e297bb768ba0bac99616c1180377b7030ac1b8fcb4436a39aca7c7acf'
+            'f206177b78f42bd2b5e28bf13ffacf9e555914ca6f7b65f0e15781712825c0b8'
             '1e2913e21c491d546e05f9b4edf5a6c7a22d89ed0b36ef692ca6272bcd5faec6')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -95,7 +95,7 @@ _unwanted_bundled_libs=(
 
 # 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
+  #echo "Build with system libs is disabled for now" && exit 1
   depends+=('libpulse' 'pciutils')
   depends+=(${_system_libs[@]})
   makedepends+=('lld' 'libva' 'libpipewire02' 'python2-xcb-proto')
diff --git a/brave-custom-build.patch b/brave-custom-build.patch
index f6017057103f..5677accab448 100644
--- a/brave-custom-build.patch
+++ b/brave-custom-build.patch
@@ -1,56 +1,3 @@
-diff -ru a/brave/BUILD.gn b/brave/BUILD.gn
---- a/brave/BUILD.gn	2020-09-25 22:55:12.193333434 +0200
-+++ b/brave/BUILD.gn	2020-10-01 12:15:47.486663146 +0200
-@@ -4,6 +4,7 @@
- import("//ui/base/ui_features.gni")
- import("//third_party/icu/config.gni")
- import("//build/config/locales.gni")
-+import("//build/config/sysroot.gni")
- import("//build/util/process_version.gni")
- import("//extensions/buildflags/buildflags.gni")
- import("//media/cdm/library_cdm/cdm_paths.gni")
-@@ -238,8 +239,11 @@
-     }
-   }
-   if (is_linux) {
-+    if (use_sysroot) {
-+        deps += [ "//chrome/installer/linux:$linux_channel" ]
-+    }
-+
-     deps += [
--      "//chrome/installer/linux:$linux_channel",
-       "//brave/app/linux:dist_resources",
-       ":theme_files",
-     ]
-@@ -336,9 +340,12 @@
-       ":packed_resources",
-       "build/$target_os:brave",
-       "//chrome:packed_resources",
--      "//third_party/icu:icudata",
-     ]
- 
-+    if (icu_use_data_file) {
-+      deps += [ "//third_party/icu:icudata" ]
-+    }
-+
-     if (!is_mac) {
-       sources += [
-         "$root_out_dir/brave_resources.pak",
-@@ -347,10 +354,13 @@
-         "$root_out_dir/$brave_exe",
-         "$root_out_dir/chrome_100_percent.pak",
-         "$root_out_dir/chrome_200_percent.pak",
--        "$root_out_dir/icudtl.dat",
-         "$root_out_dir/resources.pak",
-       ]
- 
-+      if (icu_use_data_file) {
-+        sources += [ "$root_out_dir/icudtl.dat" ]
-+      }
-+
-       if (v8_use_external_startup_data) {
-         deps += [ "//v8" ]
- 
 diff -ru a/brave/components/brave_rewards/browser/logging.h b/brave/components/brave_rewards/browser/logging.h
 --- a/brave/components/brave_rewards/browser/logging.h	2020-09-25 22:55:11.176666768 +0200
 +++ b/brave/components/brave_rewards/browser/logging.h	2020-10-01 12:16:30.493329812 +0200
@@ -179,3 +126,93 @@ index f9c29eca59..2669a9a0b1 100644
  namespace ads {

  

  AdsHistoryDateRangeFilter::AdsHistoryDateRangeFilter() = default;

+diff --git a/brave/BUILD.gn b/brave/BUILD.gn
+index 0621414234..ffd7685f5d 100644
+--- a/brave/BUILD.gn
++++ b/brave/BUILD.gn
+@@ -2,6 +2,7 @@ import("//brave/build/cargo.gni")
+ import("//brave/build/config.gni")
+ import("//brave/components/brave_rewards/browser/buildflags/buildflags.gni")
+ import("//build/config/locales.gni")
++import("//build/config/sysroot.gni")
+ import("//build/config/zip.gni")
+ import("//build/util/process_version.gni")
+ import("//extensions/buildflags/buildflags.gni")
+@@ -216,10 +217,12 @@ group("create_dist") {
+     }
+   }
+   if (is_linux) {
++    if (use_sysroot) {
++        deps += [ "//chrome/installer/linux:$linux_channel" ]
++    }
+     deps += [
+       ":theme_files",
+       "//brave/app/linux:dist_resources",
+-      "//chrome/installer/linux:$linux_channel",
+     ]
+   }
+ }
+@@ -304,9 +307,12 @@ if (!is_android && !is_ios) {
+       ":packed_resources",
+       "build/$target_os:brave",
+       "//chrome:packed_resources",
+-      "//third_party/icu:icudata",
+     ]
+ 
++    if (icu_use_data_file) {
++      deps += [ "//third_party/icu:icudata" ]
++    }
++
+     if (!is_mac) {
+       sources += [
+         "$root_out_dir/$brave_exe",
+@@ -315,9 +321,12 @@ if (!is_android && !is_ios) {
+         "$root_out_dir/brave_resources.pak",
+         "$root_out_dir/chrome_100_percent.pak",
+         "$root_out_dir/chrome_200_percent.pak",
+-        "$root_out_dir/icudtl.dat",
+         "$root_out_dir/resources.pak",
+       ]
+ 
++      if (icu_use_data_file) {
++        sources += [ "$root_out_dir/icudtl.dat" ]
++      }
++
+       if (v8_use_external_startup_data) {
+         deps += [ "//v8" ]
+diff --git a/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap.cc b/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap.cc
+index 24cb6aaeb8..f750604cc4 100644
+--- a/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap.cc
++++ b/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_day_frequency_cap.cc
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+ 
+ #include <deque>
++#include <algorithm>
+ 
+ #include "base/time/time.h"
+ #include "bat/ads/internal/frequency_capping/frequency_capping_util.h"
+diff --git a/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/dismissed_frequency_cap.cc b/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/dismissed_frequency_cap.cc
+index d17bef2f4d..2e5629335f 100644
+--- a/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/dismissed_frequency_cap.cc
++++ b/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/exclusion_rules/dismissed_frequency_cap.cc
+@@ -6,6 +6,7 @@
+ #include "bat/ads/internal/frequency_capping/exclusion_rules/dismissed_frequency_cap.h"
+ 
+ #include <stdint.h>
++#include <algorithm>
+ 
+ #include "base/strings/stringprintf.h"
+ #include "base/time/time.h"
+diff --git a/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap.cc b/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap.cc
+index d85ce9664b..7f1bc9ce9e 100644
+--- a/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap.cc
++++ b/brave/vendor/bat-native-ads/src/bat/ads/internal/frequency_capping/permission_rules/new_tab_page_ads_per_hour_frequency_cap.cc
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+ 
+ #include <deque>
++#include <algorithm>
+ 
+ #include "base/time/time.h"
+ #include "bat/ads/internal/frequency_capping/frequency_capping_util.h"