Bump version to v101.0.4951.41-1

use downloaded clang

2 files changed, 36 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e36e4b8baae..41bd19e9b485 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,12 @@
 pkgbase = naiveproxy
 	pkgdesc = A Proxy using Chrome's network stack to camouflage traffic with strong censorship resistence and low detectablility.
-	pkgver = 100.0.4896.60_1
+	pkgver = 101.0.4951.41_1
 	pkgrel = 1
 	url = https://github.com/klzgrad/naiveproxy
 	arch = x86_64
 	license = BSD
 	makedepends = ninja
 	makedepends = gn
-	makedepends = llvm
-	makedepends = lld
-	makedepends = clang
 	makedepends = ccache
 	makedepends = python
 	makedepends = unzip
@@ -18,21 +15,25 @@ pkgbase = naiveproxy
 	provides = naiveproxy
 	conflicts = naiveproxy-git
 	conflicts = naiveproxy-bin
+	noextract = clang-llvmorg-15-init-3677-g8133778d-4.tgz
 	backup = etc/naiveproxy/config.json
 	source = naiveproxy.service
 	source = naiveproxy@.service
 	source = naiveproxy.sysusers
-	source = naiveproxy-100.0.4896.60-1.tar.gz::https://github.com/klzgrad/naiveproxy/archive/refs/tags/v100.0.4896.60-1.tar.gz
-	source = chrome-linux-4896-1648230561-717dc24b4ffc1663d1990243de5d49fac8001b06.profdata::https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles/chrome-linux-4896-1648230561-717dc24b4ffc1663d1990243de5d49fac8001b06.profdata
+	source = naiveproxy-101.0.4951.41-1.tar.gz::https://github.com/klzgrad/naiveproxy/archive/refs/tags/v101.0.4951.41-1.tar.gz
+	source = chrome-linux-4951-1650389737-545882ae3e5c9e7f75e0781c8dc0d1eafb667efd.profdata::https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles/chrome-linux-4951-1650389737-545882ae3e5c9e7f75e0781c8dc0d1eafb667efd.profdata
+	source = clang-llvmorg-15-init-3677-g8133778d-4.tgz::https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-llvmorg-15-init-3677-g8133778d-4.tgz
 	sha1sums = 4c18f44ba51d40bfd7e6ae8ecb30b8e812acb8e8
 	sha1sums = 013b31ae43e309bc6560b61e8b4196f8f14f738f
 	sha1sums = 3727d7da81b1480d60e593a7d6878d981b35c4f6
-	sha1sums = dfbeeaf9485de98de0870f5384c65917c3223357
-	sha1sums = 717dc24b4ffc1663d1990243de5d49fac8001b06
+	sha1sums = ddebc7fcbcd59820f208d2708510ce3a1a1b1e4b
+	sha1sums = 545882ae3e5c9e7f75e0781c8dc0d1eafb667efd
+	sha1sums = 895d8d24961f45089d376c23400dfa05c00a108c
 	sha256sums = c05026423ca08e2c712745b717c23395e344f2c99b2dad30beed8e26922d268f
 	sha256sums = daa0f591233625730168f3ea006f1d5a7e439e26b35a1051d957e394aa8a4440
 	sha256sums = 5bc9ef361e6303e151b6e63deb31b47e24a4f34ade4d8f092a04bc98e89a2edb
-	sha256sums = bcab770b15e6c5d3f50a83992d084c8f53942aa6ebd59463c21979be668a3e61
-	sha256sums = 66fcba3f0ca6e97713ffd72c3937230ba63116ae64e9d520c960e368df6c954e
+	sha256sums = 890720b00ed81eacb11388b5c1a1d00c98182db6b57e87ba0053a5300aacfd5c
+	sha256sums = 5b1490bb6176f0f70d19029701a2a2f8e26c9df01781db41b946659e3972892b
+	sha256sums = 26d8c347253528e6dca471fa040d0e5e0f8eb55e6ec9671a673b88c723330a21
 
 pkgname = naiveproxy
diff --git a/PKGBUILD b/PKGBUILD
index 9097bf210ed5..7a67bcf3d46e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,38 +3,48 @@
 
 pkgname=naiveproxy
 pkgdesc="A Proxy using Chrome's network stack to camouflage traffic with strong censorship resistence and low detectablility."
