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

2011-11-06 Thread Allan McRae 
Date: Sunday, November 6, 2011 @ 22:25:43
  Author: allan
Revision: 142237

upgpkg: mpfr 3.1.0.p3-1

upstream patch level bump

Added:
  mpfr/trunk/mpfr-3.1.0.p3.patch
Modified:
  mpfr/trunk/PKGBUILD
Deleted:
  mpfr/trunk/mpfr-3.1.0.p1.patch

-+
 PKGBUILD|7 
 mpfr-3.1.0.p1.patch |   50 --
 mpfr-3.1.0.p3.patch |  393 ++
 3 files changed, 397 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-07 00:38:07 UTC (rev 142236)
+++ PKGBUILD2011-11-07 03:25:43 UTC (rev 142237)
@@ -4,7 +4,7 @@
 
 pkgname=mpfr
 _pkgver=3.1.0
-_patchlevel=p1
+_patchlevel=p3
 pkgver=${_pkgver}.${_patchlevel}
 pkgrel=1
 pkgdesc=Multiple-precision floating-point library
@@ -14,10 +14,11 @@
 depends=('gmp=5.0')
 options=('!libtool')
 install=mpfr.install
-source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz
+source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}
 mpfr-${_pkgver}.${_patchlevel}.patch)
 md5sums=('6e495841bb026481567006cec0f821c3'
- 'ec988293368d4988c76f50d6a3460166')
+ '293374ee4b01527f8f7889fdfa9016f8'
+ 'd65858ccddbea968d6580124320fb6a0')
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}

Deleted: mpfr-3.1.0.p1.patch
===
--- mpfr-3.1.0.p1.patch 2011-11-07 00:38:07 UTC (rev 142236)
+++ mpfr-3.1.0.p1.patch 2011-11-07 03:25:43 UTC (rev 142237)
@@ -1,50 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
 mpfr-3.1.0-a/PATCHES   2011-10-05 21:39:57.0 +
-+++ mpfr-3.1.0-b/PATCHES   2011-10-05 21:39:57.0 +
-@@ -0,0 +1 @@
-+mpfr_unlikely
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
 mpfr-3.1.0-a/VERSION   2011-10-03 08:17:15.0 +
-+++ mpfr-3.1.0-b/VERSION   2011-10-05 21:39:57.0 +
-@@ -1 +1 @@
--3.1.0
-+3.1.0-p1
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
 mpfr-3.1.0-a/src/mpfr-impl.h   2011-10-03 08:17:09.0 +
-+++ mpfr-3.1.0-b/src/mpfr-impl.h   2011-10-05 21:39:57.0 +
-@@ -988,10 +988,11 @@
-  **/
- 
- /* Theses macros help the compiler to determine if a test is
-- * likely or unlikely. */
-+   likely or unlikely. The !! is necessary in case x is larger
-+   than a long. */
- #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
- # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
--# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
-+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
- #else
- # define MPFR_LIKELY(x) (x)
- # define MPFR_UNLIKELY(x) (x)
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
 mpfr-3.1.0-a/src/mpfr.h2011-10-03 08:17:09.0 +
-+++ mpfr-3.1.0-b/src/mpfr.h2011-10-05 21:39:57.0 +
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING 3.1.0
-+#define MPFR_VERSION_STRING 3.1.0-p1
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a)  16L) | ((b)  8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
 mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.0 +
-+++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.0 +
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return 3.1.0;
-+  return 3.1.0-p1;
- }

Added: mpfr-3.1.0.p3.patch
===
--- mpfr-3.1.0.p3.patch (rev 0)
+++ mpfr-3.1.0.p3.patch 2011-11-07 03:25:43 UTC (rev 142237)
@@ -0,0 +1,393 @@
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES   2011-10-05 21:39:57.0 +
 mpfr-3.1.0-b/PATCHES   2011-10-05 21:39:57.0 +
+@@ -0,0 +1 @@
++mpfr_unlikely
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION   2011-10-03 08:17:15.0 +
 mpfr-3.1.0-b/VERSION   2011-10-05 21:39:57.0 +
