From c9fb54fd4ce43c41dade752653e2bf1238614b0f Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Tue, 21 May 2024 03:37:40 +0200
Subject: [PATCH] Emergency fix for charlock_holmes after ICU 75

---
 CHANGELOG.md            |  5 +++++
 Gemfile                 |  2 +-
 Gemfile.lock            | 10 ++++++++--
 lib/mastodon/version.rb |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 090525bc0b..b8e2ca9eae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All changes to Catstodon that aren't Mastodon or glitch-soc Mastodon changes will be documented here.
 
+## [v4.3.0-alpha.3+glitch+cat+1.2.4] - 2024-05-21
+
+- Emergency release to fix production after ICU version 75 broke a dependency of Mastodon, `charlock_holmes`, in places
+  that are not used in Mastodon.
+
 ## [v4.3.0-alpha.3+glitch+cat+1.2.3] - 2024-05-21
 
 - Upstream changes, once again (including, but not limited to:)
diff --git a/Gemfile b/Gemfile
index 240dcce95a..068372afe7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
 gem 'bootsnap', '~> 1.18.0', require: false
 gem 'browser'
-gem 'charlock_holmes', '~> 0.7.7'
+gem 'charlock_holmes', github: 'kescher-temp-forks/charlock_holmes', ref: '0a6a8eb2f759477e618e58b81e85365b2b67d306'
 gem 'chewy', '~> 7.3'
 gem 'devise', '~> 4.9'
 gem 'devise-two-factor'
diff --git a/Gemfile.lock b/Gemfile.lock
index eade99acfd..df3b097379 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,13 @@ GIT
       hkdf (~> 0.2)
       jwt (~> 2.0)
 
+GIT
+  remote: https://github.com/kescher-temp-forks/charlock_holmes.git
+  revision: 0a6a8eb2f759477e618e58b81e85365b2b67d306
+  ref: 0a6a8eb2f759477e618e58b81e85365b2b67d306
+  specs:
+    charlock_holmes (0.7.7)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -159,7 +166,6 @@ GEM
     case_transform (0.2)
       activesupport
     cbor (0.5.9.8)
-    charlock_holmes (0.7.7)
     chewy (7.6.0)
       activesupport (>= 5.2)
       elasticsearch (>= 7.14.0, < 8)
@@ -913,7 +919,7 @@ DEPENDENCIES
   browser
   bundler-audit (~> 0.9)
   capybara (~> 3.39)
-  charlock_holmes (~> 0.7.7)
+  charlock_holmes!
   chewy (~> 7.3)
   climate_control
   cocoon (~> 1.2)
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 343986efa4..1bcc1dfb0f 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ module Mastodon
     end
 
     def catstodon_revision
-      '1.2.3'
+      '1.2.4'
     end
 
     def build_metadata