From 08839602bd730ca03630174970aa156d9aec21d4 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 29 Aug 2023 20:02:59 +0200
Subject: mix: cherry-pick eblurhash latest git for system-CFLAGS

---
 mix.exs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 082b39e55..8fd382ec7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -190,7 +190,9 @@ defmodule Pleroma.Mixfile do
        ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
       {:restarter, path: "./restarter"},
       {:majic, "~> 1.0"},
-      {:eblurhash, "~> 1.2.2"},
+      {:eblurhash,
+       git: "https://github.com/zotonic/eblurhash.git",
+       ref: "bc37ceb426ef021ee9927fb249bb93f7059194ab"},
       {:open_api_spex, "~> 3.16"},
       {:ecto_psql_extras, "~> 0.6"},
 
-- 
cgit v1.2.3


From 41f6e8f7f4ba6cd1a5e9ca7425afa71a42c1cce7 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 29 Aug 2023 20:27:09 +0200
Subject: mix: Bump elixir-captcha for system-CFLAGS

---
 mix.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 8fd382ec7..82fcf5f1e 100644
--- a/mix.exs
+++ b/mix.exs
@@ -187,7 +187,7 @@ defmodule Pleroma.Mixfile do
        ref: "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"},
       {:captcha,
        git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
-       ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
+       ref: "90f6ce7672f70f56708792a98d98bd05176c9176"},
       {:restarter, path: "./restarter"},
       {:majic, "~> 1.0"},
       {:eblurhash,
-- 
cgit v1.2.3


From ad6a6aa07b463f943828ba75aa4c3fe0b937e3a1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 14 Dec 2023 20:14:41 -0500
Subject: Bump version to 2.6.1

---
 mix.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 82fcf5f1e..d420c11e4 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("2.6.0"),
+      version: version("2.6.1"),
       elixir: "~> 1.11",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix] ++ Mix.compilers(),
-- 
cgit v1.2.3