From f2026b63a2d1bfb491d5a109174c2130a8036923 Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Sat, 30 Nov 2024 15:38:10 -0500
Subject: [PATCH] community/git-annex: downgrade wai-extra to fix build
---
community/git-annex/APKBUILD | 10 ++++---
.../wai-extra-downgrade-3.1.16.patch | 27 +++++++++++++++++++
2 files changed, 33 insertions(+), 4 deletions(-)
create mode 100644 community/git-annex/wai-extra-downgrade-3.1.16.patch
diff --git a/community/git-annex/APKBUILD b/community/git-annex/APKBUILD
index 04aac4ddeb0c..962b7ac7487b 100644
--- a/community/git-annex/APKBUILD
+++ b/community/git-annex/APKBUILD
@@ -2,10 +2,10 @@
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=git-annex
pkgver=10.20241031
-pkgrel=0
+pkgrel=1
pkgdesc="Manage files with git, without checking their contents into git"
url="http://git-annex.branchable.com"
-#arch="x86_64 aarch64" # limited by ghc
+arch="x86_64 aarch64" # limited by ghc
license="AGPL-3.0-or-later"
options="net"
depends="
@@ -33,6 +33,7 @@ source="
https://ayakael.net/api/packages/mirrors/generic/git-annex/$pkgver/git-annex-$pkgver-edge.cabal
fix-makefile.patch
ghc-9.8.patch
+ wai-extra-downgrade-3.1.16.patch
"
subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-fish-completion $pkgname-zsh-completion"
@@ -55,8 +56,8 @@ cabal_update() {
}
prepare() {
+ cp -L "$srcdir"/git-annex-*.cabal "$builddir"/cabal.project.freeze
default_prepare
- ln -sf "$srcdir"/git-annex-*.config "$builddir"/cabal.project.freeze
}
build() {
@@ -90,7 +91,8 @@ package() {
sha512sums="
8032c7bf78b0dc63a9bd91de9e0687e297ba09160989f03575173e0f5748f4933b57935afc5e2684ae19903d87d7bb60913da4dd2efc0d428e4f880366d60df0 git-annex-10.20241031.tar.gz
-cde57b87eccd5bcce04afe1087131c72a8a9c3798b8b4affbe5510a797b9e32e761ee203e858e1536f236a46cde47d6b571903d942df5ae1a4b162fcd83d9375 git-annex-10.20241031-edge.cabal
+57903f2484a249d30ecdcf8f9fbe9a5c5956156de52db14456f9e8b527459cf1a00dda736b39c335d29c86956748b2607a3ffae2a25f518969ab992b4ed035e3 git-annex-10.20241031-edge.cabal
b24201f6d2d1532e65881be41cf6ece071a5d53ea14ad8754e6344ef8168dfccb01db0be02dcd57a002fe5d5dde13898b2b063432d5fe965ec72e7d7066e9d75 fix-makefile.patch
05b2f7248ebe3244e7a89a889bc6b6acf91114aa72b8b8e63c742483f7bd94e2ba8b16e917a091954893ba57a6ab0b0a9ccc23c219f2fd626d78d06b9fa106f1 ghc-9.8.patch
+81b67fc0c4eb44bf045ef472ccbb41efbf3fae2eb983ccf2a9776cb97862d09f507e0c67030371345107f63b57b99481ae52f9b88d6a52fd6518cd05f54498b0 wai-extra-downgrade-3.1.16.patch
"
diff --git a/community/git-annex/wai-extra-downgrade-3.1.16.patch b/community/git-annex/wai-extra-downgrade-3.1.16.patch
new file mode 100644
index 000000000000..261e7fe2366d
--- /dev/null
+++ b/community/git-annex/wai-extra-downgrade-3.1.16.patch
@@ -0,0 +1,27 @@
+diff --git a/cabal.project.freeze.orig b/cabal.project.freeze
+index 5382c516996..e7c1734b2cf 100644
+--- a/cabal.project.freeze.orig
++++ b/cabal.project.freeze
+@@ -342,7 +342,7 @@ constraints: any.Cabal ==3.10.2.0,
+ any.wai ==3.2.4,
+ any.wai-app-static ==3.1.9,
+ wai-app-static +crypton -print,
+- any.wai-extra ==3.1.17,
++ any.wai-extra ==3.1.16,
+ wai-extra -build-example,
+ any.wai-logger ==2.5.0,
+ any.warp ==3.4.6,
+ index-state: hackage.haskell.org 2024-11-30T19:00:43Z
+diff --git a/git-annex.cabal.orig b/git-annex.cabal
+index 83d6b02489d..ca96d5ce071 100644
+--- a/git-annex.cabal.orig
++++ b/git-annex.cabal
+@@ -350,7 +350,7 @@ Executable git-annex
+ warp (>= 3.2.8),
+ warp-tls (>= 3.2.2),
+ wai,
+- wai-extra,
++ wai-extra (< 3.1.17),
+ blaze-builder,
+ clientsession,
+ template-haskell,
--
GitLab