naiveproxy: Update to 95.0.4638.54-1

Removed outdated patch.

Signed-off-by: Tianling Shen <[email protected]>

naiveproxy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=naiveproxy
-PKG_VERSION:=94.0.4606.61-1
-PKG_RELEASE:=2
+PKG_VERSION:=95.0.4638.54-1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=26c00dfe14284ff19fe78e4185649a48292582adf7d6e3d2d0e994098c393097
+PKG_HASH:=ccfb2462d91d9c0a77be23aef33962a0ce761a63e8e77c9a34e815c504dceac0
 
 PKG_LICENSE:=BSD 3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -23,6 +23,14 @@ endif
 PKG_USE_MIPS16:=0
 PKG_BUILD_PARALLEL:=1
 
+ifeq ($(NINJA),)
+NINJA = \
+	MAKEFLAGS="$(MAKE_JOBSERVER)" \
+		$(STAGING_DIR_HOSTPKG)/bin/ninja \
+		$(if $(findstring c,$(OPENWRT_VERBOSE)),-v) \
+		$(if $(MAKE_JOBSERVER),,-j1)
+endif
+
 ifneq ($(CONFIG_CPU_TYPE)," ")
   CPU_TYPE:=$(word 1, $(subst +," ,$(CONFIG_CPU_TYPE)))
   CPU_SUBTYPE:=$(word 2, $(subst +, ",$(CONFIG_CPU_TYPE)))
@@ -36,17 +44,13 @@ endif
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/naiveproxy/config
-	depends on !(arc||armeb||mips||mips64||powerpc)
-endef
-
 define Package/naiveproxy
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Web Servers/Proxies
   URL:=https://github.com/klzgrad/naiveproxy
   TITLE:=Make a fortune quietly
-  DEPENDS:=+libatomic
+  DEPENDS:=@!(arc||armeb||mips||mips64||powerpc) +libatomic
 endef
 
 define Package/naiveproxy/description
@@ -62,13 +66,13 @@ ifneq ($(CONFIG_CCACHE),)
   export naive_ccache_flags=cc_wrapper="$(CCACHE)"
 endif
 
-CLANG_VER:=14-init-1002-gb5e470aa-1
+CLANG_VER:=14-init-3191-g0e03450a-1
 CLANG_FILE:=clang-llvmorg-$(CLANG_VER).tgz
 define Download/CLANG
 	URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64
 	URL_FILE:=$(CLANG_FILE)
 	FILE:=$(CLANG_FILE)
-	HASH:=bed9118082c98d990434c02230d9eec5e3aa3158b479d4cd3317482906d4e897
+	HASH:=dd7479d43ce61401e057a5dee8b7e32bc2bd0d0e15d4f46c6858daf9170c9978
 endef
 
 GN_VER:=69ec4fca1fa69ddadae13f9e6b7507efa0675263
@@ -80,14 +84,14 @@ define Download/GN_TOOL
 	HASH:=8bedd600ac58311f384e5113ab6a544bc72edb587ccb8f9e784c4dff208872c4
 endef
 
-PGO_VER:=4606-1632147900-2674511630c4bfe602871b9780dec43586d68327
+PGO_VER:=4638-1634308623-72bf2d0e0b11b9cb785718016169434ba1d25ee3
 PGO_FILE:=chrome-linux-$(PGO_VER).profdata
 define Download/PGO_PROF
 	URL:=https://storage.googleapis.com.cnpmjs.org/chromium-optimization-profiles/pgo_profiles \
 	     https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles
 	URL_FILE:=$(PGO_FILE)
 	FILE:=$(PGO_FILE)
-	HASH:=d729c99079a619fc0fa33b3f79a731942cad7fcefae0a683678e3c32530d1bf7
+	HASH:=252703067ad0897cc0f39f618eb792b0899769bb0e1b715b64bee15bcfba6f0b
 endef
 
 define Build/Prepare
@@ -104,14 +108,6 @@ define Build/Prepare
 	)
 endef
 
-ifeq ($(NINJA),)
-NINJA = \
-	MAKEFLAGS="$(MAKE_JOBSERVER)" \
-		$(STAGING_DIR_HOSTPKG)/bin/ninja \
-		$(if $(findstring c,$(OPENWRT_VERBOSE)),-v) \
-		$(if $(MAKE_JOBSERVER),,-j1)
-endif
-
 define Build/Compile
 	( \
 		cd "$(PKG_BUILD_DIR)/src" ; \
@@ -119,8 +115,8 @@ define Build/Compile
 		export naive_flags+=" $$$${naive_ccache_flags}" ; \
 		mkdir -p "out" ; \
 		./gn/out/gn gen "out/Release" --args="$$$${naive_flags}" --script-executable="$(PYTHON)" ; \
+		$(NINJA) -C "$(PKG_BUILD_DIR)/src/out/Release" naive ; \
 	)
-	+$(NINJA) -C "$(PKG_BUILD_DIR)/src/out/Release" naive
 endef
 
 define Package/naiveproxy/install

naiveproxy/patches/100-mips-headers.patch

@@ -1,55 +0,0 @@
---- a/src/third_party/abseil-cpp/absl/base/internal/direct_mmap.h
-+++ b/src/third_party/abseil-cpp/absl/base/internal/direct_mmap.h
-@@ -41,13 +41,7 @@
- 
- #ifdef __mips__
- // Include definitions of the ABI currently in use.
--#ifdef __BIONIC__
--// Android doesn't have sgidefs.h, but does have asm/sgidefs.h, which has the
--// definitions we need.
- #include <asm/sgidefs.h>
--#else
--#include <sgidefs.h>
--#endif  // __BIONIC__
- #endif  // __mips__
- 
- // SYS_mmap and SYS_munmap are not defined in Android.
---- a/src/third_party/lss/linux_syscall_support.h
-+++ b/src/third_party/lss/linux_syscall_support.h
-@@ -119,14 +119,7 @@ extern "C" {
- 
- #ifdef __mips__
- /* Include definitions of the ABI currently in use.                          */
--#ifdef __ANDROID__
--/* Android doesn't have sgidefs.h, but does have asm/sgidefs.h,
-- * which has the definitions we need.
-- */
- #include <asm/sgidefs.h>
--#else
--#include <sgidefs.h>
--#endif
- #endif
- #endif
- 
---- a/src/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
-+++ b/src/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
-@@ -166,7 +166,7 @@ extern "C" {
- 
- #ifdef __mips__
- /* Include definitions of the ABI currently in use.                          */
--#include <sgidefs.h>
-+#include <asm/sgidefs.h>
- #endif
- 
- #endif
---- a/src/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h
-+++ b/src/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h
-@@ -166,7 +166,7 @@ extern "C" {
- 
- #ifdef __mips__
- /* Include definitions of the ABI currently in use.                          */
--#include <sgidefs.h>
-+#include <asm/sgidefs.h>
- #endif
- 
- #endif

naiveproxy/src/init_env.sh

@@ -61,7 +61,6 @@ use_glib=false
 
 disable_file_support=true
 enable_websockets=false
-disable_ftp_support=true
 use_kerberos=false
 enable_mdns=false
 enable_reporting=false
@@ -85,8 +84,8 @@ case "${target_arch}" in
 		naive_flags+=" arm_float_abi=\"soft\" arm_use_neon=false"
 	fi
 	;;
-"mips"|"mips64"|"mipsel"|"mips64el")
-	naive_flags+=" use_gold=false use_thin_lto=false use_lld=false mips_arch_variant=\"r2\""
-	[[ "${target_arch}" =~ ^"mips"$|^"mipsel"$ ]] && naive_flags+=" mips_float_abi=\"soft\" mips_tune=\"${cpu_type}\" chrome_pgo_phase=0"
+"mipsel"|"mips64el")
+	naive_flags+=" use_gold=false use_thin_lto=false use_lld=false chrome_pgo_phase=0 mips_arch_variant=\"r2\""
+	[ "${target_arch}" == "mipsel" ] && naive_flags+=" mips_float_abi=\"soft\" mips_tune=\"${cpu_type}\""
 	;;
 esac