pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/math/mpfr



Module Name:    pkgsrc
Committed By:   mef
Date:           Sun Nov 27 03:17:13 UTC 2022

Modified Files:
        pkgsrc/math/mpfr: Makefile distinfo
Added Files:
        pkgsrc/math/mpfr/patches: patch-VERSION patch-src_mpfr.h
            patch-src_version.c patch-tests_tstckintc.c

Log Message:
(math/mpfr) Adding official patch mpfr-4.1.1 to 4.1.1p

openscad-2021.01nb13 failed with math/mpfr-4.1.1
  http://www.ki.nu/pkgsrc/reports/current/NetBSD-9.0/20221123.2254/openscad-2021.01nb13/build.log

For this problem and as well as
  https://github.com/CGAL/cgal/issues/7064

patch is supplied at
  https://www.mpfr.org/mpfr-4.1.1/patch01
and patches are one of the pieces: for file to file from above.
See also:
  http://mail-index.netbsd.org/pkgsrc-users/2022/11/26/msg036540.html

 openscad has PKGREVISION++ because of icu update almost at the same time,
and not packaged since then, so no PKGREVISION++ is necessary, (OK ?)


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/math/mpfr/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/math/mpfr/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/math/mpfr/patches/patch-VERSION \
    pkgsrc/math/mpfr/patches/patch-src_mpfr.h \
    pkgsrc/math/mpfr/patches/patch-src_version.c \
    pkgsrc/math/mpfr/patches/patch-tests_tstckintc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/mpfr/Makefile
diff -u pkgsrc/math/mpfr/Makefile:1.45 pkgsrc/math/mpfr/Makefile:1.46
--- pkgsrc/math/mpfr/Makefile:1.45      Mon Nov 21 20:54:25 2022
+++ pkgsrc/math/mpfr/Makefile   Sun Nov 27 03:17:13 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2022/11/21 20:54:25 adam Exp $
+# $NetBSD: Makefile,v 1.46 2022/11/27 03:17:13 mef Exp $
 
 DISTNAME=      mpfr-4.1.1
+PKGREVISION=   1
 CATEGORIES=    math
 MASTER_SITES=  http://www.mpfr.org/${DISTNAME}/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/math/mpfr/distinfo
diff -u pkgsrc/math/mpfr/distinfo:1.32 pkgsrc/math/mpfr/distinfo:1.33
--- pkgsrc/math/mpfr/distinfo:1.32      Mon Nov 21 20:54:25 2022
+++ pkgsrc/math/mpfr/distinfo   Sun Nov 27 03:17:13 2022
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.32 2022/11/21 20:54:25 adam Exp $
+$NetBSD: distinfo,v 1.33 2022/11/27 03:17:13 mef Exp $
 
 BLAKE2s (mpfr-4.1.1.tar.bz2) = 2a859b41cc4482c530b020cfc9fe434db6fe8c6297c8bb104b7ed2c47de71b06
 SHA512 (mpfr-4.1.1.tar.bz2) = f0efefbfc4dec367cdab6299272062508ec80d53daa779fe05954cd626983277039a10d9d072ae686584f6ce75014ef2136e3f095128fa21fc994f7c6f33d674
 Size (mpfr-4.1.1.tar.bz2) = 1658183 bytes
+SHA1 (patch-VERSION) = 06d1fa35bbdeee9e860cfaa66e7e358014e5a05d
+SHA1 (patch-src_mpfr.h) = b8604763eaa2918053b9edceee509f9c7324fb82
+SHA1 (patch-src_version.c) = 8ff9100b82156c6ab23dab3d83c83f52e2eae11e
+SHA1 (patch-tests_tstckintc.c) = c106eaac3c4c69ff02202fecd726c528f8dae772

Added files:

Index: pkgsrc/math/mpfr/patches/patch-VERSION
diff -u /dev/null pkgsrc/math/mpfr/patches/patch-VERSION:1.1
--- /dev/null   Sun Nov 27 03:17:13 2022
+++ pkgsrc/math/mpfr/patches/patch-VERSION      Sun Nov 27 03:17:13 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-VERSION,v 1.1 2022/11/27 03:17:13 mef Exp $
+
+openscad-2021.01nb13 failed with math/mpfr-4.1.1
+patch is supplied at  
+ https://www.mpfr.org/mpfr-4.1.1/patch01
+and this is one of piece for file to file from above
+See:
+ http://mail-index.netbsd.org/pkgsrc-users/2022/11/26/msg036540.html
+
+--- mpfr-4.1.1-a/VERSION       2022-11-17 13:28:44.000000000 +0000
++++ ./VERSION  2022-11-23 11:45:26.844475966 +0000
+@@ -1 +1 @@
+-4.1.1
++4.1.1-p1
Index: pkgsrc/math/mpfr/patches/patch-src_mpfr.h
diff -u /dev/null pkgsrc/math/mpfr/patches/patch-src_mpfr.h:1.1
--- /dev/null   Sun Nov 27 03:17:13 2022
+++ pkgsrc/math/mpfr/patches/patch-src_mpfr.h   Sun Nov 27 03:17:13 2022
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_mpfr.h,v 1.1 2022/11/27 03:17:13 mef Exp $
+
+openscad-2021.01nb13 failed with math/mpfr-4.1.1
+patch is supplied at  
+ https://www.mpfr.org/mpfr-4.1.1/patch01
+and this is one of piece for file to file from above
+See:
+ http://mail-index.netbsd.org/pkgsrc-users/2022/11/26/msg036540.html
+
+--- mpfr-4.1.1-a/src/mpfr.h    2022-11-17 13:28:44.000000000 +0000
++++ ./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 ?                               \
Index: pkgsrc/math/mpfr/patches/patch-src_version.c
diff -u /dev/null pkgsrc/math/mpfr/patches/patch-src_version.c:1.1
--- /dev/null   Sun Nov 27 03:17:13 2022
+++ pkgsrc/math/mpfr/patches/patch-src_version.c        Sun Nov 27 03:17:13 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_version.c,v 1.1 2022/11/27 03:17:13 mef Exp $
+
+openscad-2021.01nb13 failed with math/mpfr-4.1.1
+patch is supplied at  
+ https://www.mpfr.org/mpfr-4.1.1/patch01
+and this is one of piece for file to file from above
+See:
+ http://mail-index.netbsd.org/pkgsrc-users/2022/11/26/msg036540.html
+
+--- mpfr-4.1.1-a/src/version.c 2022-11-17 13:28:44.000000000 +0000
++++ ./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";
+ }
Index: pkgsrc/math/mpfr/patches/patch-tests_tstckintc.c
diff -u /dev/null pkgsrc/math/mpfr/patches/patch-tests_tstckintc.c:1.1
--- /dev/null   Sun Nov 27 03:17:13 2022
+++ pkgsrc/math/mpfr/patches/patch-tests_tstckintc.c    Sun Nov 27 03:17:13 2022
@@ -0,0 +1,49 @@
+$NetBSD: patch-tests_tstckintc.c,v 1.1 2022/11/27 03:17:13 mef Exp $
+
+openscad-2021.01nb13 failed with math/mpfr-4.1.1
+patch is supplied at  
+ https://www.mpfr.org/mpfr-4.1.1/patch01
+and this is one of piece for file to file from above
+See:
+ http://mail-index.netbsd.org/pkgsrc-users/2022/11/26/msg036540.html
+
+--- mpfr-4.1.1-a/tests/tstckintc.c     2022-05-06 13:47:17.000000000 +0000
++++ ./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. */



Home | Main Index | Thread Index | Old Index