From 990368c5d569debd609397d4911f69492614bcf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 10 Aug 2025 20:32:15 -0300
Subject: [PATCH] singular: rebuild for flintlib

---
 srcpkgs/singular/patches/flint-3.3.patch | 29 ++++++++++++++++++++++++
 srcpkgs/singular/template                |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/singular/patches/flint-3.3.patch

diff --git a/srcpkgs/singular/patches/flint-3.3.patch b/srcpkgs/singular/patches/flint-3.3.patch
new file mode 100644
index 00000000000..20bee5511c2
--- /dev/null
+++ b/srcpkgs/singular/patches/flint-3.3.patch
@@ -0,0 +1,29 @@
+Taken from:
+https://gitlab.archlinux.org/archlinux/packaging/packages/singular/-/blob/main/flint-3.3.patch
+
+diff --git a/factory/FLINTconvert.cc b/factory/FLINTconvert.cc
+index c36f6022d..67c271c5a 100644
+--- a/factory/FLINTconvert.cc
++++ b/factory/FLINTconvert.cc
+@@ -652,7 +652,7 @@ convertFacCFMatrix2Fq_nmod_mat_t (fq_nmod_mat_t M,
+   {
+     for(j=m.columns();j>0;j--)
+     {
+-      convertFacCF2nmod_poly_t (M->rows[i-1]+j-1, m (i,j));
++      convertFacCF2nmod_poly_t (fq_nmod_mat_entry (M, i-1, j-1), m (i,j));
+     }
+   }
+ }
+diff --git a/libpolys/polys/flintconv.cc b/libpolys/polys/flintconv.cc
+index 89152f5e4..56d527c16 100644
+--- a/libpolys/polys/flintconv.cc
++++ b/libpolys/polys/flintconv.cc
+@@ -331,7 +331,7 @@ void convSingMFlintFq_nmod_mat(matrix m, fq_nmod_mat_t M, const fq_nmod_ctx_t fq
+   {
+     for(j=MATCOLS(m);j>0;j--)
+     {
+-      convSingPFlintnmod_poly_t (M->rows[i-1]+j-1, MATELEM(m,i,j),r);
++      convSingPFlintnmod_poly_t (fq_nmod_mat_entry (M, i-1, j-1), MATELEM(m,i,j),r);
+     }
+   }
+ }
diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
index a795c016a4e..77951481a8a 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,7 +1,7 @@
 # Template file for 'singular'
 pkgname=singular
 version=4.4.1
-revision=2
+revision=3
 _majver=${version%p*}
 build_style=gnu-configure
 configure_args="--with-readline=ncurses