[arch-commits] Commit in sagemath/trunk (PKGBUILD sagemath-no-anal.h.patch)

Antonio Rojas arojas at archlinux.org
Tue Jan 24 13:01:49 UTC 2017


    Date: Tuesday, January 24, 2017 @ 13:01:48
  Author: arojas
Revision: 208830

Drop usage of pari's private headers

Added:
  sagemath/trunk/sagemath-no-anal.h.patch
Modified:
  sagemath/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |    8 ++++++--
 sagemath-no-anal.h.patch |   12 ++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-24 12:44:43 UTC (rev 208829)
+++ PKGBUILD	2017-01-24 13:01:48 UTC (rev 208830)
@@ -33,7 +33,8 @@
   mcqd coxeter3 cryptominisat2 modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe) # libfes
 source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
         env.patch skip-check.patch cython-sys-path.patch is-package-installed.patch package.patch disable-fes.patch
-        jupyter-path.patch test-optional.patch ecm-7.patch increase-rtol.patch sagemath-gslcblas.patch r-no-readline.patch)
+        jupyter-path.patch test-optional.patch ecm-7.patch increase-rtol.patch sagemath-gslcblas.patch r-no-readline.patch
+        sagemath-no-anal.h.patch)
 sha256sums=('3cd9af3e3bfd7f5cc966b7c36168d04b9a1213aa9a7af3286b5d53d40e7653e3'
             '9dba04ff13626a7b6c338a8b18a6c27d343f68a547a218533cf773af3dae6635'
             'b02b3d2d5620ca20f96adb62b6fef05e4676c0a60983310a1450fdf3d923cb04'
@@ -46,7 +47,8 @@
             '65ad84c83d5f956fde8eab961f2caad56d64044324c4abc0e56bcd9f44061cb6'
             'be925eefeac3f28e639794ddc20d64e6faafd7181804e29417a510224d19ccc7'
             '973224f53e9a6fcfaa9c6cb842b02430a601d1c7ce0abb41b3591470d128930c'
-            'ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf')
+            'ef9f401fa84fe1772af9efee6816643534f2896da4c23b809937b19771bdfbbf'
+            '8126c92a5fc15738c4f7982aadb5a4033230fc2d5da05af9133a96ad1181419e')
 
 prepare(){
   cd sage-$pkgver
@@ -80,6 +82,8 @@
   patch -p0 -i ../disable-fes.patch
 # replace is_package_installed usage http://trac.sagemath.org/ticket/20377
   patch -p1 -i ../is-package-installed.patch
+# Allow compiling without pari's anal.h https://trac.sagemath.org/ticket/22195
+  patch -p1 -i ../sagemath-no-anal.h.patch
 
 # use python2
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/*

Added: sagemath-no-anal.h.patch
===================================================================
--- sagemath-no-anal.h.patch	                        (rev 0)
+++ sagemath-no-anal.h.patch	2017-01-24 13:01:48 UTC (rev 208830)
@@ -0,0 +1,12 @@
+diff --git a/src/sage/libs/cypari2/paripriv.pxd b/src/sage/libs/cypari2/paripriv.pxd
+index b6ea381..921599d 100644
+--- a/src/sage/libs/cypari2/paripriv.pxd
++++ b/src/sage/libs/cypari2/paripriv.pxd
+@@ -26,5 +26,5 @@ cdef extern from "pari/paripriv.h":
+ 
+     extern gp_data* GP_DATA
+ 
+-cdef extern from "pari/anal.h":
+-    char* closure_func_err()
++cdef extern:  # Declared in private PARI header file "anal.h"
++    const char* closure_func_err()



More information about the arch-commits mailing list