-pkgver=100.0.4896.60_1
+pkgver=101.0.4951.41_1
 pkgrel=1
-_pkgver=100.0.4896.60
+_pkgver=101.0.4951.41
 _pkgrel=1
 arch=('x86_64')
 url='https://github.com/klzgrad/naiveproxy'
 license=('BSD')
 depends=("gcc-libs" "glibc")
-makedepends=("ninja" "gn" "llvm" "lld" "clang" "ccache" "python" "unzip")
+# makedepends=("ninja" "gn" "llvm" "lld" "clang" "ccache" "python" "unzip")
+makedepends=("ninja" "gn" "ccache" "python" "unzip")
+
+_PGO_PATH='chrome-linux-4951-1650389737-545882ae3e5c9e7f75e0781c8dc0d1eafb667efd.profdata'
+_clang_path='clang-llvmorg-15-init-3677-g8133778d-4.tgz'
 
-_PGO_PATH='chrome-linux-4896-1648230561-717dc24b4ffc1663d1990243de5d49fac8001b06.profdata'
 source=(
   "naiveproxy.service"
   "naiveproxy@.service"
   "naiveproxy.sysusers"
   "${pkgname}-${_pkgver}-${_pkgrel}.tar.gz::https://github.com/klzgrad/naiveproxy/archive/refs/tags/v${_pkgver}-${_pkgrel}.tar.gz"
   "${_PGO_PATH}::https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles/${_PGO_PATH}"
+  "${_clang_path}::https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/${_clang_path}"
+)
+
+noextract=(
+  "${_clang_path}"
 )
 
 sha1sums=(
   "4c18f44ba51d40bfd7e6ae8ecb30b8e812acb8e8"
   "013b31ae43e309bc6560b61e8b4196f8f14f738f"
   "3727d7da81b1480d60e593a7d6878d981b35c4f6"
-  "dfbeeaf9485de98de0870f5384c65917c3223357"
-  "717dc24b4ffc1663d1990243de5d49fac8001b06"
+  "ddebc7fcbcd59820f208d2708510ce3a1a1b1e4b"
+  "545882ae3e5c9e7f75e0781c8dc0d1eafb667efd"
+  "895d8d24961f45089d376c23400dfa05c00a108c"
 )
 sha256sums=(
   "c05026423ca08e2c712745b717c23395e344f2c99b2dad30beed8e26922d268f"
   "daa0f591233625730168f3ea006f1d5a7e439e26b35a1051d957e394aa8a4440"
   "5bc9ef361e6303e151b6e63deb31b47e24a4f34ade4d8f092a04bc98e89a2edb"
-  "bcab770b15e6c5d3f50a83992d084c8f53942aa6ebd59463c21979be668a3e61"
-  "66fcba3f0ca6e97713ffd72c3937230ba63116ae64e9d520c960e368df6c954e"
+  "890720b00ed81eacb11388b5c1a1d00c98182db6b57e87ba0053a5300aacfd5c"
+  "5b1490bb6176f0f70d19029701a2a2f8e26c9df01781db41b946659e3972892b"
+  "26d8c347253528e6dca471fa040d0e5e0f8eb55e6ec9671a673b88c723330a21"
 )
 
 backup=(etc/naiveproxy/config.json)
@@ -46,6 +56,9 @@ prepare() {
 
   mkdir -p ${SRC_DIR}/chrome/build/pgo_profiles
   cp ${_PGO_PATH} ${SRC_DIR}/chrome/build/pgo_profiles
+
+  mkdir -p ${SRC_DIR}/third_party/llvm-build/Release+Asserts
+  tar xzf ${_clang_path} -C ${SRC_DIR}/third_party/llvm-build/Release+Asserts
 }
 
 build(){
@@ -107,10 +120,10 @@ build(){
   # use system clang
   # disable clang plugins
   # build without afdo.prof
-  flags="$flags"'
-    clang_base_path=""
-    clang_use_chrome_plugins=false
-    clang_use_default_sample_profile=false'
+  # flags="$flags"'
+  #   clang_base_path=""
+  #   clang_use_chrome_plugins=false
+  #   clang_use_default_sample_profile=false'
 
   rm -rf "./$out"
   mkdir -p out