+@@ -1 +1 @@
+-3.1.0
++3.1.0-p1
+diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
+--- mpfr-3.1.0-a/src/mpfr-impl.h   2011-10-03 08:17:09.0 +
 mpfr-3.1.0-b/src/mpfr-impl.h   2011-10-05 21:39:57.0 +
+@@ -988,10 +988,11 @@
+  **/
+ 
+ /* Theses macros help the compiler to determine if a test is
+- * likely or unlikely. */
++   likely or unlikely. The !! is necessary in case x is larger
++   than a long. */
+ #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
+ # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
+-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
+ #else
+ # define MPFR_LIKELY(x) (x)
+ #

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

2011-10-07 Thread Allan McRae 
Date: Friday, October 7, 2011 @ 20:50:47
  Author: allan
Revision: 140157

upgpkg: mpfr 3.1.0.p1-1

upstream patch-level update

Added:
  mpfr/trunk/mpfr-3.1.0.p1.patch
Modified:
  mpfr/trunk/PKGBUILD

-+
 PKGBUILD|   15 ---
 mpfr-3.1.0.p1.patch |   50 ++
 2 files changed, 58 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-07 23:55:20 UTC (rev 140156)
+++ PKGBUILD2011-10-08 00:50:47 UTC (rev 140157)
@@ -4,10 +4,9 @@
 
 pkgname=mpfr
 _pkgver=3.1.0
-pkgver=${_pkgver}
-#_patchlevel=p4
-#pkgver=${_pkgver}.${_patchlevel}
-pkgrel=2
+_patchlevel=p1
+pkgver=${_pkgver}.${_patchlevel}
+pkgrel=1
 pkgdesc=Multiple-precision floating-point library
 arch=('i686' 'x86_64')
 url=http://www.mpfr.org/;
@@ -15,12 +14,14 @@
 depends=('gmp=5.0')
 options=('!libtool')
 install=mpfr.install
-source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz)
-md5sums=('6e495841bb026481567006cec0f821c3')
+source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz
+mpfr-${_pkgver}.${_patchlevel}.patch)
+md5sums=('6e495841bb026481567006cec0f821c3'
+ 'ec988293368d4988c76f50d6a3460166')
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}
-  #patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch
+  patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch
   ./configure --prefix=/usr --enable-thread-safe --enable-shared
   make
 }

Added: mpfr-3.1.0.p1.patch
===
--- mpfr-3.1.0.p1.patch (rev 0)
+++ mpfr-3.1.0.p1.patch 2011-10-08 00:50:47 UTC (rev 140157)
@@ -0,0 +1,50 @@
+diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
+--- mpfr-3.1.0-a/PATCHES   2011-10-05 21:39:57.0 +
 mpfr-3.1.0-b/PATCHES   2011-10-05 21:39:57.0 +
+@@ -0,0 +1 @@
++mpfr_unlikely
+diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
+--- mpfr-3.1.0-a/VERSION   2011-10-03 08:17:15.0 +
 mpfr-3.1.0-b/VERSION   2011-10-05 21:39:57.0 +
+@@ -1 +1 @@
+-3.1.0
++3.1.0-p1
+diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
+--- mpfr-3.1.0-a/src/mpfr-impl.h   2011-10-03 08:17:09.0 +
 mpfr-3.1.0-b/src/mpfr-impl.h   2011-10-05 21:39:57.0 +
+@@ -988,10 +988,11 @@
+  **/
+ 
+ /* Theses macros help the compiler to determine if a test is
+- * likely or unlikely. */
++   likely or unlikely. The !! is necessary in case x is larger
++   than a long. */
+ #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
+ # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
+-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
+ #else
+ # define MPFR_LIKELY(x) (x)
+ # define MPFR_UNLIKELY(x) (x)
+diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
+--- mpfr-3.1.0-a/src/mpfr.h2011-10-03 08:17:09.0 +
 mpfr-3.1.0-b/src/mpfr.h2011-10-05 21:39:57.0 +
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING 3.1.0
++#define MPFR_VERSION_STRING 3.1.0-p1
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a)  16L) | ((b)  8) | (c))
+diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
+--- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.0 +
 mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.0 +
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return 3.1.0;
++  return 3.1.0-p1;
+ }