From 6452d88c47ac7e995d4e363b3ce029b366e6d3de Mon Sep 17 00:00:00 2001
From: Pablo Brasero <pablo@pablobm.com>
Date: Mon, 22 Sep 2025 13:30:34 +0100
Subject: [PATCH] Use fork that introduces support for Docker on Apple silicon

---
 Gemfile      |  3 ++-
 Gemfile.lock | 12 +++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index cda7173a7..20653c646 100644
--- a/Gemfile
+++ b/Gemfile
@@ -118,7 +118,8 @@ gem "canonical-rails"
 # Used to generate images for traces
 gem "bzip2-ffi"
 gem "ffi-libarchive"
-gem "gd2-ffij", ">= 0.4.0"
+# Use https://github.com/dark-panda/gd2-ffij/pull/28 for Docker/macOS compatibility
+gem "gd2-ffij", :github => "rkoeze/gd2-ffij", :ref => "a203a8d5ef004a4198950e86329228fe3f331d06"
 gem "marcel"
 
 # Used for S3 object storage
diff --git a/Gemfile.lock b/Gemfile.lock
index f2d256a56..a8b25c2be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,6 +6,14 @@ GIT
     active_record_union (1.3.0)
       activerecord (>= 6.0)
 
+GIT
+  remote: https://github.com/rkoeze/gd2-ffij.git
+  revision: a203a8d5ef004a4198950e86329228fe3f331d06
+  ref: a203a8d5ef004a4198950e86329228fe3f331d06
+  specs:
+    gd2-ffij (0.4.1.dev)
+      ffi (>= 1.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -296,8 +304,6 @@ GEM
     frozen_record (0.27.4)
       activemodel
     fspath (3.1.2)
-    gd2-ffij (0.4.0)
-      ffi (>= 1.0.0)
     git (2.3.3)
       activesupport (>= 5.0)
       addressable (~> 2.8)
@@ -740,7 +746,7 @@ DEPENDENCIES
   faraday
   ffi-libarchive
   frozen_record
-  gd2-ffij (>= 0.4.0)
+  gd2-ffij!
   htmlentities
   http_accept_language (~> 2.1.1)
   i18n-js (~> 4.2.3)
-- 
2.39.5