user/mastodon/24073_prefer-stored-location-as-after-sign-in-path.patch

@@ -1,23 +0,0 @@
-From e48894bfe303b0d8b8f1c1bdf43f07e1baca3176 Mon Sep 17 00:00:00 2001
-From: CSDUMMI <csdummi.misquality@simplelogin.co>
-Date: Sat, 11 Mar 2023 18:21:53 +0100
-Subject: [PATCH] Prefer the stored locatio in the omniauth callback controller
- over the root path
-
----
- app/controllers/auth/omniauth_callbacks_controller.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/app/controllers/auth/omniauth_callbacks_controller.rb b/app/controllers/auth/omniauth_callbacks_controller.rb
-index 3d7962de56cb..9e0fb942aaff 100644
---- a/app/controllers/auth/omniauth_callbacks_controller.rb
-+++ b/app/controllers/auth/omniauth_callbacks_controller.rb
-@@ -33,7 +33,7 @@ def self.provides_callback_for(provider)
- 
-   def after_sign_in_path_for(resource)
-     if resource.email_present?
--      root_path
-+      stored_location_for(resource) || root_path
-     else
-       auth_setup_path(missing_email: '1')
-     end

user/mastodon/APKBUILD

@@ -3,11 +3,11 @@
 
 pkgname=mastodon
 _pkgname=$pkgname
-pkgver=4.1.8
+pkgver=4.2.1
 _gittag=v$pkgver
 pkgrel=0
 pkgdesc="Self-hosted social media and network server based on ActivityPub and OStatus"
-arch="x86_64 aarch64"
+arch="x86_64"
 url="https://github.com/mastodon/mastodon"
 license="AGPL-3.0-only"
 depends="
@@ -45,7 +45,6 @@ install="
 	"
 source="
 	mastodon-$_gittag.tar.gz::https://github.com/mastodon/mastodon/archive/$_gittag.tar.gz
-	24073_prefer-stored-location-as-after-sign-in-path.patch
 	mastodon.initd
 	mastodon.web.initd
 	mastodon.sidekiq.initd
@@ -193,8 +192,7 @@ assets() {
 }
 
 sha512sums="
-3995f12f624fb4254f3e3785aa5e25f569c3551ab378aacaa2dd8e576dcbfda328b326f1589e6b5e6a021b3903875c5958ad771e63d4d680ff88d000645d9c18  mastodon-v4.1.8.tar.gz
-730d3bef92b0da2ef400b5205fd8ab7159a458d654fa4d9a16cc0b579331ac67bec8b302096dff3470a3363b88a770ec857f1db7a0112effd07275da661c654a  24073_prefer-stored-location-as-after-sign-in-path.patch
+54e3e14abbe9ce6b4ec72586b00d0e7845b8e7b0f18ee608ab452a4b56df257657ffcd1f3a0b8de715dbaad3edacbf31a4e20cef5f5d82b6902837ee9a6ab900  mastodon-v4.2.1.tar.gz
 36604cd630f0f5b4d88b630b1512cd26e922f859e5d19cbb85106ff29fc9048d2349f926d5c4b6947c655f67e60ec33e2f524a8154405a4369f283e00be7cdce  mastodon.initd
 9e77061fbdebe90492398f8089a7d2612ff4b6e70b5462dd67330b66d9788cb0133eab38c372b1f27a7214aacdd9f7f70381d4ecc6e92c8c38d794404ae0f840  mastodon.web.initd
 6dacafca86dd39f6a6efa773cfe35b4632098175605a7c64488027237b01028d9785e50a3a0532b88ebf8f857c9a594c7b68f9e577b46e95104e7cffde51ccf8  mastodon.sidekiq.initd