libmpfr: update to 4.1.1-p1

3 files changed, 90 insertions, 4 deletions

diff --git a/libmpfr/.signature b/libmpfr/.signature
index 458d8c13..6df1e2a9 100644
--- a/libmpfr/.signature
+++ b/libmpfr/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqoxROFwNrAMbKNYndUX5xijeiIWfApaG0CGxCcH9wGHOw1hftVuElmRTEB2YtFahoFSbAeyFxm0BqfM6erUB1QQ=
-SHA256 (Pkgfile) = f25146f46d4c93fc54ec73ce81ed3937004901fa675928a052b864fdd091595e
+RWRJc1FUaeVeqoy4caGRxklRnoJWZOl+RXdjFx4AUPvgqO0jduvrlDiiZg47n/FY6KOeHICbCElTupKlGB2YA2HULV0XMLqHjgU=
+SHA256 (Pkgfile) = 367c3b8ae03126ad669732ff10186b254bc96e012370aa39b0ca9a17b31d3206
 SHA256 (.footprint) = 3a7b406fd06f4d853803cb1c7d632540f36fe66fadae2548ab603bd25777f382
 SHA256 (mpfr-4.1.1.tar.xz) = ffd195bd567dbaffc3b98b23fd00aad0537680c9896171e44fe3ff79e28ac33d
+SHA256 (libmpfr-4.1.1-p1.patch) = 80a3c2709be21acaac12a9cc99888d63a00fa77fb75576f205fe8ba1984ff44a
diff --git a/libmpfr/Pkgfile b/libmpfr/Pkgfile
index f3c6b72c..f9d7db42 100644
--- a/libmpfr/Pkgfile
+++ b/libmpfr/Pkgfile
@@ -4,12 +4,14 @@
 # Depends on: libgmp
 
 name=libmpfr
-version=4.1.1
+version=4.1.1-p1
 release=1
-source=(https://www.mpfr.org/mpfr-${version%-*}/mpfr-${version%-*}.tar.xz)
+source=(https://www.mpfr.org/mpfr-${version%-*}/mpfr-${version%-*}.tar.xz
+	$name-$version.patch)
 
 build() {
 	cd mpfr-${version%-*}
+	patch -p1 -i $SRC/$name-$version.patch
 	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
diff --git a/libmpfr/libmpfr-4.1.1-p1.patch b/libmpfr/libmpfr-4.1.1-p1.patch
new file mode 100644
index 00000000..0566c80b
--- /dev/null
+++ b/libmpfr/libmpfr-4.1.1-p1.patch
@@ -0,0 +1,83 @@
+diff -Naurd mpfr-4.1.1-a/PATCHES mpfr-4.1.1-b/PATCHES
+--- mpfr-4.1.1-a/PATCHES	2022-11-23 11:45:26.800476079 +0000
++++ mpfr-4.1.1-b/PATCHES	2022-11-23 11:45:26.844475966 +0000
+@@ -0,0 +1 @@
++mpfr_custom_get_kind
+diff -Naurd mpfr-4.1.1-a/VERSION mpfr-4.1.1-b/VERSION
+--- mpfr-4.1.1-a/VERSION	2022-11-17 13:28:44.000000000 +0000
++++ mpfr-4.1.1-b/VERSION	2022-11-23 11:45:26.844475966 +0000
+@@ -1 +1 @@
+-4.1.1
++4.1.1-p1
+diff -Naurd mpfr-4.1.1-a/src/mpfr.h mpfr-4.1.1-b/src/mpfr.h
+--- mpfr-4.1.1-a/src/mpfr.h	2022-11-17 13:28:44.000000000 +0000
++++ mpfr-4.1.1-b/src/mpfr.h	2022-11-23 11:45:26.840475978 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 4
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "4.1.1"
++#define MPFR_VERSION_STRING "4.1.1-p1"
+ 
+ /* User macros:
+    MPFR_USE_FILE:        Define it to make MPFR define functions dealing
+@@ -1027,7 +1027,7 @@
+ #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
+ #define mpfr_custom_get_kind(x)                                         \
+   __extension__ ({                                                      \
+-    mpfr_ptr _x = (x);                                                  \
++    mpfr_srcptr _x = (x);                                               \
+     _x->_mpfr_exp >  __MPFR_EXP_INF ?                                   \
+       (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (_x)                     \
+       : _x->_mpfr_exp == __MPFR_EXP_INF ?                               \
+diff -Naurd mpfr-4.1.1-a/src/version.c mpfr-4.1.1-b/src/version.c
+--- mpfr-4.1.1-a/src/version.c	2022-11-17 13:28:44.000000000 +0000
++++ mpfr-4.1.1-b/src/version.c	2022-11-23 11:45:26.844475966 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "4.1.1";
++  return "4.1.1-p1";
+ }
+diff -Naurd mpfr-4.1.1-a/tests/tstckintc.c mpfr-4.1.1-b/tests/tstckintc.c
+--- mpfr-4.1.1-a/tests/tstckintc.c	2022-05-06 13:47:17.000000000 +0000
++++ mpfr-4.1.1-b/tests/tstckintc.c	2022-11-23 11:45:26.836475987 +0000
+@@ -295,14 +295,16 @@
+ test_nan_inf_zero (void)
+ {
+   mpfr_ptr val;
++  mpfr_srcptr sval;  /* for compilation error checking */
+   int sign;
+   int kind;
+ 
+   reset_stack ();
+ 
+   val = new_mpfr (MPFR_PREC_MIN);
++  sval = val;
+   mpfr_set_nan (val);
+-  kind = (mpfr_custom_get_kind) (val);
++  kind = (mpfr_custom_get_kind) (sval);
+   if (kind != MPFR_NAN_KIND)
+     {
+       printf ("mpfr_custom_get_kind error: ");
+@@ -380,7 +382,8 @@
+ dummy_set_si (long si)
+ {
+   mpfr_t x;
+-  long * r = dummy_new ();
++  mpfr_srcptr px;  /* for compilation error checking */
++  long *r = dummy_new ();
+   int i1, i2, i3, i4, i5;
+ 
+   /* Check that the type "void *" can be used, like with the function.
+@@ -405,7 +408,8 @@
+   MPFR_ASSERTN (i5 == 1);
+ 
+   mpfr_set_si (x, si, MPFR_RNDN);
+-  r[0] = mpfr_custom_get_kind (x);
++  px = x;
++  r[0] = mpfr_custom_get_kind (px);
+ 
+   /* Check that the type "void *" can be used in C, like with the function
+      (forbidden in C++). Also check side effects. */