From 80133665f7bf7f02e99dadafbe75976f734cc3f6 Mon Sep 17 00:00:00 2001
From: Jan Koudijs <theappgineer@gmail.com>
Date: Mon, 15 Dec 2025 23:08:04 +0100
Subject: [PATCH] Meta: Bring Flatpak dependency versions in line with vcpkg
 versions

---
 Meta/CMake/flatpak/org.ladybird.Ladybird.json | 61 +++++++++++++++----
 vcpkg.json                                    |  4 ++
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/Meta/CMake/flatpak/org.ladybird.Ladybird.json b/Meta/CMake/flatpak/org.ladybird.Ladybird.json
index e3b9bbe886..1e1684a7eb 100644
--- a/Meta/CMake/flatpak/org.ladybird.Ladybird.json
+++ b/Meta/CMake/flatpak/org.ladybird.Ladybird.json
@@ -56,7 +56,7 @@
         {
           "type": "git",
           "url": "https://github.com/pnggroup/libpng.git",
-          "tag": "v1.6.49"
+          "tag": "v1.6.50"
         },
         {
           "type": "file",
@@ -112,7 +112,8 @@
         {
           "type": "git",
           "url": "https://chromium.googlesource.com/angle/angle",
-          "commit": "7ab02e1d49a649adaba62b8a7fdfabf8144b313f",
+          "commit": "79ac1a8cd767a32cce6401203e20c4bd4ca4d539",
+          "branch": "chromium/7258_13",
           "dest": "angle",
           "disable-submodules": true
         },
@@ -175,7 +176,7 @@
         {
           "type": "git",
           "url": "https://github.com/unicode-org/icu.git",
-          "tag": "release-76-1"
+          "tag": "release-78.1"
         }
       ],
       "subdir": "icu4c/source/",
@@ -252,7 +253,7 @@
         {
           "type": "git",
           "url": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
-          "tag": "v3.1.0"
+          "tag": "v3.3.0"
         }
       ],
       "config-opts": [
@@ -268,7 +269,7 @@
         {
           "type": "git",
           "url": "https://github.com/google/brotli.git",
-          "tag": "v1.1.0"
+          "tag": "v1.2.0"
         }
       ],
       "config-opts": [
@@ -283,7 +284,7 @@
       ]
     },
     {
-      "name": "libwoff2",
+      "name": "woff2",
       "buildsystem": "cmake-ninja",
       "sources": [
         {
@@ -363,7 +364,7 @@
         {
           "type": "git",
           "url": "https://github.com/webmproject/libwebp.git",
-          "tag": "v1.5.0"
+          "tag": "v1.6.0"
         }
       ],
       "config-opts": [
@@ -395,7 +396,7 @@
           {
             "type": "git",
             "url": "https://github.com/google/highway.git",
-            "tag": "1.2.0",
+            "tag": "1.3.0",
             "disable-submodules": true
           }
         ],
@@ -493,7 +494,7 @@
       ]
     },
     {
-      "name": "fast_float",
+      "name": "fast-float",
         "buildsystem": "cmake-ninja",
         "sources": [
           {
@@ -515,7 +516,7 @@
         {
           "type": "git",
           "url": "https://github.com/libsdl-org/SDL.git",
-          "tag": "release-3.2.20"
+          "tag": "release-3.2.22"
         }
       ],
       "config-opts": [
@@ -530,8 +531,8 @@
       "sources": [
         {
           "type": "git",
-          "url": "https://github.com/jeremy-rifkin/libdwarf-lite.git",
-          "tag": "v2.1.0"
+          "url": "https://github.com/davea42/libdwarf-code.git",
+          "tag": "v2.2.0"
         }
       ],
       "config-opts": [
@@ -567,7 +568,7 @@
         {
           "type": "git",
           "url": "https://github.com/jeremy-rifkin/cpptrace.git",
-          "tag": "v1.0.4"
+          "tag": "v1.0.2"
         }
       ],
       "config-opts": [
@@ -579,6 +580,40 @@
         "-DCPPTRACE_USE_EXTERNAL_ZSTD=ON"
       ]
     },
+    {
+      "name": "openssl",
+      "buildsystem": "simple",
+      "build-commands": [
+        "./Configure enable-static-engine enable-capieng no-apps no-docs no-tests shared --prefix=/app --openssldir=/app/ssl --libdir=lib",
+        "make -j$(nproc)",
+        "make install"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/openssl/openssl.git",
+          "commit": "c4da9ac23de497ce039a102e6715381047899447",
+          "tag": "openssl-3.5.3"
+        }
+      ]
+    },
+    {
+      "name": "ffmpeg",
+      "buildsystem": "simple",
+      "build-commands": [
+        "./configure --prefix=/app --libdir=lib --enable-pic --disable-doc --enable-debug --enable-runtime-cpudetect --disable-autodetect --disable-ffmpeg --disable-ffplay --disable-ffprobe --enable-avcodec --disable-avdevice --enable-avformat --disable-avfilter --disable-postproc --enable-swresample --disable-swscale --disable-alsa --disable-amf --disable-libaom --disable-libass --disable-avisynth --enable-libdav1d --disable-libfdk-aac --disable-libfontconfig --disable-libharfbuzz --disable-libfreetype --disable-libfribidi --disable-iconv --disable-libilbc --disable-lzma --disable-libmp3lame --disable-libmodplug --disable-cuda --disable-nvenc --disable-nvdec  --disable-cuvid --disable-ffnvcodec --disable-opencl --disable-opengl --enable-libopenh264 --disable-libopenjpeg --disable-libopenmpt --disable-openssl --enable-libopus --disable-sdl2 --disable-libsnappy --disable-libsoxr --disable-libspeex --disable-libssh --disable-libtensorflow --disable-libtesseract --enable-libtheora --enable-libvorbis --enable-libvpx --disable-vulkan --enable-libwebp --disable-libx265 --disable-libxml2 --enable-zlib --disable-libsrt --disable-libmfx --disable-vaapi --disable-optimizations",
+        "make -j$(nproc) V=1",
+        "make install"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/FFmpeg/FFmpeg.git",
+          "commit": "db69d06eeeab4f46da15030a80d539efb4503ca8",
+          "tag": "n7.1.1"
+        }
+      ]
+    },
     {
       "name": "Ladybird",
       "buildsystem": "cmake-ninja",
diff --git a/vcpkg.json b/vcpkg.json
index d32fb707c4..ffbb406aa1 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -223,6 +223,10 @@
       "name": "angle",
       "version": "chromium_7258#0"
     },
+    {
+      "name": "cpptrace",
+      "version": "1.0.2"
+    },
     {
       "name": "curl",
       "version": "8.16.0#0"