From 3e524aa2ea7257b0d83a8dae2755839b19d47014 Mon Sep 17 00:00:00 2001
From: daijro <daijro.dev@gmail.com>
Date: Sun, 1 Dec 2024 23:26:09 -0600
Subject: [PATCH] Include jvv validator file in packaging

---
 Makefile                                  |  5 ++++-
 settings/{properties.jvv => camoucfg.jvv} | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)
 rename settings/{properties.jvv => camoucfg.jvv} (97%)

diff --git a/Makefile b/Makefile
index c37ed5a..aaecd59 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ setup: setup-minimal
 ff-dbg: setup
 	# Only apply patches to help debug vanilla Firefox
 	make patch ./patches/chromeutil.patch
-	make patch ./patches/debug-url-navigation.patch
+	make patch ./patches/browser-init.patch
 	echo "LOCAL_INCLUDES += ['/camoucfg']" >> $(cf_source_dir)/dom/base/moz.build
 	touch $(cf_source_dir)/_READY
 	make checkpoint
@@ -130,6 +130,7 @@ package-linux:
 	python3 scripts/package.py linux \
 		--includes \
 			settings/chrome.css \
+			settings/camoucfg.jvv \
 			settings/properties.json \
 			bundle/fontconfigs \
 		--version $(version) \
@@ -141,6 +142,7 @@ package-macos:
 	python3 scripts/package.py macos \
 		--includes \
 			settings/chrome.css \
+			settings/camoucfg.jvv \
 			settings/properties.json \
 		--version $(version) \
 		--release $(release) \
@@ -151,6 +153,7 @@ package-windows:
 	python3 scripts/package.py windows \
 		--includes \
 			settings/chrome.css \
+			settings/camoucfg.jvv \
 			settings/properties.json \
 			~/.mozbuild/vs/VC/Redist/MSVC/14.38.33135/$(vcredist_arch)/Microsoft.VC143.CRT/*.dll \
 		--version $(version) \
diff --git a/settings/properties.jvv b/settings/camoucfg.jvv
similarity index 97%
rename from settings/properties.jvv
rename to settings/camoucfg.jvv
index f9ce302..5a20ff8 100644
--- a/settings/properties.jvv
+++ b/settings/camoucfg.jvv
@@ -18,13 +18,13 @@
     "screen.availLeft": "int[>=0]",
     "locale:language$__LOCALE": "str",
     "locale:region$__LOCALE": "str",
+    "locale:script": "str",
     "geolocation:latitude$__GEO": "double[-90 - 90]",
     "geolocation:longitude$__GEO": "double[-180 - 180]",
     "geolocation:accuracy": "double[>=0]",
     "timezone": "str[/^[\\w_]+/[\\w_]+$/]",
-    "locale:script": "str",
-    "locale:all": "str",
 
+    "locale:all": "str",
     "headers.Accept-Language": "str",
     "navigator.language": "str",
     "navigator.languages": "array[str]",
@@ -57,10 +57,10 @@
     "window.screenY": "int",
     "window.devicePixelRatio": "double[>0]",
     
-    "document.body.clientWidth$__DOC_BODY$__W_INNER": "int[>=0]",
-    "document.body.clientHeight$__DOC_BODY$__W_INNER": "int[>=0]",
-    "document.body.clientTop$__DOC_BODY": "int",
-    "document.body.clientLeft$__DOC_BODY": "int",
+    "document.body.clientWidth$__DOC_BODY": "int[>=0]",
+    "document.body.clientHeight$__DOC_BODY": "int[>=0]",
+    "document.body.clientTop": "int",
+    "document.body.clientLeft": "int",
 
     "webrtc:ipv4": "str[/^(?:[0-9]{1,3}\\.){3}[0-9]{1,3}$/]",
     "webrtc:ipv6": "str[/^(([0-9a-fA-F]{0,4}:){1,7}[0-9a-fA-F]{0,4})$/]",
@@ -84,7 +84,7 @@
 
     "webGl:renderer$__WEBGL": "str",
     "webGl:vendor$__WEBGL": "str",
-    
+
     "webGl:supportedExtensions": "array[str[/^[\\w_]+$/]]",
     "webGl2:supportedExtensions": "array[str[/^[\\w_]+$/]]",
 
@@ -92,7 +92,7 @@
     "webGl2:parameters": "@WEBGL_PARAMS",
     "webGl:parameters:blockIfNotDefined": "bool",
     "webGl2:parameters:blockIfNotDefined": "bool",
-    
+
     "webGl:shaderPrecisionFormats": "@WEBGL_SHADER_PRECISION_FORMATS",
     "webGl2:shaderPrecisionFormats": "@WEBGL_SHADER_PRECISION_FORMATS",
     "webGl:shaderPrecisionFormats:blockIfNotDefined": "bool",
@@ -258,7 +258,7 @@
             "*precision": "int[>=0]"
         }
     },
-    
+
     "@WEBGL_CONTEXT_ATTRIBUTES": {
         "alpha": "bool",
         "antialias": "bool",
@@ -291,4 +291,4 @@
     "memorysaver": "bool",
     "addons": "array[str]",
     "debug": "bool"
-}
\ No newline at end of file
+}