[arch-commits] Commit in mpfr/trunk (PKGBUILD mpfr-3.1.4-p1.patch mpfr.install)

[Allan McRae]

    Date: Sunday, May 1, 2016 @ 06:33:10
  Author: allan
Revision: 266712

upgpkg: mpfr 3.1.4.p1-1

bump patch level, remove install file

Added:
  mpfr/trunk/mpfr-3.1.4-p1.patch
Modified:
  mpfr/trunk/PKGBUILD
Deleted:
  mpfr/trunk/mpfr.install

---------------------+
 PKGBUILD            |   22 +++++++++----------
 mpfr-3.1.4-p1.patch |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 mpfr.install        |   20 -----------------
 3 files changed, 67 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-01 03:45:48 UTC (rev 266711)
+++ PKGBUILD	2016-05-01 04:33:10 UTC (rev 266712)
@@ -4,9 +4,9 @@
 
 pkgname=mpfr
 _pkgver=3.1.4
-#_patchlevel=p5
-#pkgver=${_pkgver}.${_patchlevel}
-pkgver=${_pkgver}
+_patchlevel=p1
+pkgver=${_pkgver}.${_patchlevel}
+#pkgver=${_pkgver}
 pkgrel=1
 pkgdesc="Multiple-precision floating-point library"
 arch=('i686' 'x86_64')
@@ -13,17 +13,17 @@
 url="http://www.mpfr.org/"
 license=('LGPL')
 depends=('gmp>=5.0')
-install=mpfr.install
-source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc})
-#        mpfr-${_pkgver}-${_patchlevel}.patch)
+source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}
+        mpfr-${_pkgver}-${_patchlevel}.patch)
 md5sums=('064b2c18185038e404a401b830d59be8'
-         'SKIP')
+         'SKIP'
+         '450ac9de7e6d99b05ffd4ba063c77382')
 validpgpkeys=('07F3DBBECC1A39605078094D980C197698C3739D')
 
-#prepare() {
-#  cd "${srcdir}/${pkgname}-${_pkgver}"
-#  patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch
-#}
+prepare() {
+  cd "${srcdir}/${pkgname}-${_pkgver}"
+  patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${_pkgver}"

Added: mpfr-3.1.4-p1.patch
===================================================================
--- mpfr-3.1.4-p1.patch	                        (rev 0)
+++ mpfr-3.1.4-p1.patch	2016-05-01 04:33:10 UTC (rev 266712)
@@ -0,0 +1,56 @@
+diff -Naurd mpfr-3.1.4-a/PATCHES mpfr-3.1.4-b/PATCHES
+--- mpfr-3.1.4-a/PATCHES	2016-04-13 21:22:23.720604013 +0000
++++ mpfr-3.1.4-b/PATCHES	2016-04-13 21:22:23.744603677 +0000
+@@ -0,0 +1 @@
++unix-check
+diff -Naurd mpfr-3.1.4-a/VERSION mpfr-3.1.4-b/VERSION
+--- mpfr-3.1.4-a/VERSION	2016-03-06 11:33:04.000000000 +0000
++++ mpfr-3.1.4-b/VERSION	2016-04-13 21:22:23.744603677 +0000
+@@ -1 +1 @@
+-3.1.4
++3.1.4-p1
+diff -Naurd mpfr-3.1.4-a/src/mpfr-impl.h mpfr-3.1.4-b/src/mpfr-impl.h
+--- mpfr-3.1.4-a/src/mpfr-impl.h	2016-03-06 11:33:04.000000000 +0000
++++ mpfr-3.1.4-b/src/mpfr-impl.h	2016-04-13 21:22:23.736603789 +0000
+@@ -252,19 +252,6 @@
+ # define MPFR_WIN_THREAD_SAFE_DLL 1
+ #endif
+ 
+-/* Detect some possible inconsistencies under Unix. */
+-#if defined(__unix__)
+-# if defined(_WIN32)
+-#  error "Both __unix__ and _WIN32 are defined"
+-# endif
+-# if __GMP_LIBGMP_DLL
+-#  error "__unix__ is defined and __GMP_LIBGMP_DLL is true"
+-# endif
+-# if defined(MPFR_WIN_THREAD_SAFE_DLL)
+-#  error "Both __unix__ and MPFR_WIN_THREAD_SAFE_DLL are defined"
+-# endif
+-#endif
+-
+ #if defined(__MPFR_WITHIN_MPFR) || !defined(MPFR_WIN_THREAD_SAFE_DLL)
+ extern MPFR_THREAD_ATTR unsigned int __gmpfr_flags;
+ extern MPFR_THREAD_ATTR mpfr_exp_t   __gmpfr_emin;
+diff -Naurd mpfr-3.1.4-a/src/mpfr.h mpfr-3.1.4-b/src/mpfr.h
+--- mpfr-3.1.4-a/src/mpfr.h	2016-03-06 11:33:04.000000000 +0000
++++ mpfr-3.1.4-b/src/mpfr.h	2016-04-13 21:22:23.744603677 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 4
+-#define MPFR_VERSION_STRING "3.1.4"
++#define MPFR_VERSION_STRING "3.1.4-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.4-a/src/version.c mpfr-3.1.4-b/src/version.c
+--- mpfr-3.1.4-a/src/version.c	2016-03-06 11:33:05.000000000 +0000
++++ mpfr-3.1.4-b/src/version.c	2016-04-13 21:22:23.744603677 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.4";
++  return "3.1.4-p1";
+ }

Deleted: mpfr.install
===================================================================
--- mpfr.install	2016-05-01 03:45:48 UTC (rev 266711)
+++ mpfr.install	2016-05-01 04:33:10 UTC (rev 266712)
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-info_files=(mpfr.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}