commit: 2869478a2b1f3d3234e52643f7da2039708bb6cd Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> AuthorDate: Tue Jan 27 08:08:30 2026 +0000 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> CommitDate: Tue Jan 27 08:24:16 2026 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2869478a
www-apps/pleroma: restore vips fix as separated revision That way if eapply outside of src_prepare breaks, the one without vips-fix can also be used. This restores commit 01a7f90a35fb6a8cf7676646c4a7da4ec34e2598. This partially reverts commit ce89d7e46624621c3f7d912ea0e2604a4178642f. Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> .../pleroma/files/pleroma-2.10.0-vix_bump.patch | 52 ++++++++++++++++++++++ ...roma-2.10.0.ebuild => pleroma-2.10.0-r1.ebuild} | 5 ++- www-apps/pleroma/pleroma-2.10.0.ebuild | 4 ++ 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/www-apps/pleroma/files/pleroma-2.10.0-vix_bump.patch b/www-apps/pleroma/files/pleroma-2.10.0-vix_bump.patch new file mode 100644 index 0000000000..8234ce1f73 --- /dev/null +++ b/www-apps/pleroma/files/pleroma-2.10.0-vix_bump.patch @@ -0,0 +1,52 @@ +From 05704ec86e605ca681c5e95eac57b53851721548 Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" <[email protected]> +Date: Wed, 14 Jan 2026 02:37:55 +0100 +Subject: [PATCH] mix: upgrade vix from "~> 0.26.0" to "~> 0.36" + +Dropping the last zero should allow to get 0.x updates rather +than only 0.36.x updates. + +Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/3393 +--- + changelog.d/vix-0.36.0.fix | 1 + + mix.exs | 2 +- + mix.lock | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 changelog.d/vix-0.36.0.fix + +diff --git a/changelog.d/vix-0.36.0.fix b/changelog.d/vix-0.36.0.fix +new file mode 100644 +index 0000000000..43a8dd8f83 +--- /dev/null ++++ b/changelog.d/vix-0.36.0.fix +@@ -0,0 +1 @@ ++Fix compilation with vips-8.18.0 with bumping to vix 0.36.0 +diff --git a/mix.exs b/mix.exs +index 48ec9b68fb..5b0c62a49e 100644 +--- a/mix.exs ++++ b/mix.exs +@@ -193,7 +193,7 @@ defp deps do + {:majic, "~> 1.0"}, + {:open_api_spex, "~> 3.16"}, + {:ecto_psql_extras, "~> 0.8"}, +- {:vix, "~> 0.26.0"}, ++ {:vix, "~> 0.36"}, + {:elixir_make, "~> 0.7.7", override: true}, + {:blurhash, "~> 0.1.0", hex: :rinpatch_blurhash}, + {:exile, "~> 0.10.0"}, +diff --git a/mix.lock b/mix.lock +index c469f4f015..a0ef38fc0a 100644 +--- a/mix.lock ++++ b/mix.lock +@@ -152,7 +152,7 @@ + "ueberauth": {:hex, :ueberauth, "0.10.8", "ba78fbcbb27d811a6cd06ad851793aaf7d27c3b30c9e95349c2c362b344cd8f0", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "f2d3172e52821375bccb8460e5fa5cb91cfd60b19b636b6e57e9759b6f8c10c1"}, + "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.1", "a48703a25c170eedadca83b11e88985af08d35f37c6f664d6dcfb106a97782fc", [:rebar3], [], "hexpm", "b3a917854ce3ae233619744ad1e0102e05673136776fb2fa76234f3e03b23642"}, + "unsafe": {:hex, :unsafe, "1.0.2", "23c6be12f6c1605364801f4b47007c0c159497d0446ad378b5cf05f1855c0581", [:mix], [], "hexpm", "b485231683c3ab01a9cd44cb4a79f152c6f3bb87358439c6f68791b85c2df675"}, +- "vix": {:hex, :vix, "0.26.0", "027f10b6969b759318be84bd0bd8c88af877445e4e41cf96a0460392cea5399c", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:cc_precompiler, "~> 0.1.4 or ~> 0.2", [hex: :cc_precompiler, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.7.3 or ~> 0.8", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:kino, "~> 0.7", [hex: :kino, repo: "hexpm", optional: true]}], "hexpm", "71b0a79ae7f199cacfc8e679b0e4ba25ee47dc02e182c5b9097efb29fbe14efd"}, ++ "vix": {:hex, :vix, "0.36.0", "3132dc065beda06dab1895a53d8c852d8e6a5bbca375c609435e968b1290e113", [:make, :mix], [{:cc_precompiler, "~> 0.1.4 or ~> 0.2", [hex: :cc_precompiler, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.7.3 or ~> 0.8", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:kino, "~> 0.7", [hex: :kino, repo: "hexpm", optional: true]}], "hexpm", "92f912b4e90c453f92942742105bcdb367ad53406759da251bd2e587e33f4134"}, + "web_push_encryption": {:hex, :web_push_encryption, "0.3.1", "76d0e7375142dfee67391e7690e89f92578889cbcf2879377900b5620ee4708d", [:mix], [{:httpoison, "~> 1.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jose, "~> 1.11.1", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm", "4f82b2e57622fb9337559058e8797cb0df7e7c9790793bdc4e40bc895f70e2a2"}, + "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"}, + "websock_adapter": {:hex, :websock_adapter, "0.5.8", "3b97dc94e407e2d1fc666b2fb9acf6be81a1798a2602294aac000260a7c4a47d", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "315b9a1865552212b5f35140ad194e67ce31af45bcee443d4ecb96b5fd3f3782"}, +-- +GitLab + diff --git a/www-apps/pleroma/pleroma-2.10.0.ebuild b/www-apps/pleroma/pleroma-2.10.0-r1.ebuild similarity index 96% copy from www-apps/pleroma/pleroma-2.10.0.ebuild copy to www-apps/pleroma/pleroma-2.10.0-r1.ebuild index fe7ff017d7..2a51e38651 100644 --- a/www-apps/pleroma/pleroma-2.10.0.ebuild +++ b/www-apps/pleroma/pleroma-2.10.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Haelwenn (lanodan) Monnier <[email protected]> +# Copyright 2022-2026 Haelwenn (lanodan) Monnier <[email protected]> # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,7 +35,7 @@ BDEPEND=" " DEPEND=" dev-libs/glib - <media-libs/vips-8.18.0:= + media-libs/vips:= sys-apps/file sys-libs/ncurses:= system-lexbor? ( dev-libs/lexbor ) @@ -53,6 +53,7 @@ src_unpack() { [[ "${PV}" == *9999 ]] && git-r3_src_unpack cd "${S}" || die + eapply "${FILESDIR}/pleroma-2.10.0-vix_bump.patch" emix deps.get --only prod } diff --git a/www-apps/pleroma/pleroma-2.10.0.ebuild b/www-apps/pleroma/pleroma-2.10.0.ebuild index fe7ff017d7..0e5c23f904 100644 --- a/www-apps/pleroma/pleroma-2.10.0.ebuild +++ b/www-apps/pleroma/pleroma-2.10.0.ebuild @@ -1,6 +1,10 @@ # Copyright 2022-2024 Haelwenn (lanodan) Monnier <[email protected]> # Distributed under the terms of the GNU General Public License v2 +# Note: pleroma-2.10.0 should be kept as long as ~pleroma-2.10.0-r1 +# is as while eapply in src_unpack technically still works it is +# outside policy and so not guaranteed to work. + EAPI=7 inherit mix optfeature flag-o-matic
