From 4dd3c19ee3aa3fa86375b40e3cbb2f5cb5c366c4 Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Sun, 2 Apr 2023 17:00:44 +0000
Subject: [PATCH] testing/ocaml-lwt: upgrade to 5.6.1

---
 testing/ocaml-lwt/APKBUILD                    | 13 ++++--------
 testing/ocaml-lwt/dont-use-external-seq.patch | 11 ----------
 testing/ocaml-lwt/result_lseek_noinline.patch | 20 -------------------
 3 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 testing/ocaml-lwt/dont-use-external-seq.patch
 delete mode 100644 testing/ocaml-lwt/result_lseek_noinline.patch

diff --git a/testing/ocaml-lwt/APKBUILD b/testing/ocaml-lwt/APKBUILD
index 11e4bf9027e..5706cb69bc3 100644
--- a/testing/ocaml-lwt/APKBUILD
+++ b/testing/ocaml-lwt/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer:
 pkgname=ocaml-lwt
 _pkgname=lwt
-pkgver=5.5.0
-pkgrel=2
+pkgver=5.6.1
+pkgrel=0
 pkgdesc="OCaml promises and concurrent I/O"
 url="https://github.com/ocsigen/lwt"
 arch="all !riscv64"  # limited by ocaml aport
@@ -25,10 +25,7 @@ depends_dev="
 makedepends="$depends_dev dune dune-configurator ocaml ocaml-cppo"
 options="!check"  # FIXME: tests hang
 subpackages="$pkgname-dev ${pkgname}_react:_react ${pkgname}_ppx:_ppx"
-source="$pkgname-$pkgver.tar.gz::https://github.com/ocsigen/$_pkgname/archive/$pkgver.tar.gz
-	result_lseek_noinline.patch
-	dont-use-external-seq.patch
-	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/ocsigen/$_pkgname/archive/$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 _ocamldir=usr/lib/ocaml
 
@@ -98,7 +95,5 @@ _react() {
 }
 
 sha512sums="
-8951b94555e930634375816d71815b9d85daad6ffb7dab24864661504d11be26575ab0b237196c54693efa372a9b69cdc1d5068a20a250dc0bbb4a3c03c5fda1  ocaml-lwt-5.5.0.tar.gz
-dc3abce70b3ad022066e8023a9b37346df0ecbbc6351186cc24b569189142ad3e7e32f27c33a4378f11ec8c40df5c96f4c37190ca4797bc228ca8943f53cf5bf  result_lseek_noinline.patch
-7a7d1876b633668892e7eb8b6d08a7432807abd8a98cd8c05589221c92bf1bf068236c018031f88db22d3f055595651c440d23aad118c6e3f4992b9c9d9c75c7  dont-use-external-seq.patch
+698875bd3bfcd5baa47eb48e412f442d289f9972421321541860ebe110b9af1949c3fbc253768495726ec547fe4ba25483cd97ff39bc668496fba95b2ed9edd8  ocaml-lwt-5.6.1.tar.gz
 "
diff --git a/testing/ocaml-lwt/dont-use-external-seq.patch b/testing/ocaml-lwt/dont-use-external-seq.patch
deleted file mode 100644
index d138e0b37d1..00000000000
--- a/testing/ocaml-lwt/dont-use-external-seq.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/core/dune
-+++ b/src/core/dune
-@@ -26,7 +26,7 @@
-  (synopsis "Monadic promises and concurrent I/O")
-  (wrapped false)
-  |} ^ preprocess ^ {|
-- (libraries bytes result seq)
-+ (libraries bytes result)
-  (flags (:standard -w +A-29)))
- 
- (documentation
diff --git a/testing/ocaml-lwt/result_lseek_noinline.patch b/testing/ocaml-lwt/result_lseek_noinline.patch
deleted file mode 100644
index 2e2fd1552de..00000000000
--- a/testing/ocaml-lwt/result_lseek_noinline.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/unix/unix_c/unix_lseek_job.c
-+++ b/src/unix/unix_c/unix_lseek_job.c
-@@ -92,7 +92,7 @@
- }
- 
- /* The function building the caml result. */
--static value result_lseek(struct job_lseek* job)
-+__attribute__((noinline)) static value result_lseek(struct job_lseek* job)
- {
-   value result;
-   /* Check for errors. */
-@@ -113,7 +113,7 @@
- }
- 
- /* The function building the caml result. */
--static value result_lseek_64(struct job_lseek* job)
-+__attribute__((noinline))  static value result_lseek_64(struct job_lseek* job)
- {
-   value result;
-   /* Check for errors. */