From aff7be31946beeff5f78231e37ab9180b840de40 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Fri, 13 Jan 2023 00:36:31 +0100
Subject: [PATCH 1/2] bump ruby version

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 896cb0e..4df0f0c 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -9,7 +9,7 @@ pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git
 
 MEMORY_NEEDED="2560"
 
-RUBY_VERSION="3.0.3"
+RUBY_VERSION="3.0.4"
 
 NODEJS_VERSION="14"
 

From 0d52dd546f5baead841243214b88508935c9ad61 Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Sat, 28 Jan 2023 16:42:25 +0100
Subject: [PATCH 2/2] Patch Gemfile to fix blurhash and ox packages

https://github.com/YunoHost-Apps/mastodon_ynh/pull/360
---
 sources/patches/app-blurhash-bugfix.patch | 60 +++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 sources/patches/app-blurhash-bugfix.patch

diff --git a/sources/patches/app-blurhash-bugfix.patch b/sources/patches/app-blurhash-bugfix.patch
new file mode 100644
index 0000000..e75702b
--- /dev/null
+++ b/sources/patches/app-blurhash-bugfix.patch
@@ -0,0 +1,60 @@
+diff --git a/Gemfile b/Gemfile
+index 7c36bc6b8..3f691d102 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -22,7 +22,8 @@
+ gem 'fog-core', '<= 2.1.0'
+ gem 'fog-openstack', '~> 0.3', require: false
+ gem 'kt-paperclip', '~> 7.1'
+-gem 'blurhash', '~> 0.1'
++gem 'blurhash', github: 'Gargron/blurhash', ref: '870a34e01ce7d09a7bd4d700435e1764ca823246'
++
+ 
+ gem 'active_model_serializers', '~> 0.10'
+ gem 'addressable', '~> 2.8'
+
+diff --git a/Gemfile.lock b/Gemfile.lock
+index 7c36bc6b8..3f691d102 100644
+--- a/Gemfile.lock
++++ b/Gemfile.lock
+@@ -7,6 +7,13 @@
+       hkdf (~> 0.2)
+       jwt (~> 2.0)
+ 
++GIT
++  remote: https://github.com/Gargron/blurhash.git
++  revision: 870a34e01ce7d09a7bd4d700435e1764ca823246
++  ref: 870a34e01ce7d09a7bd4d700435e1764ca823246
++  specs:
++    blurhash (0.1.6)
++
+ GEM
+   remote: https://rubygems.org/
+   specs:
+@@ -120,8 +127,6 @@
+     bindata (2.4.10)
+     binding_of_caller (1.0.0)
+       debug_inspector (>= 0.0.1)
+-    blurhash (0.1.6)
+-      ffi (~> 1.14)
+     bootsnap (1.13.0)
+       msgpack (~> 1.2)
+     brakeman (5.3.1)
+@@ -448,7 +453,7 @@
+     openssl-signature_algorithm (1.2.1)
+       openssl (> 2.0, < 3.1)
+     orm_adapter (0.5.0)
+-    ox (2.14.11)
++    ox (2.14.13)
+     parallel (1.22.1)
+     parser (3.1.2.1)
+       ast (~> 2.4.1)
+@@ -738,7 +743,7 @@
+   aws-sdk-s3 (~> 1.114)
+   better_errors (~> 2.9)
+   binding_of_caller (~> 1.0)
+-  blurhash (~> 0.1)
++  blurhash!
+   bootsnap (~> 1.13.0)
+   brakeman (~> 5.3)
+   browser