Meta: Use vcpkg baseline as fallback for Flatpak linting

If there is no version specified in vcpkg overrides then the vcpkg
baseline is queried for the version. The baseline is what ensures
dependency compatibility.

Author: JanKoudijs

Meta/CMake/flatpak/org.ladybird.Ladybird.json

@@ -205,7 +205,7 @@
         {
           "type": "git",
           "url": "https://github.com/GNOME/libxml2.git",
-          "tag": "v2.13.8"
+          "tag": "v2.15.0"
         }
       ],
       "config-opts": [
@@ -253,7 +253,7 @@
         {
           "type": "git",
           "url": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
-          "tag": "v3.1.0"
+          "tag": "v3.3.0"
         }
       ],
       "config-opts": [
@@ -396,7 +396,7 @@
           {
             "type": "git",
             "url": "https://github.com/google/highway.git",
-            "tag": "1.2.0",
+            "tag": "1.3.0",
             "disable-submodules": true
           }
         ],

Meta/check-flatpak.py

@@ -6,35 +6,32 @@
 
 import glob
 import json
+import os
+import subprocess
 import sys
 
 from enum import Enum
 
 VCPKG = "vcpkg.json"
 VCPKG_OVERLAYS_PORTS = "Meta/CMake/vcpkg/overlay-ports/*"
+VCPKG_URL = "https://github.com/microsoft/vcpkg.git"
+VCPKG_REPO = "Build/vcpkg"
 FLATPAK_MANIFEST = "Meta/CMake/flatpak/org.ladybird.Ladybird.json"
 SELF = "Ladybird"
 
-# List of build tools that are not provided by the Flatpak SDK and therefor in the manifest
+# List of build tools that are not provided by the Flatpak SDK and therefore in the manifest
 # For a vcpkg build these are installed on the host system
 flatpak_build_tools = [
     "gn",
 ]
 
 # List of libraries that are dependencies of dependencies
-# These are in the manifest to fetch before the build but not explicitely versioned in vcpkg
+# These are in the manifest to fetch before building but not explicitely versioned
 flatpak_deps_of_deps = [
-    "brotli",
-    "dav1d",
-    "highway",
-    "libdwarf",
-    "libxml2",
     "libyuv",
-    "vulkan-memory-allocator",
-    "zstd",
 ]
 
-# List of libraries that are in the Flatpak runtime and therefor not in the manifest
+# List of libraries that are in the Flatpak runtime and therefore not in the manifest
 # See: https://docs.flatpak.org/en/latest/available-runtimes.html#check-software-available-in-runtimes
 flatpak_runtime_libs = [
     "curl",
@@ -65,25 +62,69 @@ class DepMatch(Enum):
     Excluded = (3,)
 
 
-def check_for_match(vcpkg: dict, name: str, identifier: str) -> DepMatch:
+def get_baseline_version(baseline, name):
+    if not os.path.isdir(VCPKG_REPO):
+        cmd = f"git clone {VCPKG_URL} {VCPKG_REPO} && cd {VCPKG_REPO} && git reset --hard {baseline}"
+        subprocess.run(cmd, stdout=subprocess.PIPE, shell=True, check=True)
+
+    # Query the current vcpkg baseline for its version of this package, this becomes the reference for linting
+    cmd = f"cd {VCPKG_REPO} && git show {baseline}:versions/baseline.json | grep -E -A 3 -e '\"{name}\"'"
+    result = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True, check=True)
+
+    if not result.returncode:
+        json_string = result.stdout.decode("utf-8").replace("\n", "").removesuffix(",")
+        result = json.loads(f"{{{json_string}}}")
+
+        if "baseline" in result[name]:
+            return result[name]["baseline"]
+
+
+def check_for_match(vcpkg: dict, vcpkg_baseline, name: str, identifier: str) -> DepMatch:
+    if name == SELF or name in flatpak_build_tools or name in flatpak_deps_of_deps:
+        return DepMatch.Excluded
+
+    if name not in vcpkg:
+        version = get_baseline_version(vcpkg_baseline, name)
+
+        if version:
+            vcpkg[name] = version
+
     if name in vcpkg:
         if vcpkg[name] not in identifier:
             return DepMatch.VersionMismatch
         else:
             return DepMatch.Match
-    elif name == SELF or name in flatpak_build_tools or name in flatpak_deps_of_deps:
-        return DepMatch.Excluded
     else:
         return DepMatch.NoMatch
 
 
 def check_vcpkg_vs_flatpak_versioning():
+    def match_and_update(name: str, identifier: str) -> bool:
+        dep_match = check_for_match(vcpkg, vcpkg_baseline, name, identifier)
+
+        if dep_match == DepMatch.Match or dep_match == DepMatch.Excluded:
+            if name in vcpkg:
+                del vcpkg[name]
+
+            return False
+        else:
+            if dep_match == DepMatch.VersionMismatch:
+                print(f"{name} version mismatch. vcpkg: {vcpkg[name]}, Flatpak: {source['tag']}")
+                del vcpkg[name]
+            elif dep_match == DepMatch.NoMatch:
+                flatpak.append(name)
+
+            return True
+
     vcpkg = {}
     flatpak = []
     mismatch_found = False
 
     with open(VCPKG) as input:
-        for package in json.load(input)["overrides"]:
+        vcpkg_json = json.load(input)
+        vcpkg_baseline = vcpkg_json["builtin-baseline"]
+
+        for package in vcpkg_json["overrides"]:
             # Add name/version pair, strip any '#' postfix from the version
             vcpkg[package["name"]] = str(package["version"]).split("#")[0]
 
@@ -105,38 +146,14 @@ def check_vcpkg_vs_flatpak_versioning():
                         # Get the tag
                         # Replace '-' with '.': 76-1 vs 76.1
                         tag = str(source["tag"]).replace("-", ".")
-                        dep_match = check_for_match(vcpkg, name, tag)
-
-                        if dep_match == DepMatch.Match or dep_match == DepMatch.Excluded:
-                            if name in vcpkg:
-                                del vcpkg[name]
-                        else:
-                            mismatch_found = True
-
-                            if dep_match == DepMatch.VersionMismatch:
-                                print(f"{name} version mismatch. vcpkg: {vcpkg[name]}, Flatpak: {source['tag']}")
-                                del vcpkg[name]
-                            elif dep_match == DepMatch.NoMatch:
-                                flatpak.append(name)
+                        mismatch_found = match_and_update(name, tag)
 
                         break
                     elif "branch" in source:
                         # Get the branch
                         # Strip '_' postfix, replace '/' with '_': chromium/7258_13 vs chromium_7258
                         branch = str(source["branch"]).split("_")[0].replace("/", "_")
-                        dep_match = check_for_match(vcpkg, name, branch)
-
-                        if dep_match == DepMatch.Match or dep_match == DepMatch.Excluded:
-                            if name in vcpkg:
-                                del vcpkg[name]
-                        else:
-                            mismatch_found = True
-
-                            if dep_match == DepMatch.VersionMismatch:
-                                print(f"{name} version mismatch. vcpkg: {vcpkg[name]}, Flatpak: {source['branch']}")
-                                del vcpkg[name]
-                            elif DepMatch == DepMatch.NoMatch:
-                                flatpak.append(name)
+                        mismatch_found = match_and_update(name, branch)
 
                         break
             else: