Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 ChangeLog                   |    3 +
 gnu.gpg                     |binary
 libs/libmpc/DETAILS         |   16 +++++---
 libs/libmpc/HISTORY         |    5 ++
 libs/libmpc/PRE_BUILD       |    6 ---
 libs/libmpc/mpfr_fmma.patch |   81 
--------------------------------------------
 6 files changed, 18 insertions(+), 93 deletions(-)

New commits:
commit 6dcf3b49e3e8d06dcb15b21b47d494b89aa61870
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    libs/libmpc: version 1.1.0

commit 1ab60f0e0b5fbba81bc9a859ad303a00e7623009
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    gnu.gpg: added Andreas Enge's key

diff --git a/ChangeLog b/ChangeLog
index c864332..c76ea43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2018-01-11 Pavel Vinogradov <public AT sourcemage.org>
+       * gnu.gpg: new key, 765C61E3, Andreas Enge <andreas AT enge.fr>
+
 2018-01-08 Treeve Jelbert <treeve AT sourcemage.org>
        * kde.gpg: add 26B3B577 Thomas Baumgart <thb AT net-bembel.de>
        * python-pypi/msgpack: added, upstream renamed things
diff --git a/gnu.gpg b/gnu.gpg
index 9455ca8..01b9ecf 100644
Binary files a/gnu.gpg and b/gnu.gpg differ
diff --git a/libs/libmpc/DETAILS b/libs/libmpc/DETAILS
index f12ad96..408ae6e 100755
--- a/libs/libmpc/DETAILS
+++ b/libs/libmpc/DETAILS
@@ -1,11 +1,15 @@
            SPELL=libmpc
-          SPELLX=mpc
-         VERSION=1.0.3
-     
SOURCE_HASH=sha512:0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
+         VERSION=1.1.0
   SECURITY_PATCH=1
-          SOURCE="$SPELLX-$VERSION.tar.gz"
-   SOURCE_URL[0]=http://www.multiprecision.org/${SPELLX}/download/${SOURCE}
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+          SOURCE="mpc-${VERSION}.tar.gz"
+   SOURCE_URL[0]="http://www.multiprecision.org/mpc/download/${SOURCE}";
+   SOURCE_URL[1]="${GNU_URL}/mpc/${SOURCE}"
+         SOURCE2="${SOURCE}.sig"
+  SOURCE2_URL[0]="${SOURCE_URL[0]}.sig"
+  SOURCE2_URL[1]="${SOURCE_URL[1]}.sig"
+      SOURCE_GPG="gnu.gpg:${SOURCE2}:UPSTREAM_KEY"
+  SOURCE2_IGNORE="signature"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/mpc-${VERSION}"
      GATHER_DOCS=off
         WEB_SITE="http://www.multiprecision.org/index.php?prog=mpc";
       LICENSE[0]="LGPL"
diff --git a/libs/libmpc/HISTORY b/libs/libmpc/HISTORY
index 29e3301..6843cdc 100644
--- a/libs/libmpc/HISTORY
+++ b/libs/libmpc/HISTORY
@@ -1,3 +1,8 @@
+2018-01-11 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 1.1.0, switched to upstream gpg signing key,
+         removed SPELLX, added GNU mirror
+       * PRE_BUILD, mpfr_fmma.patch: deleted, fixed in upstream
+
 2017-12-26 Pavel Vinogradov <public AT sourcemage.org>
        * PRE_BUILD, mpfr_fmma.patch: added a patch to compile with MPFR 4.0.0
 
diff --git a/libs/libmpc/PRE_BUILD b/libs/libmpc/PRE_BUILD
deleted file mode 100755
index 8b2f740..0000000
--- a/libs/libmpc/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build      &&
-cd "${SOURCE_DIRECTORY}" &&
-
-patch -Np1 < "${SPELL_DIRECTORY}/mpfr_fmma.patch" &&
-
-autoreconf
diff --git a/libs/libmpc/mpfr_fmma.patch b/libs/libmpc/mpfr_fmma.patch
deleted file mode 100644
index f4efed7..0000000
--- a/libs/libmpc/mpfr_fmma.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 36a84f43f326de14db888ba07936cc9621c23f19 Mon Sep 17 00:00:00 2001
-From: Paul Zimmermann <Paul.Zimmermann AT inria.fr>
-Date: Sun, 10 Jan 2016 23:19:37 +0100
-Subject: [PATCH] use mpfr_fmma and mpfr_fmms if provided by mpfr
-
----
- configure.ac | 16 ++++++++++++++++
- src/mul.c    | 15 ++++++++++++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b6fa199..bdb21ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,6 +165,22 @@ AC_LINK_IFELSE(
-         AC_MSG_ERROR([libmpfr not found or uses a different ABI (including 
static vs shared).])
-         ])
- 
-+AC_MSG_CHECKING(for mpfr_fmma)
-+LIBS="-lmpfr $LIBS"
-+AC_LINK_IFELSE(
-+        [AC_LANG_PROGRAM(
-+                [[#include "mpfr.h"]],
-+                [[mpfr_t x; mpfr_fmma (x, x, x, x, x, 0);]]
-+        )],
-+        [
-+      AC_MSG_RESULT(yes)
-+      AC_DEFINE(HAVE_MPFR_FMMA, 1, [mpfr_fmma is present])
-+      ],
-+        [
-+        AC_MSG_RESULT(no)
-+      AC_DEFINE(HAVE_MPFR_FMMA, 0, [mpfr_fmma is not present])
-+        ])
-+
- # Check for a recent GMP
- # We only guarantee that with a *functional* and recent enough GMP version,
- # MPC will compile; we do not guarantee that GMP will compile.
-diff --git a/src/mul.c b/src/mul.c
-index 3c9c0a7..8c4afe4 100644
---- a/src/mul.c
-+++ b/src/mul.c
-@@ -175,8 +175,9 @@ mul_imag (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, 
mpc_rnd_t rnd)
- #define MPFR_EXP(x)       ((x)->_mpfr_exp)
- #define MPFR_LIMB_SIZE(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS + 1)
- 
-+#if HAVE_MPFR_FMMA == 0
- static int
--mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c,
-+mpc_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c,
-            mpfr_srcptr d, int sign, mpfr_rnd_t rnd)
- {
-    /* Computes z = ab+cd if sign >= 0, or z = ab-cd if sign < 0.
-@@ -319,6 +320,7 @@
-
-    return inex;
- }
-+#endif
-
-
- int
-@@ -337,10 +338,17 @@
-    else
-       rop [0] = z [0];
- 
-+#if HAVE_MPFR_FMMA
-+   inex = MPC_INEX (mpfr_fmms (mpc_realref (rop), mpc_realref (x), 
mpc_realref (y), mpc_imagref (x),
-+                               mpc_imagref (y), MPC_RND_RE (rnd)),
-+                     mpfr_fmma (mpc_imagref (rop), mpc_realref (x), 
mpc_imagref (y), mpc_imagref (x),
-+                               mpc_realref (y), MPC_RND_IM (rnd)));
-+#else
-    inex = MPC_INEX (mpfr_fmma (mpc_realref (rop), mpc_realref (x), 
mpc_realref (y), mpc_imagref (x),
-                                mpc_imagref (y), -1, MPC_RND_RE (rnd)),
-                     mpfr_fmma (mpc_imagref (rop), mpc_realref (x), 
mpc_imagref (y), mpc_imagref (x),
-                                mpc_realref (y), +1, MPC_RND_IM (rnd)));
-+#endif
- 
-    mpc_set (z, rop, MPC_RNDNN);
-    if (overlap)
--- 
-2.1.4
-