mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-10 09:04:36 +08:00
Revert "first commit for sage-mathmatics"
This reverts commit d51bc2caec
.
# Conflicts:
# python-mpmath/PKGBUILD
# python-xcffib/PKGBUILD
This commit is contained in:
parent
746589bb11
commit
32a2f98825
@ -1,36 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <remy@archlinux.org>
|
||||
|
||||
pkgname=cddlib
|
||||
pkgver=094g
|
||||
pkgrel=1
|
||||
pkgdesc="C library implementing Doudble Description Method for convex polyhedra"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.ifor.math.ethz.ch/~fukuda/cdd_home/cdd.html"
|
||||
license=('GPL')
|
||||
depends=('gmp')
|
||||
source=("ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/$pkgname-$pkgver.tar.gz" 'cdd_both_reps.c' 'cdd_both_reps.patch')
|
||||
md5sums=('b5b1a6cc5a82beac814418907602bfeb'
|
||||
'c80ebe354f615144de14c826cadc3bf6'
|
||||
'84c7d505ffd46524ffc8ab2de1c5713d')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
patch -p1 -i "$srcdir"/cdd_both_reps.patch
|
||||
ln -s "$srcdir"/cdd_both_reps.c src
|
||||
ln -s "$srcdir"/cdd_both_reps.c src-gmp
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
autoreconf -ifs
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
@ -1,254 +0,0 @@
|
||||
/* cdd_both_reps.c: compute reduced H and V representation of polytope
|
||||
by Volker Braun <vbraun@stp.dias.ie>
|
||||
|
||||
The input is taken from stdin and can be either a
|
||||
H or V representation, not necessarily reduced.
|
||||
|
||||
based on testcdd1.c, redcheck.c, and of course the cdd library
|
||||
written by Komei Fukuda, fukuda@ifor.math.ethz.ch
|
||||
Standard ftp site: ftp.ifor.math.ethz.ch, Directory: pub/fukuda/cdd
|
||||
*/
|
||||
|
||||
/* This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include "setoper.h"
|
||||
#include "cdd.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
void compute_adjacency(dd_MatrixPtr Rep, dd_ErrorType* err_ptr)
|
||||
{
|
||||
dd_SetFamilyPtr AdjacencyGraph;
|
||||
if (*err_ptr != dd_NoError) return;
|
||||
|
||||
switch (Rep->representation) {
|
||||
case dd_Inequality:
|
||||
printf("Facet graph\n");
|
||||
break;
|
||||
case dd_Generator:
|
||||
printf("Vertex graph\n");
|
||||
break;
|
||||
case dd_Unspecified:
|
||||
printf("unknown representation type!\n");
|
||||
default:
|
||||
printf("This should be unreachable!\n");
|
||||
exit(2);
|
||||
}
|
||||
|
||||
/* Output adjacency of vertices/rays/lines */
|
||||
if (Rep->rowsize > 0) { /* workaround for bug with empty polyhedron */
|
||||
/* compute adjacent vertices/rays/lines */
|
||||
AdjacencyGraph = dd_Matrix2Adjacency(Rep, err_ptr);
|
||||
if (*err_ptr == dd_NoError) {
|
||||
dd_WriteSetFamily(stdout,AdjacencyGraph);
|
||||
dd_FreeSetFamily(AdjacencyGraph);
|
||||
}
|
||||
} else {
|
||||
printf("begin\n");
|
||||
printf(" 0 0\n");
|
||||
printf("end\n");
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
|
||||
void minimal_Vrep_Hrep(dd_MatrixPtr M,
|
||||
dd_MatrixPtr* Vrep_ptr, dd_MatrixPtr* Hrep_ptr,
|
||||
dd_ErrorType* err_ptr)
|
||||
{
|
||||
dd_PolyhedraPtr poly;
|
||||
dd_rowindex newpos;
|
||||
dd_rowset impl_linset,redset;
|
||||
dd_MatrixPtr Vrep, Hrep;
|
||||
|
||||
if (*err_ptr != dd_NoError) return;
|
||||
|
||||
/* compute the second representation */
|
||||
poly = dd_DDMatrix2Poly(M, err_ptr);
|
||||
if (*err_ptr != dd_NoError) return;
|
||||
|
||||
if (*err_ptr == dd_NoError) {
|
||||
/* compute canonical H-representation */
|
||||
Hrep = dd_CopyInequalities(poly);
|
||||
if (Hrep->rowsize > 0) { /* workaround for bug with empty matrix */
|
||||
dd_MatrixCanonicalize(&Hrep, &impl_linset, &redset, &newpos, err_ptr);
|
||||
if (*err_ptr == dd_NoError) {
|
||||
set_free(redset);
|
||||
set_free(impl_linset);
|
||||
free(newpos);
|
||||
}
|
||||
}
|
||||
if (*err_ptr == dd_NoError) (*Hrep_ptr) = Hrep;
|
||||
}
|
||||
|
||||
if (*err_ptr == dd_NoError) {
|
||||
/* compute canonical V-representation */
|
||||
Vrep = dd_CopyGenerators(poly);
|
||||
if (Vrep->rowsize > 0) { /* workaround for bug with empty matrix */
|
||||
dd_MatrixCanonicalize(&Vrep, &impl_linset, &redset, &newpos, err_ptr);
|
||||
if (*err_ptr == dd_NoError) {
|
||||
set_free(redset);
|
||||
set_free(impl_linset);
|
||||
free(newpos);
|
||||
}
|
||||
}
|
||||
if (*err_ptr == dd_NoError) (*Vrep_ptr) = Vrep;
|
||||
}
|
||||
|
||||
dd_FreePolyhedra(poly);
|
||||
}
|
||||
|
||||
|
||||
void print_both_reps(dd_MatrixPtr Vrep, dd_MatrixPtr Hrep)
|
||||
{
|
||||
/* Output V-representation */
|
||||
dd_WriteMatrix(stdout,Vrep);
|
||||
printf("\n");
|
||||
|
||||
/* Output H-representation */
|
||||
dd_WriteMatrix(stdout,Hrep);
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
|
||||
void compute_both_reps(dd_MatrixPtr M, dd_ErrorType* err_ptr)
|
||||
{
|
||||
dd_MatrixPtr Vrep, Hrep;
|
||||
minimal_Vrep_Hrep(M, &Vrep, &Hrep, err_ptr);
|
||||
if (*err_ptr != dd_NoError) return;
|
||||
|
||||
print_both_reps(Vrep, Hrep);
|
||||
dd_FreeMatrix(Hrep);
|
||||
dd_FreeMatrix(Vrep);
|
||||
}
|
||||
|
||||
|
||||
void compute_all(dd_MatrixPtr M, dd_ErrorType* err_ptr)
|
||||
{
|
||||
dd_MatrixPtr Vrep, Hrep;
|
||||
minimal_Vrep_Hrep(M, &Vrep, &Hrep, err_ptr);
|
||||
if (*err_ptr != dd_NoError) return;
|
||||
|
||||
print_both_reps(Vrep, Hrep);
|
||||
compute_adjacency(Vrep, err_ptr);
|
||||
compute_adjacency(Hrep, err_ptr);
|
||||
dd_FreeMatrix(Hrep);
|
||||
dd_FreeMatrix(Vrep);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void usage(char *name)
|
||||
{
|
||||
printf("No known option specified, I don't know what to do!\n"
|
||||
"Usage:\n"
|
||||
"%s --option\n"
|
||||
"where --option is precisely one of the following:\n\n"
|
||||
" --all: Compute everything.\n"
|
||||
" This will compute minimal H-,V-representation and vertex and facet graph.\n"
|
||||
"\n"
|
||||
" --reps: Compute both a minimal H- and minimal V-representation.\n"
|
||||
"\n"
|
||||
" --adjacency: Compute adjacency information only.\n"
|
||||
" The input is assumed to be a minimal representation, as, for example, computed\n"
|
||||
" by --reps. Warning, you will not get the correct answer if the input\n"
|
||||
" representation is not minimal! The output is the vertex or facet graph,\n"
|
||||
" depending on the input.\n"
|
||||
"\n"
|
||||
"The input data is a H- or V-representation in cdd's ine/ext format and\n"
|
||||
"is in each case read from stdin.\n",
|
||||
name);
|
||||
}
|
||||
|
||||
|
||||
enum command_line_arguments { ALL, REPS, ADJACENCY };
|
||||
|
||||
|
||||
int parse_arguments(char* arg, enum command_line_arguments* option)
|
||||
{
|
||||
if (strcmp(arg,"--all")==0) {
|
||||
*option = ALL;
|
||||
return 0;
|
||||
}
|
||||
if (strcmp(arg,"--reps")==0) {
|
||||
*option = REPS;
|
||||
return 0;
|
||||
}
|
||||
if (strcmp(arg,"--adjacency")==0) {
|
||||
*option = ADJACENCY;
|
||||
return 0;
|
||||
}
|
||||
printf("Unknown option: %s\n", arg);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
dd_ErrorType err=dd_NoError;
|
||||
dd_MatrixPtr M;
|
||||
enum command_line_arguments option;
|
||||
|
||||
if (argc!=2 || parse_arguments(argv[1],&option)) {
|
||||
usage(argv[0]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
dd_set_global_constants();
|
||||
|
||||
/* Read data from stdin */
|
||||
M = dd_PolyFile2Matrix(stdin, &err);
|
||||
if (err != dd_NoError) {
|
||||
printf("I was unable to parse the input data!\n");
|
||||
dd_WriteErrorMessages(stdout,err);
|
||||
dd_free_global_constants();
|
||||
return 1;
|
||||
}
|
||||
|
||||
switch (option) {
|
||||
case ALL:
|
||||
compute_all(M,&err);
|
||||
break;
|
||||
case REPS:
|
||||
compute_both_reps(M,&err);
|
||||
break;
|
||||
case ADJACENCY:
|
||||
compute_adjacency(M,&err);
|
||||
break;
|
||||
default:
|
||||
printf("unreachable option %d\n", option);
|
||||
exit(3); /* unreachable */
|
||||
}
|
||||
|
||||
/* cleanup */
|
||||
dd_FreeMatrix(M);
|
||||
if (err != dd_NoError) {
|
||||
dd_WriteErrorMessages(stdout,err);
|
||||
}
|
||||
|
||||
dd_free_global_constants();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1,43 +0,0 @@
|
||||
diff -up cddlib-094g/src-gmp/Makefile.am.orig cddlib-094g/src-gmp/Makefile.am
|
||||
--- cddlib-094g/src-gmp/Makefile.am.orig 2012-07-05 13:30:30.982562213 -0400
|
||||
+++ cddlib-094g/src-gmp/Makefile.am 2012-07-05 13:31:14.576563881 -0400
|
||||
@@ -11,7 +11,8 @@ testcdd1_gmp \
|
||||
testcdd2_gmp \
|
||||
testlp1_gmp \
|
||||
testlp2_gmp \
|
||||
-testlp3_gmp
|
||||
+testlp3_gmp \
|
||||
+cdd_both_reps_gmp
|
||||
#cddmathlink
|
||||
|
||||
scdd_gmp_SOURCES = simplecdd.c
|
||||
@@ -27,6 +28,7 @@ testcdd2_gmp_SOURCES = tes
|
||||
testlp1_gmp_SOURCES = testlp1.c
|
||||
testlp2_gmp_SOURCES = testlp2.c
|
||||
testlp3_gmp_SOURCES = testlp3.c
|
||||
+cdd_both_reps_gmp_SOURCES = cdd_both_reps.c
|
||||
# cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
|
||||
|
||||
LDADD = ../lib-src-gmp/libcddgmp.la
|
||||
diff -up cddlib-094g/src-gmp/Makefile.in.orig cddlib-094g/src-gmp/Makefile.in
|
||||
diff -up cddlib-094g/src/Makefile.am.orig cddlib-094g/src/Makefile.am
|
||||
--- cddlib-094g/src/Makefile.am.orig 2012-07-05 13:34:07.449570501 -0400
|
||||
+++ cddlib-094g/src/Makefile.am 2012-07-05 13:34:32.128571446 -0400
|
||||
@@ -11,7 +11,8 @@ testshoot \
|
||||
testcdd2 \
|
||||
testlp1 \
|
||||
testlp2 \
|
||||
-testlp3
|
||||
+testlp3 \
|
||||
+cdd_both_reps
|
||||
#cddmathlink
|
||||
|
||||
scdd_SOURCES = simplecdd.c
|
||||
@@ -27,6 +28,7 @@ testcdd2_SOURCES = testcdd
|
||||
testlp1_SOURCES = testlp1.c
|
||||
testlp2_SOURCES = testlp2.c
|
||||
testlp3_SOURCES = testlp3.c
|
||||
+cdd_both_reps_SOURCES = cdd_both_reps.c
|
||||
# cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
|
||||
|
||||
LDADD = ../lib-src/libcdd.la
|
40
ecl/PKGBUILD
40
ecl/PKGBUILD
@ -1,40 +0,0 @@
|
||||
# $Id$
|
||||
# Contributor: John Proctor <jproctor@prium.net>
|
||||
# Maintainer: juergen <juergen@archlinux.org>
|
||||
|
||||
pkgname=ecl
|
||||
pkgver=15.3.7
|
||||
_pkgver=15.3
|
||||
pkgrel=1
|
||||
pkgdesc="Embeddable Common Lisp"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://sourceforge.net/projects/ecls/"
|
||||
license=('LGPL')
|
||||
depends=('bash' 'gmp')
|
||||
makedepends=('texinfo')
|
||||
provides=('common-lisp' 'cl-asdf')
|
||||
options=('!makeflags')
|
||||
source=(http://downloads.sourceforge.net/project/ecls/ecls/${_pkgver}/ecl-${pkgver}.tgz)
|
||||
md5sums=('39f4fb924c88e47ce31e6d57ac2a6de8')
|
||||
|
||||
build() {
|
||||
cd $srcdir/$pkgname-$pkgver
|
||||
sed -i 's|-Wl,--rpath,~A|-Wl,--rpath,/usr/lib/ecl|' src/configure
|
||||
./configure \
|
||||
--build=$CHOST \
|
||||
--prefix=/usr \
|
||||
--with-tcp \
|
||||
--with-clos-streams \
|
||||
--enable-shared \
|
||||
--enable-boehm=included \
|
||||
--with-system-gmp \
|
||||
--without-x \
|
||||
--enable-threads \
|
||||
--without-clx
|
||||
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
make -C $srcdir/$pkgname-$pkgver DESTDIR=$pkgdir install
|
||||
}
|
@ -1,26 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=eclib
|
||||
pkgver=20141106
|
||||
pkgrel=3
|
||||
pkgdesc="Includes mwrank (for 2-descent on elliptic curves over Q) and modular symbol code used to create the elliptic curve database"
|
||||
arch=(i686 x86_64)
|
||||
url="https://github.com/JohnCremona/eclib/"
|
||||
license=(GPL)
|
||||
depends=(flint pari)
|
||||
source=("https://github.com/JohnCremona/eclib/archive/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('dd65b29741461a7abd02c721b9f0c80d')
|
||||
|
||||
build() {
|
||||
cd eclib-$pkgname-$pkgver
|
||||
./autogen.sh
|
||||
./configure --prefix=/usr --with-flint=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd eclib-$pkgname-$pkgver
|
||||
make install DESTDIR="$pkgdir"
|
||||
}
|
||||
|
@ -1,35 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=fflas-ffpack
|
||||
pkgver=1.6.0
|
||||
pkgrel=1
|
||||
pkgdesc="A library for dense linear algebra over word-size finite fields"
|
||||
arch=('any')
|
||||
url="http://linalg.org/projects/fflas-ffpack"
|
||||
license=('LGPL')
|
||||
makedepends=('givaro' 'cblas' 'lapack')
|
||||
source=("http://linalg.org/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('726f40bcdbde725469c9f2e4ebbe1d05')
|
||||
|
||||
prepare() {
|
||||
# fix givaro max version
|
||||
sed -e 's|version_max=30800|version_max=30900|' -i $pkgname-$pkgver/configure
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd $pkgname-$pkgver
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
@ -1,32 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
|
||||
# Contributor: Alessandro "jakedust" Andrioni <jakedust@gmail.com>
|
||||
|
||||
pkgname=flint
|
||||
pkgver=2.4.5
|
||||
pkgrel=1
|
||||
pkgdesc="A C library for doing number theory"
|
||||
arch=(i686 x86_64)
|
||||
url="http://www.flintlib.org"
|
||||
license=(GPL)
|
||||
depends=(mpfr ntl)
|
||||
source=("http://www.flintlib.org/flint-$pkgver.tar.gz")
|
||||
md5sums=('6504b9deabeafb9313e57153a1730b33')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
sed -i.orig 's,.*NTL/g_lip.h,// &,' interfaces/NTL-interface.cpp
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
./configure --prefix=/usr --with-gmp=/usr --with-mpfr=/usr --with-ntl=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
@ -1,25 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=flintqs
|
||||
pkgver=20070817
|
||||
pkgrel=1
|
||||
pkgdesc="Highly optimized multi-polynomial quadratic sieve for integer factorization"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://svn.sourceforge.net/svnroot/fastlibnt/trunk/QS/"
|
||||
license=('GPL')
|
||||
depends=('gmp')
|
||||
source=("http://www.sagemath.org/packages/upstream/$pkgname/$pkgname-$pkgver.tar.bz2")
|
||||
md5sums=('ee4a93f336a5fa840b2116a8c9b02911')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
mkdir -p "$pkgdir"/usr/bin
|
||||
cp QuadraticSieve "$pkgdir"/usr/bin
|
||||
}
|
||||
|
71
gap/PKGBUILD
71
gap/PKGBUILD
@ -1,71 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: TDY <tdy@archlinux.info>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
|
||||
|
||||
pkgbase=gap
|
||||
pkgname=('gap' 'gap-data' 'gap-doc' 'gap-packages')
|
||||
pkgver=4.7.7
|
||||
pkgrel=1
|
||||
pkgdesc="Groups, Algorithms, Programming: a system for computational discrete algebra"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.gap-system.org/"
|
||||
license=('GPL')
|
||||
source=("http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p7_2015_02_13-15_29.tar.bz2")
|
||||
sha256sums=('3a80bd46def5ea5387b283dc51fedcfcd6b3e4ec766f199df36d6ee30161c7c0')
|
||||
|
||||
build() {
|
||||
cd gap4r7
|
||||
./configure --prefix=/usr --with-gmp=system
|
||||
make
|
||||
}
|
||||
|
||||
package_gap() {
|
||||
depends=('gmp')
|
||||
optdepends=('gap-packages: extra packages' 'gap-data: additional databases' 'gap-doc: documentation')
|
||||
replaces=('gap-math')
|
||||
conflicts=('gap-math')
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r bin etc grp lib tst CITATION "$pkgdir"/usr/lib/gap
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap/pkg
|
||||
cp -r pkg/GAPDoc-* "$pkgdir"/usr/lib/gap/pkg
|
||||
|
||||
mkdir -p "$pkgdir"/usr/bin
|
||||
ln -s /usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
|
||||
|
||||
# fix location
|
||||
sed -e 's|/build/gap/src/gap4r7|/usr/lib/gap|' -i "$pkgdir"/usr/lib/gap/bin/gap.sh
|
||||
}
|
||||
|
||||
package_gap-data() {
|
||||
depends=('gap')
|
||||
pkgdesc="Additional databases for GAP"
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r prim small trans "$pkgdir"/usr/lib/gap
|
||||
}
|
||||
|
||||
package_gap-doc() {
|
||||
depends=('gap')
|
||||
pkgdesc="Documentation for GAP"
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r doc "$pkgdir"/usr/lib/gap
|
||||
}
|
||||
|
||||
package_gap-packages() {
|
||||
depends=('gap')
|
||||
pkgdesc="Extra packages for GAP"
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r pkg "$pkgdir"/usr/lib/gap
|
||||
|
||||
# GAPDoc is in main package
|
||||
rm -r "$pkgdir"/usr/lib/gap/pkg/GAPDoc-*
|
||||
}
|
@ -1,71 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: TDY <tdy@archlinux.info>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
|
||||
|
||||
pkgbase=gap
|
||||
pkgname=('gap' 'gap-data' 'gap-doc' 'gap-packages')
|
||||
pkgver=4.7.7
|
||||
pkgrel=1
|
||||
pkgdesc="Groups, Algorithms, Programming: a system for computational discrete algebra"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.gap-system.org/"
|
||||
license=('GPL')
|
||||
source=("http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p7_2015_02_13-15_29.tar.bz2")
|
||||
sha256sums=('3a80bd46def5ea5387b283dc51fedcfcd6b3e4ec766f199df36d6ee30161c7c0')
|
||||
|
||||
build() {
|
||||
cd gap4r7
|
||||
./configure --prefix=/usr --with-gmp=system
|
||||
make
|
||||
}
|
||||
|
||||
package_gap() {
|
||||
depends=('gmp')
|
||||
optdepends=('gap-packages: extra packages' 'gap-data: additional databases' 'gap-doc: documentation')
|
||||
replaces=('gap-math')
|
||||
conflicts=('gap-math')
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r bin etc grp lib tst CITATION "$pkgdir"/usr/lib/gap
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap/pkg
|
||||
cp -r pkg/GAPDoc-* "$pkgdir"/usr/lib/gap/pkg
|
||||
|
||||
mkdir -p "$pkgdir"/usr/bin
|
||||
ln -s /usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
|
||||
|
||||
# fix location
|
||||
sed -e 's|/build/gap/src/gap4r7|/usr/lib/gap|' -i "$pkgdir"/usr/lib/gap/bin/gap.sh
|
||||
}
|
||||
|
||||
package_gap-data() {
|
||||
depends=('gap')
|
||||
pkgdesc="Additional databases for GAP"
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r prim small trans "$pkgdir"/usr/lib/gap
|
||||
}
|
||||
|
||||
package_gap-doc() {
|
||||
depends=('gap')
|
||||
pkgdesc="Documentation for GAP"
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r doc "$pkgdir"/usr/lib/gap
|
||||
}
|
||||
|
||||
package_gap-packages() {
|
||||
depends=('gap')
|
||||
pkgdesc="Extra packages for GAP"
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r pkg "$pkgdir"/usr/lib/gap
|
||||
|
||||
# GAPDoc is in main package
|
||||
rm -r "$pkgdir"/usr/lib/gap/pkg/GAPDoc-*
|
||||
}
|
@ -1,71 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: TDY <tdy@archlinux.info>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
|
||||
|
||||
pkgbase=gap
|
||||
pkgname=('gap' 'gap-data' 'gap-doc' 'gap-packages')
|
||||
pkgver=4.7.7
|
||||
pkgrel=1
|
||||
pkgdesc="Groups, Algorithms, Programming: a system for computational discrete algebra"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.gap-system.org/"
|
||||
license=('GPL')
|
||||
source=("http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p7_2015_02_13-15_29.tar.bz2")
|
||||
sha256sums=('3a80bd46def5ea5387b283dc51fedcfcd6b3e4ec766f199df36d6ee30161c7c0')
|
||||
|
||||
build() {
|
||||
cd gap4r7
|
||||
./configure --prefix=/usr --with-gmp=system
|
||||
make
|
||||
}
|
||||
|
||||
package_gap() {
|
||||
depends=('gmp')
|
||||
optdepends=('gap-packages: extra packages' 'gap-data: additional databases' 'gap-doc: documentation')
|
||||
replaces=('gap-math')
|
||||
conflicts=('gap-math')
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r bin etc grp lib tst CITATION "$pkgdir"/usr/lib/gap
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap/pkg
|
||||
cp -r pkg/GAPDoc-* "$pkgdir"/usr/lib/gap/pkg
|
||||
|
||||
mkdir -p "$pkgdir"/usr/bin
|
||||
ln -s /usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
|
||||
|
||||
# fix location
|
||||
sed -e 's|/build/gap/src/gap4r7|/usr/lib/gap|' -i "$pkgdir"/usr/lib/gap/bin/gap.sh
|
||||
}
|
||||
|
||||
package_gap-data() {
|
||||
depends=('gap')
|
||||
pkgdesc="Additional databases for GAP"
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r prim small trans "$pkgdir"/usr/lib/gap
|
||||
}
|
||||
|
||||
package_gap-doc() {
|
||||
depends=('gap')
|
||||
pkgdesc="Documentation for GAP"
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r doc "$pkgdir"/usr/lib/gap
|
||||
}
|
||||
|
||||
package_gap-packages() {
|
||||
depends=('gap')
|
||||
pkgdesc="Extra packages for GAP"
|
||||
cd gap4r7
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib/gap
|
||||
cp -r pkg "$pkgdir"/usr/lib/gap
|
||||
|
||||
# GAPDoc is in main package
|
||||
rm -r "$pkgdir"/usr/lib/gap/pkg/GAPDoc-*
|
||||
}
|
@ -1,30 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=gf2x
|
||||
pkgver=1.1
|
||||
pkgrel=1
|
||||
pkgdesc="A library for multiplying polynomials over the binary field"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://gforge.inria.fr/projects/gf2x/"
|
||||
license=('GPL' 'LGPL')
|
||||
depends=('glibc')
|
||||
options=('!libtool')
|
||||
source=("http://gforge.inria.fr/frs/download.php/30873/gf2x-1.1.tar.gz")
|
||||
md5sums=('d9ce3a0d8cb6be50e3a1ff6d90be669f')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
./configure --prefix=/usr --enable-sse2 CFLAGS="$CFLAGS -msse2"
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd $pkgname-$pkgver
|
||||
make -k check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make prefix="$pkgdir"/usr install
|
||||
}
|
@ -1,30 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <remy@archlinux.org>
|
||||
|
||||
pkgname=gfan
|
||||
pkgver=0.5
|
||||
pkgrel=1
|
||||
pkgdesc="A software package for computing Gröbner fans and tropical varieties"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://home.imf.au.dk/jensen/software/gfan/gfan.html"
|
||||
license=('GPL')
|
||||
depends=('cddlib')
|
||||
source=("http://home.imf.au.dk/jensen/software/gfan/gfan${pkgver}.tar.gz" 'fix-build.patch')
|
||||
md5sums=('2d76d1625e0766c57c2b3ece809c23c8'
|
||||
'e327ec23a3bdf20ce6c8711ab154db50')
|
||||
|
||||
prepare() {
|
||||
cd gfan$pkgver
|
||||
patch -p1 -i $srcdir/fix-build.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd gfan$pkgver
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd gfan$pkgver
|
||||
make PREFIX="$pkgdir"/usr install
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
--- gfan0.5/app_minkowski.cpp.orig 2013-03-11 19:53:30.252937718 +0100
|
||||
+++ gfan0.5/app_minkowski.cpp 2013-03-11 19:53:37.346265847 +0100
|
||||
@@ -160,7 +160,7 @@
|
||||
//log0 fprintf(Stderr,"4");
|
||||
f.insert(c);
|
||||
//log0 fprintf(Stderr,"5\n");
|
||||
- static int i;
|
||||
+ //static int i;
|
||||
//log0 fprintf(Stderr,"inserted:%i\n",++i);
|
||||
}
|
||||
log1 fprintf(Stderr,"Resolving symmetries.\n");
|
@ -1,29 +0,0 @@
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <remy@archlinux.org>
|
||||
|
||||
pkgname=gfan
|
||||
pkgver=0.5
|
||||
pkgrel=1
|
||||
pkgdesc="A software package for computing Gröbner fans and tropical varieties"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://home.imf.au.dk/jensen/software/gfan/gfan.html"
|
||||
license=('GPL')
|
||||
depends=('cddlib')
|
||||
source=("http://home.imf.au.dk/jensen/software/gfan/gfan${pkgver}.tar.gz" 'fix-build.patch')
|
||||
md5sums=('2d76d1625e0766c57c2b3ece809c23c8'
|
||||
'e327ec23a3bdf20ce6c8711ab154db50')
|
||||
|
||||
prepare() {
|
||||
cd gfan$pkgver
|
||||
patch -p1 -i $srcdir/fix-build.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd gfan$pkgver
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd gfan$pkgver
|
||||
make PREFIX="$pkgdir"/usr install
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
--- gfan0.5/app_minkowski.cpp.orig 2013-03-11 19:53:30.252937718 +0100
|
||||
+++ gfan0.5/app_minkowski.cpp 2013-03-11 19:53:37.346265847 +0100
|
||||
@@ -160,7 +160,7 @@
|
||||
//log0 fprintf(Stderr,"4");
|
||||
f.insert(c);
|
||||
//log0 fprintf(Stderr,"5\n");
|
||||
- static int i;
|
||||
+ //static int i;
|
||||
//log0 fprintf(Stderr,"inserted:%i\n",++i);
|
||||
}
|
||||
log1 fprintf(Stderr,"Resolving symmetries.\n");
|
@ -1,29 +0,0 @@
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <remy@archlinux.org>
|
||||
|
||||
pkgname=gfan
|
||||
pkgver=0.5
|
||||
pkgrel=1
|
||||
pkgdesc="A software package for computing Gröbner fans and tropical varieties"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://home.imf.au.dk/jensen/software/gfan/gfan.html"
|
||||
license=('GPL')
|
||||
depends=('cddlib')
|
||||
source=("http://home.imf.au.dk/jensen/software/gfan/gfan${pkgver}.tar.gz" 'fix-build.patch')
|
||||
md5sums=('2d76d1625e0766c57c2b3ece809c23c8'
|
||||
'e327ec23a3bdf20ce6c8711ab154db50')
|
||||
|
||||
prepare() {
|
||||
cd gfan$pkgver
|
||||
patch -p1 -i $srcdir/fix-build.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd gfan$pkgver
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd gfan$pkgver
|
||||
make PREFIX="$pkgdir"/usr install
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
--- gfan0.5/app_minkowski.cpp.orig 2013-03-11 19:53:30.252937718 +0100
|
||||
+++ gfan0.5/app_minkowski.cpp 2013-03-11 19:53:37.346265847 +0100
|
||||
@@ -160,7 +160,7 @@
|
||||
//log0 fprintf(Stderr,"4");
|
||||
f.insert(c);
|
||||
//log0 fprintf(Stderr,"5\n");
|
||||
- static int i;
|
||||
+ //static int i;
|
||||
//log0 fprintf(Stderr,"inserted:%i\n",++i);
|
||||
}
|
||||
log1 fprintf(Stderr,"Resolving symmetries.\n");
|
@ -1,30 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@phare.normalesup.org>
|
||||
|
||||
pkgname=givaro
|
||||
pkgver=3.8.0
|
||||
pkgrel=1
|
||||
pkgdesc="C++ library for arithmetic and algebraic computations"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www-lmc.imag.fr/CASYS/LOGICIELS/givaro/"
|
||||
license=('GPL')
|
||||
depends=('gmp')
|
||||
source=("https://forge.imag.fr/frs/download.php/592/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('6ba1a4672a5d434d2502d17db30c86e5')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
./configure --prefix=/usr --enable-shared
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd $pkgname-$pkgver
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
@ -1,32 +0,0 @@
|
||||
# Contributor: Rémy Oudompheng <oudomphe@phare.normalesup.org>
|
||||
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
|
||||
|
||||
pkgname=gmp-ecm
|
||||
pkgver=6.4.4
|
||||
pkgrel=2
|
||||
pkgdesc='Elliptic Curve Method for Integer Factorization'
|
||||
url='http://ecm.gforge.inria.fr/'
|
||||
license=('GPL' 'LGPL')
|
||||
depends=('gmp')
|
||||
options=('!libtool')
|
||||
arch=('i686' 'x86_64')
|
||||
source=("http://gforge.inria.fr/frs/download.php/32159/ecm-${pkgver}.tar.gz")
|
||||
sha1sums=('003d259772bd7748854f0fd8722299505c7d5259')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/ecm-${pkgver}"
|
||||
[[ $CARCH = *86* ]] && export CFLAGS+=' -msse'
|
||||
./configure --prefix=/usr --enable-shared --enable-openmp
|
||||
# make ecm-params
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "${srcdir}/ecm-${pkgver}"
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/ecm-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
25
iml/PKGBUILD
25
iml/PKGBUILD
@ -1,25 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
|
||||
|
||||
pkgname=iml
|
||||
pkgver=1.0.4
|
||||
pkgrel=1
|
||||
pkgdesc="C Library of integer matrix algorithms"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://cs.uwaterloo.ca/~astorjoh/iml.html"
|
||||
license=('GPL')
|
||||
depends=('gmp' 'cblas')
|
||||
source=("http://www.cs.uwaterloo.ca/~astorjoh/$pkgname-$pkgver.tar.bz2")
|
||||
md5sums=('cfe3ebc69748c4ac240d6e200b6937ca')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
./configure --prefix=/usr --enable-shared --with-cblas=-lcblas
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
@ -1,23 +0,0 @@
|
||||
--- L-1.23/include/Lcommon.h.orig 2011-04-09 04:09:25.984121006 -0300
|
||||
+++ L-1.23/include/Lcommon.h 2011-04-09 04:09:58.750265003 -0300
|
||||
@@ -25,6 +25,8 @@ inline double lcalc_to_double(const Doub
|
||||
#ifdef USE_MPFR
|
||||
inline double lcalc_to_double(const double& x) { return x; }
|
||||
#endif
|
||||
+
|
||||
+#if 0
|
||||
//inline double lcalc_to_double(const long double& x) { return x; }
|
||||
inline double lcalc_to_double(const int& x) { return x; }
|
||||
inline double lcalc_to_double(const long long& x) { return x; }
|
||||
@@ -33,6 +35,10 @@ inline double lcalc_to_double(const char
|
||||
inline double lcalc_to_double(const long int& x) { return x; }
|
||||
inline double lcalc_to_double(const unsigned int& x) { return x; }
|
||||
inline double lcalc_to_double(const long unsigned int& x) { return x; }
|
||||
+#else
|
||||
+# define lcalc_to_double(x) ((double)(x))
|
||||
+#endif
|
||||
+
|
||||
#define Int(x) (int)(lcalc_to_double(x))
|
||||
#define Long(x) (Long)(lcalc_to_double(x))
|
||||
#define double(x) (double)(lcalc_to_double(x))
|
||||
|
@ -1,48 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=lcalc
|
||||
pkgver=1.23
|
||||
pkgrel=4
|
||||
pkgdesc="C++ L-function class library and command line interface"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"
|
||||
license=('GPL2')
|
||||
depends=('pari')
|
||||
makedepends=('chrpath')
|
||||
source=("http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-$pkgver.tar.gz" 'Lcommon.h.patch' 'gcc-4.9.patch' 'pari-2.7.patch'
|
||||
'init_stack.patch')
|
||||
md5sums=('8262d4495e0bbe0283e5341ef8694c23'
|
||||
'8af1dd6d3118bb785f193283a31305a2'
|
||||
'436dd35b06766dffad0941bcfb511e89'
|
||||
'9829d36d0c68e37f2692f44cbb6df535'
|
||||
'c1de0b9cdfa9991e980c34092a43dddf')
|
||||
|
||||
prepare() {
|
||||
cd L-$pkgver
|
||||
patch -p1 -i "$srcdir"/Lcommon.h.patch
|
||||
patch -p1 -i "$srcdir"/gcc-4.9.patch
|
||||
# Use pari_init_stack() instead of old allocatemoremem()
|
||||
patch -p1 -i "$srcdir"/init_stack.patch
|
||||
# port to PARI 2.7 API
|
||||
patch -p1 -i "$srcdir"/pari-2.7.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd L-$pkgver/src
|
||||
make PARI_DEFINE="-DINCLUDE_PARI" LOCATION_PARI_H="/usr/include/pari" LOCATION_PARI_LIBRARY="/usr/lib" all
|
||||
}
|
||||
|
||||
package() {
|
||||
cd L-$pkgver/src
|
||||
mkdir -p "$pkgdir"/usr/{bin,include,lib}
|
||||
make INSTALL_DIR="$pkgdir"/usr install
|
||||
|
||||
# remove leftover files
|
||||
rm "$pkgdir"/usr/include/Lfunction/{Lexplicit_formula.h.swap.crap,.*.swp,.DS*}
|
||||
# fix wrong permissions
|
||||
chmod 644 "$pkgdir"/usr/include/Lfunction/Ldokchitser.h
|
||||
# fix insecure rpath
|
||||
chrpath -d "$pkgdir"/usr/bin/lcalc
|
||||
}
|
||||
|
@ -1,24 +0,0 @@
|
||||
diff -Naur lcalc-1.23-vanilla/include/Ldirichlet_series.h lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h
|
||||
--- lcalc-1.23-vanilla/include/Ldirichlet_series.h 2012-08-08 23:21:55.000000000 +0200
|
||||
+++ lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h 2014-04-21 14:37:59.027464849 +0200
|
||||
@@ -43,7 +43,7 @@
|
||||
//XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
|
||||
template <class ttype>
|
||||
Complex L_function <ttype>::
|
||||
-dirichlet_series(Complex s, long long N=-1)
|
||||
+dirichlet_series(Complex s, long long N)
|
||||
{
|
||||
Complex z=0.;
|
||||
long long m,n;
|
||||
diff -Naur lcalc-1.23-vanilla/include/L.h lcalc-1.23-fixed-gcc.4.9/include/L.h
|
||||
--- lcalc-1.23-vanilla/include/L.h 2012-08-08 23:21:55.000000000 +0200
|
||||
+++ lcalc-1.23-fixed-gcc.4.9/include/L.h 2014-04-21 14:32:04.003467348 +0200
|
||||
@@ -491,7 +491,7 @@
|
||||
|
||||
//#include "Ldirichlet_series.h" //for computing Dirichlet series
|
||||
Complex partial_dirichlet_series(Complex s, long long N1, long long N2);
|
||||
- Complex dirichlet_series(Complex s, long long N);
|
||||
+ Complex dirichlet_series(Complex s, long long N=-1LL);
|
||||
|
||||
//#include "Ltaylor_series.h" //for computing taylor series for Dirichlet series
|
||||
//void compute_taylor_series(int N, int K, Complex s_0, Complex *series);
|
@ -1,31 +0,0 @@
|
||||
diff -ru src/include/Lcommandline.h b/include/Lcommandline.h
|
||||
--- src/include/Lcommandline.h 2012-08-08 23:21:55.000000000 +0200
|
||||
+++ b/include/Lcommandline.h 2014-01-06 14:04:55.981027532 +0100
|
||||
@@ -40,12 +40,7 @@
|
||||
#include "Lcommandline_globals.h" //command line global variables
|
||||
#ifdef INCLUDE_PARI
|
||||
#include "pari.h" //for pari's elliptic curve functions
|
||||
-#undef init //pari has a '#define init pari_init' which
|
||||
- //causes trouble with the stream.h init.
|
||||
- //pari also causes trouble with things like abs.
|
||||
- //we place the pari include first since otherwise it
|
||||
- //messes up.
|
||||
-
|
||||
+#include "paripriv.h" //for pari_init_stack()
|
||||
#endif //ifdef INCLUDE_PARI
|
||||
|
||||
|
||||
diff -ru src/src/Lcommandline.cc b/src/Lcommandline.cc
|
||||
--- src/src/Lcommandline.cc 2012-08-08 23:21:56.000000000 +0200
|
||||
+++ b/src/Lcommandline.cc 2014-01-06 14:02:19.463388366 +0100
|
||||
@@ -473,7 +473,9 @@
|
||||
|
||||
#ifdef INCLUDE_PARI
|
||||
if(do_elliptic_curve){
|
||||
- allocatemoremem((int) N_terms*16+1000000); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
|
||||
+ // Reallocate PARI stack
|
||||
+ pari_init_stack((size_t)N_terms*16 + 1000000, top-bot); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
|
||||
+
|
||||
if (my_verbose>0) cout << "Will precompute " << N_terms << " elliptic L-function dirichlet coefficients..." << endl;
|
||||
initialize_new_L(a1,a2,a3,a4,a6,N_terms);
|
||||
}
|
@ -1,34 +0,0 @@
|
||||
Description: Port to pari 2.7 API
|
||||
Author: Luca Falavigna <dktrkranz@debian.org>
|
||||
Tobias Hansen <thansen@debian.org>
|
||||
Bug-Debian: http://bugs.debian.org/635506
|
||||
http://bugs.debian.org/743327
|
||||
|
||||
--- a/src/Lcommandline_elliptic.cc
|
||||
+++ b/src/Lcommandline_elliptic.cc
|
||||
@@ -121,11 +121,11 @@
|
||||
|
||||
|
||||
F = cgetg(6, t_VEC);
|
||||
- F[1] = lgeti(BIGDEFAULTPREC);
|
||||
- F[2] = lgeti(BIGDEFAULTPREC);
|
||||
- F[3] = lgeti(BIGDEFAULTPREC);
|
||||
- F[4] = lgeti(BIGDEFAULTPREC);
|
||||
- F[5] = lgeti(BIGDEFAULTPREC);
|
||||
+ F[1] = (long)cgeti(BIGDEFAULTPREC);
|
||||
+ F[2] = (long)cgeti(BIGDEFAULTPREC);
|
||||
+ F[3] = (long)cgeti(BIGDEFAULTPREC);
|
||||
+ F[4] = (long)cgeti(BIGDEFAULTPREC);
|
||||
+ F[5] = (long)cgeti(BIGDEFAULTPREC);
|
||||
|
||||
//gaffsg(a1,(GEN) F[1]);
|
||||
//gaffsg(a2,(GEN) F[2]);
|
||||
@@ -139,7 +139,7 @@
|
||||
gaffect(strtoGEN(a4), (GEN) F[4]);
|
||||
gaffect(strtoGEN(a6), (GEN) F[5]);
|
||||
|
||||
- E = initell(F,BIGDEFAULTPREC);
|
||||
+ E = ellinit(F, NULL, BIGDEFAULTPREC);
|
||||
|
||||
C=globalreduction(E);
|
||||
|
@ -1,46 +0,0 @@
|
||||
diff -ru src/Makefile b/Makefile
|
||||
--- src/Makefile 2010-01-22 08:53:21.000000000 +0100
|
||||
+++ b/Makefile 2014-01-16 14:55:51.977047191 +0100
|
||||
@@ -1,24 +1,3 @@
|
||||
-
|
||||
-##### Configurable options:
|
||||
-
|
||||
-## Compiler:
|
||||
-CC=gcc
|
||||
-#CC=cc
|
||||
-
|
||||
-## Compiler flags:
|
||||
-
|
||||
-# GCC: (also -march=pentium etc, for machine-dependent optimizing)
|
||||
-CFLAGS=-Wall -O3 -fomit-frame-pointer -funroll-loops
|
||||
-
|
||||
-# GCC w/ debugging:
|
||||
-#CFLAGS=-Wall -g -DINLINE=
|
||||
-
|
||||
-# Compaq C / Digital C:
|
||||
-#CFLAGS=-arch=host -fast
|
||||
-
|
||||
-# SunOS:
|
||||
-#CFLAGS=-fast
|
||||
-
|
||||
## Program options:
|
||||
|
||||
# Enable long options for cl (eg. "cl --help"), comment out to disable.
|
||||
@@ -29,14 +8,14 @@
|
||||
##### End of configurable options
|
||||
|
||||
|
||||
-all: cl
|
||||
+all: libcliquer.so
|
||||
|
||||
|
||||
testcases: testcases.o cliquer.o graph.o reorder.o
|
||||
$(CC) $(LDFLAGS) -o $@ testcases.o cliquer.o graph.o reorder.o
|
||||
|
||||
-cl: cl.o cliquer.o graph.o reorder.o
|
||||
- $(CC) $(LDFLAGS) -o $@ cl.o cliquer.o graph.o reorder.o
|
||||
+libcliquer.so: cl.o cliquer.o graph.o reorder.o
|
||||
+ $(CC) $(LDFLAGS) $(SAGESOFLAGS) -o $@ cl.o cliquer.o graph.o reorder.o
|
||||
|
||||
|
||||
cl.o testcases.o cliquer.o graph.o reorder.o: cliquer.h set.h graph.h misc.h reorder.h Makefile cliquerconf.h
|
@ -1,36 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=libcliquer
|
||||
pkgver=1.21
|
||||
pkgrel=1
|
||||
pkgdesc="A set of C routines for finding cliques in an arbitrary weighted graph"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://users.aalto.fi/~pat/cliquer.html"
|
||||
license=('GPL')
|
||||
depends=('glibc')
|
||||
source=("http://users.aalto.fi/~pat/cliquer/cliquer-$pkgver.tar.gz" 'Makefile.patch')
|
||||
md5sums=('ac65de2c89134abe2be36542b9465b16'
|
||||
'a38360e029771417aca9ff542943d6be')
|
||||
|
||||
prepare() {
|
||||
cd cliquer-$pkgver
|
||||
|
||||
# build shared lib
|
||||
patch -i $srcdir/Makefile.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd cliquer-$pkgver
|
||||
|
||||
export CFLAGS="$CFLAGS -fPIC"
|
||||
export SAGESOFLAGS="-shared -Wl,-soname,libcliquer.so"
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd cliquer-$pkgver
|
||||
mkdir -p "$pkgdir"/usr/{lib,include/cliquer}
|
||||
install -m644 libcliquer.so "$pkgdir"/usr/lib
|
||||
install -m644 *.h "$pkgdir"/usr/include/cliquer
|
||||
}
|
@ -1,46 +0,0 @@
|
||||
diff -ru src/Makefile b/Makefile
|
||||
--- src/Makefile 2010-01-22 08:53:21.000000000 +0100
|
||||
+++ b/Makefile 2014-01-16 14:55:51.977047191 +0100
|
||||
@@ -1,24 +1,3 @@
|
||||
-
|
||||
-##### Configurable options:
|
||||
-
|
||||
-## Compiler:
|
||||
-CC=gcc
|
||||
-#CC=cc
|
||||
-
|
||||
-## Compiler flags:
|
||||
-
|
||||
-# GCC: (also -march=pentium etc, for machine-dependent optimizing)
|
||||
-CFLAGS=-Wall -O3 -fomit-frame-pointer -funroll-loops
|
||||
-
|
||||
-# GCC w/ debugging:
|
||||
-#CFLAGS=-Wall -g -DINLINE=
|
||||
-
|
||||
-# Compaq C / Digital C:
|
||||
-#CFLAGS=-arch=host -fast
|
||||
-
|
||||
-# SunOS:
|
||||
-#CFLAGS=-fast
|
||||
-
|
||||
## Program options:
|
||||
|
||||
# Enable long options for cl (eg. "cl --help"), comment out to disable.
|
||||
@@ -29,14 +8,14 @@
|
||||
##### End of configurable options
|
||||
|
||||
|
||||
-all: cl
|
||||
+all: libcliquer.so
|
||||
|
||||
|
||||
testcases: testcases.o cliquer.o graph.o reorder.o
|
||||
$(CC) $(LDFLAGS) -o $@ testcases.o cliquer.o graph.o reorder.o
|
||||
|
||||
-cl: cl.o cliquer.o graph.o reorder.o
|
||||
- $(CC) $(LDFLAGS) -o $@ cl.o cliquer.o graph.o reorder.o
|
||||
+libcliquer.so: cl.o cliquer.o graph.o reorder.o
|
||||
+ $(CC) $(LDFLAGS) $(SAGESOFLAGS) -o $@ cl.o cliquer.o graph.o reorder.o
|
||||
|
||||
|
||||
cl.o testcases.o cliquer.o graph.o reorder.o: cliquer.h set.h graph.h misc.h reorder.h Makefile cliquerconf.h
|
@ -1,35 +0,0 @@
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=libcliquer
|
||||
pkgver=1.21
|
||||
pkgrel=1
|
||||
pkgdesc="A set of C routines for finding cliques in an arbitrary weighted graph"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://users.aalto.fi/~pat/cliquer.html"
|
||||
license=('GPL')
|
||||
depends=('glibc')
|
||||
source=("http://users.aalto.fi/~pat/cliquer/cliquer-$pkgver.tar.gz" 'Makefile.patch')
|
||||
md5sums=('ac65de2c89134abe2be36542b9465b16'
|
||||
'a38360e029771417aca9ff542943d6be')
|
||||
|
||||
prepare() {
|
||||
cd cliquer-$pkgver
|
||||
|
||||
# build shared lib
|
||||
patch -i $srcdir/Makefile.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd cliquer-$pkgver
|
||||
|
||||
export CFLAGS="$CFLAGS -fPIC"
|
||||
export SAGESOFLAGS="-shared -Wl,-soname,libcliquer.so"
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd cliquer-$pkgver
|
||||
mkdir -p "$pkgdir"/usr/{lib,include/cliquer}
|
||||
install -m644 libcliquer.so "$pkgdir"/usr/lib
|
||||
install -m644 *.h "$pkgdir"/usr/include/cliquer
|
||||
}
|
@ -1,46 +0,0 @@
|
||||
diff -ru src/Makefile b/Makefile
|
||||
--- src/Makefile 2010-01-22 08:53:21.000000000 +0100
|
||||
+++ b/Makefile 2014-01-16 14:55:51.977047191 +0100
|
||||
@@ -1,24 +1,3 @@
|
||||
-
|
||||
-##### Configurable options:
|
||||
-
|
||||
-## Compiler:
|
||||
-CC=gcc
|
||||
-#CC=cc
|
||||
-
|
||||
-## Compiler flags:
|
||||
-
|
||||
-# GCC: (also -march=pentium etc, for machine-dependent optimizing)
|
||||
-CFLAGS=-Wall -O3 -fomit-frame-pointer -funroll-loops
|
||||
-
|
||||
-# GCC w/ debugging:
|
||||
-#CFLAGS=-Wall -g -DINLINE=
|
||||
-
|
||||
-# Compaq C / Digital C:
|
||||
-#CFLAGS=-arch=host -fast
|
||||
-
|
||||
-# SunOS:
|
||||
-#CFLAGS=-fast
|
||||
-
|
||||
## Program options:
|
||||
|
||||
# Enable long options for cl (eg. "cl --help"), comment out to disable.
|
||||
@@ -29,14 +8,14 @@
|
||||
##### End of configurable options
|
||||
|
||||
|
||||
-all: cl
|
||||
+all: libcliquer.so
|
||||
|
||||
|
||||
testcases: testcases.o cliquer.o graph.o reorder.o
|
||||
$(CC) $(LDFLAGS) -o $@ testcases.o cliquer.o graph.o reorder.o
|
||||
|
||||
-cl: cl.o cliquer.o graph.o reorder.o
|
||||
- $(CC) $(LDFLAGS) -o $@ cl.o cliquer.o graph.o reorder.o
|
||||
+libcliquer.so: cl.o cliquer.o graph.o reorder.o
|
||||
+ $(CC) $(LDFLAGS) $(SAGESOFLAGS) -o $@ cl.o cliquer.o graph.o reorder.o
|
||||
|
||||
|
||||
cl.o testcases.o cliquer.o graph.o reorder.o: cliquer.h set.h graph.h misc.h reorder.h Makefile cliquerconf.h
|
@ -1,35 +0,0 @@
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=libcliquer
|
||||
pkgver=1.21
|
||||
pkgrel=1
|
||||
pkgdesc="A set of C routines for finding cliques in an arbitrary weighted graph"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://users.aalto.fi/~pat/cliquer.html"
|
||||
license=('GPL')
|
||||
depends=('glibc')
|
||||
source=("http://users.aalto.fi/~pat/cliquer/cliquer-$pkgver.tar.gz" 'Makefile.patch')
|
||||
md5sums=('ac65de2c89134abe2be36542b9465b16'
|
||||
'a38360e029771417aca9ff542943d6be')
|
||||
|
||||
prepare() {
|
||||
cd cliquer-$pkgver
|
||||
|
||||
# build shared lib
|
||||
patch -i $srcdir/Makefile.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd cliquer-$pkgver
|
||||
|
||||
export CFLAGS="$CFLAGS -fPIC"
|
||||
export SAGESOFLAGS="-shared -Wl,-soname,libcliquer.so"
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd cliquer-$pkgver
|
||||
mkdir -p "$pkgdir"/usr/{lib,include/cliquer}
|
||||
install -m644 libcliquer.so "$pkgdir"/usr/lib
|
||||
install -m644 *.h "$pkgdir"/usr/include/cliquer
|
||||
}
|
@ -1,26 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=libfplll
|
||||
pkgver=4.0.4
|
||||
pkgrel=1
|
||||
pkgdesc="Implementations of the floating-point LLL reduction algorithm for euclidean lattices"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://github.com/dstehle/fplll"
|
||||
license=('LGPL')
|
||||
depends=('mpfr')
|
||||
#source=("http://perso.ens-lyon.fr/damien.stehle/fplll/$pkgname-$pkgver.tar.gz")
|
||||
source=("http://www.sagemath.org/packages/upstream/libfplll/$pkgname-$pkgver.tar.bz2")
|
||||
md5sums=('db4b1aa57ff3068992d4ea2ab5371a9e')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
@ -1,26 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=libgap
|
||||
pkgver=4.7.7
|
||||
pkgrel=2
|
||||
pkgdesc="A C library version of the GAP kernel"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://bitbucket.org/vbraun/libgap"
|
||||
license=('GPL')
|
||||
depends=('gmp')
|
||||
source=("http://boxen.math.washington.edu/home/vbraun/upstream/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('4486634a518ee5e8187988ebce47bd69')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make install DESTDIR="$pkgdir"
|
||||
}
|
||||
|
@ -1,26 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=libgap
|
||||
pkgver=4.7.7
|
||||
pkgrel=2
|
||||
pkgdesc="A C library version of the GAP kernel"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://bitbucket.org/vbraun/libgap"
|
||||
license=('GPL')
|
||||
depends=('gmp')
|
||||
source=("http://boxen.math.washington.edu/home/vbraun/upstream/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('4486634a518ee5e8187988ebce47bd69')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make install DESTDIR="$pkgdir"
|
||||
}
|
||||
|
@ -1,26 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=libgap
|
||||
pkgver=4.7.7
|
||||
pkgrel=2
|
||||
pkgdesc="A C library version of the GAP kernel"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://bitbucket.org/vbraun/libgap"
|
||||
license=('GPL')
|
||||
depends=('gmp')
|
||||
source=("http://boxen.math.washington.edu/home/vbraun/upstream/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('4486634a518ee5e8187988ebce47bd69')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make install DESTDIR="$pkgdir"
|
||||
}
|
||||
|
@ -1,51 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas < nqn76sw@gmail.com >
|
||||
|
||||
pkgname=linbox
|
||||
pkgver=1.3.2
|
||||
pkgrel=1
|
||||
pkgdesc="A template library for exact, high-performance linear algebra computation with dense, sparse, and structured matrices over the integers and over finite fields"
|
||||
arch=(i686 x86_64)
|
||||
url="http://linalg.org/"
|
||||
license=(LGPL)
|
||||
depends=(m4rie lapack ntl libfplll iml givaro)
|
||||
makedepends=(fflas-ffpack)
|
||||
source=("http://linalg.org/$pkgname-$pkgver.tar.gz" 'linbox-fplll.patch' 'underlink.patch' 'lapack.patch')
|
||||
md5sums=('67c80345c8c3e93d213f2d7d37d8c9af'
|
||||
'76fbb525cceff1dd74a7c1892ca965d0'
|
||||
'731a6b17c40a56e38fef79e03391e0b5'
|
||||
'3525650c88f9a2809214216b914f4f46')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
# fix build with newer givaro
|
||||
sed -i 's|version_max=30800|version_max=30900|' configure
|
||||
# fix libfplll support - Fedora patch
|
||||
patch -p0 -i ../linbox-fplll.patch
|
||||
# fix underlink - Fedora patch
|
||||
patch -p0 -i ../underlink.patch
|
||||
# fix detecting lapack support in fflas-ffpack
|
||||
patch -p0 -i ../lapack.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
export CFLAGS="$CFLAGS -g -fPIC"
|
||||
export CXXFLAGS="$CXXFLAGS -g -fPIC"
|
||||
export LDFLAGS="$LDFLAGS -L/usr/lib"
|
||||
|
||||
./configure --prefix=/usr --enable-sage --enable-optimization --with-fplll=/usr
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd $pkgname-$pkgver
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
@ -1,22 +0,0 @@
|
||||
--- ./macros/lapack-check.m4.orig 2012-06-07 02:30:26.000000000 -0600
|
||||
+++ ./macros/lapack-check.m4 2012-10-02 15:05:47.051001770 -0600
|
||||
@@ -38,7 +38,7 @@ LIBS="${BACKUP_LIBS} ${BLAS_LIBS}"
|
||||
|
||||
AC_TRY_RUN(dnl ICC ?
|
||||
[ #include "fflas-ffpack/fflas-ffpack-config.h"
|
||||
- #ifdef __FFLAS_FFPACK_HAVE_LAPACK
|
||||
+ #ifdef __FFLASFFPACK_HAVE_LAPACK
|
||||
int main() { return 0 ; }
|
||||
#else
|
||||
a pas lapack
|
||||
--- ./configure.orig 2012-06-07 15:19:31.000000000 -0600
|
||||
+++ ./configure 2012-10-02 15:06:07.629005714 -0600
|
||||
@@ -18077,7 +18077,7 @@ else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include "fflas-ffpack/fflas-ffpack-config.h"
|
||||
- #ifdef __FFLAS_FFPACK_HAVE_LAPACK
|
||||
+ #ifdef __FFLASFFPACK_HAVE_LAPACK
|
||||
int main() { return 0 ; }
|
||||
#else
|
||||
a pas lapack
|
@ -1,87 +0,0 @@
|
||||
--- ./linbox/algorithms/lattice.h.orig 2012-06-07 02:30:32.000000000 -0600
|
||||
+++ ./linbox/algorithms/lattice.h 2012-12-10 16:03:03.114827079 -0700
|
||||
@@ -48,18 +48,7 @@
|
||||
|
||||
|
||||
#ifdef __LINBOX_HAVE_FPLLL
|
||||
-// this is a damn FPLLL bug !!!
|
||||
-namespace FPLLL {
|
||||
-#define round
|
||||
-#define trunc
|
||||
#include <fplll/fplll.h>
|
||||
-#include <fplll/heuristic.h>
|
||||
-#include <fplll/proved.h>
|
||||
-#include <fplll/wrapper.h>
|
||||
-#undef round
|
||||
-#undef trunc
|
||||
-}
|
||||
-
|
||||
#endif
|
||||
|
||||
|
||||
--- ./linbox/algorithms/lattice.inl.orig 2012-06-07 02:30:32.000000000 -0600
|
||||
+++ ./linbox/algorithms/lattice.inl 2012-12-10 16:05:04.846262737 -0700
|
||||
@@ -335,31 +335,31 @@ namespace LinBox
|
||||
if (withU)
|
||||
throw NotImplementedYet("not U");
|
||||
// Convert H
|
||||
- FPLLL::ZZ_mat<ZT> B(H.rowdim(),H.coldim()) ;
|
||||
+ fplll::ZZ_mat<ZT> B(H.rowdim(),H.coldim()) ;
|
||||
for (size_t i = 0 ; i < H.rowdim() ; ++i) {
|
||||
for (size_t j = 0 ; j < H.coldim() ; ++j) {
|
||||
- B.Set(i,j,FPLLL::Z_NR<ZT>(H.getEntry(i,j)) );
|
||||
+ B.Set(i,j,fplll::Z_NR<ZT>(H.getEntry(i,j)) );
|
||||
}
|
||||
}
|
||||
// LLL()
|
||||
switch (meth.getMeth()) {
|
||||
case (latticeMethod::latticeFPLLL::P) :
|
||||
{
|
||||
- FPLLL::proved<ZT,double> lllMethod(&B,meth.getPrecision(),
|
||||
+ fplll::proved<ZT,double> lllMethod(&B,meth.getPrecision(),
|
||||
meth.getEta(),meth.getDelta());
|
||||
lllMethod.LLL();
|
||||
}
|
||||
break;
|
||||
case (latticeMethod::latticeFPLLL::W) :
|
||||
{
|
||||
- FPLLL::wrapper lllMethod(&B,meth.getPrecision(),
|
||||
+ fplll::wrapper lllMethod(&B,meth.getPrecision(),
|
||||
meth.getEta(),meth.getDelta());
|
||||
lllMethod.LLL();
|
||||
}
|
||||
break;
|
||||
case (latticeMethod::latticeFPLLL::H) :
|
||||
{
|
||||
- FPLLL::heuristic<ZT,double> lllMethod(&B,meth.getPrecision(),
|
||||
+ fplll::heuristic<ZT,double> lllMethod(&B,meth.getPrecision(),
|
||||
meth.getEta(),meth.getDelta(),
|
||||
meth.getSiegel());
|
||||
lllMethod.LLL();
|
||||
--- ./linbox/algorithms/rational-reconstruction.h.orig 2012-06-07 02:30:32.000000000 -0600
|
||||
+++ ./linbox/algorithms/rational-reconstruction.h 2012-12-10 16:05:42.491217743 -0700
|
||||
@@ -1734,7 +1734,7 @@ namespace LinBox
|
||||
for (size_t i=1;i< k+1;++i){
|
||||
Lattice.setEntry(i,i, mod );
|
||||
_r.convert(tmp, real_approximation[bad_num_index+i-1]);
|
||||
- Lattice.setEntry(0,i,FPLLL::Z_NR<mpz_t>(tmp.get_mpz()));
|
||||
+ Lattice.setEntry(0,i,fplll::Z_NR<mpz_t>(tmp.get_mpz()));
|
||||
}
|
||||
|
||||
|
||||
--- ./configure.orig 2012-12-10 16:02:55.325073492 -0700
|
||||
+++ ./configure 2012-12-10 16:03:03.118827059 -0700
|
||||
@@ -17018,12 +17018,11 @@ fi
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <fplll/fplll.h>
|
||||
- #include <fplll/solver.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-enum EvaluatorType a ;
|
||||
+enum fplll::MatPrintMode a ;
|
||||
;
|
||||
return 0;
|
||||
}
|
@ -1,41 +0,0 @@
|
||||
--- ./linbox/Makefile.in.orig 2012-06-07 15:19:27.000000000 -0600
|
||||
+++ ./linbox/Makefile.in 2012-09-26 11:26:58.091786035 -0600
|
||||
@@ -154,7 +154,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM
|
||||
CXXLD = $(CXX)
|
||||
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||||
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
|
||||
- $(LDFLAGS) -o $@
|
||||
+ $(liblinbox_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(liblinbox_la_SOURCES)
|
||||
DIST_SOURCES = $(liblinbox_la_SOURCES)
|
||||
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
||||
@@ -390,6 +390,7 @@ liblinbox_la_LIBADD = \
|
||||
util/libutil.la \
|
||||
randiter/libranditer.la \
|
||||
algorithms/libalgorithms.la
|
||||
+liblinbox_la_LDFLAGS = $(MPFR_LIBS) $(IML_LIBS) $(BLAS_LIBS)
|
||||
|
||||
all: all-recursive
|
||||
|
||||
--- ./interfaces/sage/Makefile.in.orig 2012-06-07 15:19:27.000000000 -0600
|
||||
+++ ./interfaces/sage/Makefile.in 2012-09-26 11:37:52.303447240 -0600
|
||||
@@ -334,7 +334,7 @@ top_srcdir = @top_srcdir@
|
||||
#liblinboxsage_la_LIBADD = -llinbox $(BLAS_LIBS)
|
||||
#gentoo's linbox-1.1.6-fix-undefined-symbols.patch
|
||||
@LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LIBADD = $(top_builddir)/linbox/liblinbox.la
|
||||
-@LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LDFLAGS = $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) $(LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs
|
||||
+@LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LDFLAGS = -Wl,--as-needed -L$(libdir)/atlas ../../linbox/liblinbox.la $(GIVARO_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) $(LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
--- ./interfaces/driver/Makefile.in.orig 2012-06-07 15:19:27.000000000 -0600
|
||||
+++ ./interfaces/driver/Makefile.in 2012-09-26 11:35:50.467638808 -0600
|
||||
@@ -370,7 +370,7 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
# \
|
||||
# # lb-solve.C
|
||||
-@LINBOX_COMPILE_DRIVERS_TRUE@liblbdriver_la_LDFLAGS = $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(LDFLAGS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
|
||||
+@LINBOX_COMPILE_DRIVERS_TRUE@liblbdriver_la_LDFLAGS = -Wl,--as-needed -L$(libdir)/atlas $(GIVARO_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(LDFLAGS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
|
||||
@LINBOX_COMPILE_DRIVERS_TRUE@pkginclude_HEADERS = \
|
||||
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-driver.h \
|
||||
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-blackbox-abstract.h \
|
@ -1,24 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=lrcalc
|
||||
pkgver=1.2
|
||||
pkgrel=1
|
||||
pkgdesc="Littlewood-Richardson calculator"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://math.rutgers.edu/~asbuch/lrcalc/"
|
||||
license=('GPL2')
|
||||
depends=('glibc')
|
||||
source=("http://math.rutgers.edu/~asbuch/lrcalc/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('6bba16c0cca9debccd0af847bd3d4a23')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make install DESTDIR="$pkgdir"
|
||||
}
|
@ -1,32 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
|
||||
|
||||
pkgname=m4ri
|
||||
pkgver=20140914
|
||||
pkgrel=1
|
||||
pkgdesc="Algorithms for linear algebra over F_2"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://m4ri.sagemath.org/"
|
||||
license=('GPL')
|
||||
depends=('libpng')
|
||||
source=(http://m4ri.sagemath.org/downloads/m4ri/$pkgname-$pkgver.tar.gz)
|
||||
md5sums=('91d964b6c6754499da81277433605199')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
./configure --prefix=/usr --with-openmp
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd $pkgname-$pkgver
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make install DESTDIR="$pkgdir"
|
||||
}
|
||||
|
||||
|
@ -1,31 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
|
||||
|
||||
pkgname=m4rie
|
||||
pkgver=20140914
|
||||
pkgrel=1
|
||||
pkgdesc="Algorithms for linear algebra over F_2^e"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://m4ri.sagemath.org/"
|
||||
license=('GPL')
|
||||
depends=('m4ri')
|
||||
source=(http://m4ri.sagemath.org/downloads/m4rie/$pkgname-$pkgver.tar.gz)
|
||||
md5sums=('10e9fd98efb72568ee64c6510f4cc0de')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd $pkgname-$pkgver
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make install DESTDIR="$pkgdir"
|
||||
}
|
||||
|
@ -1,69 +0,0 @@
|
||||
# $Id: PKGBUILD 150832 2012-02-23 12:01:17Z juergen $
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Ronald van Haren <ronald.archlinux.org>
|
||||
# Contributor: Damir Perisa <damir@archlinux.org>
|
||||
# Modified to compile against ecl by: maribu
|
||||
|
||||
pkgname=maxima-ecl
|
||||
_pkgname=maxima
|
||||
pkgver=5.35.1
|
||||
_eclver=15.3.7
|
||||
pkgrel=1
|
||||
pkgdesc="A sophisticated computer algebra system (compiled against ecl)"
|
||||
arch=('i686' 'x86_64')
|
||||
license=(GPL)
|
||||
url="http://maxima.sourceforge.net"
|
||||
depends=("ecl=$_eclver" texinfo)
|
||||
makedepends=(python2 emacs)
|
||||
optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
|
||||
conflicts=(maxima)
|
||||
provides=(maxima)
|
||||
options=(!zipman) # don't zip info pages or they won't work inside maxima
|
||||
install=maxima.install
|
||||
source=("http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
|
||||
"${_pkgname}.desktop" 'build-fasl.patch' 'matrixexp.patch')
|
||||
md5sums=('4bb0b999645ec2b20b7e301d36f83a4c'
|
||||
'24aa81126fbb8b726854e5a80d4c2415'
|
||||
'eb33481ea06afb97743af06ff52c099b'
|
||||
'0a1fb7bb0cfdede965252b75decc2c0d')
|
||||
|
||||
prepare() {
|
||||
cd $_pkgname-$pkgver
|
||||
|
||||
# set correct python executable to create docs
|
||||
sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
|
||||
|
||||
# build maxima ecl library
|
||||
patch -p1 -i ../build-fasl.patch
|
||||
# fix matrix exponentiation
|
||||
patch -p1 -i ../matrixexp.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $_pkgname-$pkgver
|
||||
|
||||
# set correct python executable to create docs
|
||||
sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
|
||||
|
||||
./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
|
||||
--libexecdir=/usr/lib --enable-ecl --with-default-lisp=ecl
|
||||
make -j1
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $_pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" emacsdir=/usr/share/emacs/site-lisp/maxima install
|
||||
|
||||
# install some freedesktop.org compatibility
|
||||
install -Dm644 ${srcdir}/${_pkgname}.desktop \
|
||||
$pkgdir/usr/share/applications/${_pkgname}.desktop
|
||||
|
||||
# make sure, we have a nice icon for the desktop file at the right place
|
||||
install -d $pkgdir/usr/share/pixmaps/
|
||||
ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \
|
||||
$pkgdir/usr/share/pixmaps/${_pkgname}.png
|
||||
|
||||
_ecldir="/usr/lib/ecl-$_eclver"
|
||||
mkdir -p "$pkgdir/$_ecldir"
|
||||
install src/binary-ecl/maxima.fas "$pkgdir/$_ecldir"
|
||||
}
|
@ -1,23 +0,0 @@
|
||||
Build a fasl library for ecl in addition to an executable program.
|
||||
|
||||
References:
|
||||
* http://trac.sagemath.org/ticket/16178
|
||||
* https://github.com/cschwan/sage-on-gentoo/issues/226
|
||||
* https://bugs.gentoo.org/show_bug.cgi?id=499634
|
||||
|
||||
Index: maxima-5.29.1/src/maxima.system
|
||||
===================================================================
|
||||
--- maxima-5.29.1.orig/src/maxima.system
|
||||
+++ maxima-5.29.1/src/maxima.system
|
||||
@@ -75,6 +75,11 @@
|
||||
;; Convert dir/foo.fas to dir/foo.o
|
||||
(make-pathname :type "o" :defaults p))
|
||||
files)))
|
||||
+ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
|
||||
+ :ld-flags
|
||||
+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
|
||||
+ (find-package "MAXIMA")))))
|
||||
+ (if (and x (not (string= x ""))) (list x))))
|
||||
(c::build-program "binary-ecl/maxima" :lisp-files obj
|
||||
:ld-flags
|
||||
(let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
|
@ -1,13 +0,0 @@
|
||||
--- a/share/linearalgebra/matrixexp.lisp
|
||||
+++ b/share/linearalgebra/matrixexp.lisp
|
||||
@@ -138,8 +138,8 @@
|
||||
(print `(ratvars = ,$ratvars gcd = '$gcd algebraic = ,$algebraic))
|
||||
(print `(ratfac = ,$ratfac))
|
||||
(merror "Unable to find the spectrum")))
|
||||
-
|
||||
- (setq res ($fullratsimp (ncpower (sub (mult z ($ident n)) mat) -1) z))
|
||||
+
|
||||
+ (setq res ($fullratsimp ($invert_by_lu (sub (mult z ($ident n)) mat) '$crering) z))
|
||||
(setq m (length sp))
|
||||
(dotimes (i m)
|
||||
(setq zi (nth i sp))
|
@ -1,11 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=XMaxima
|
||||
GenericName=A computer algebra system
|
||||
GenericName[de]=Computeralgebra System
|
||||
GenericName[it]=algebra a livello avanzato
|
||||
Comment=A sophisticated computer algebra system
|
||||
Exec=xmaxima
|
||||
Icon=maxima
|
||||
Terminal=true
|
||||
Type=Application
|
||||
Categories=Science;Math;
|
@ -1,18 +0,0 @@
|
||||
infodir=/usr/share/info
|
||||
filelist=(imaxima.info maxima.info xmaxima.info)
|
||||
|
||||
post_install() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
@ -1,69 +0,0 @@
|
||||
# $Id: PKGBUILD 150832 2012-02-23 12:01:17Z juergen $
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Ronald van Haren <ronald.archlinux.org>
|
||||
# Contributor: Damir Perisa <damir@archlinux.org>
|
||||
# Modified to compile against ecl by: maribu
|
||||
|
||||
pkgname=maxima-ecl
|
||||
_pkgname=maxima
|
||||
pkgver=5.35.1
|
||||
_eclver=13.5.1
|
||||
pkgrel=3
|
||||
pkgdesc="A sophisticated computer algebra system (compiled against ecl)"
|
||||
arch=('i686' 'x86_64')
|
||||
license=(GPL)
|
||||
url="http://maxima.sourceforge.net"
|
||||
depends=("ecl=$_eclver" texinfo)
|
||||
makedepends=(python2 emacs)
|
||||
optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
|
||||
conflicts=(maxima)
|
||||
provides=(maxima)
|
||||
options=(!zipman) # don't zip info pages or they won't work inside maxima
|
||||
install=maxima.install
|
||||
source=("http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
|
||||
"${_pkgname}.desktop" 'build-fasl.patch' 'matrixexp.patch')
|
||||
md5sums=('4bb0b999645ec2b20b7e301d36f83a4c'
|
||||
'24aa81126fbb8b726854e5a80d4c2415'
|
||||
'eb33481ea06afb97743af06ff52c099b'
|
||||
'0a1fb7bb0cfdede965252b75decc2c0d')
|
||||
|
||||
prepare() {
|
||||
cd $_pkgname-$pkgver
|
||||
|
||||
# set correct python executable to create docs
|
||||
sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
|
||||
|
||||
# build maxima ecl library
|
||||
patch -p1 -i ../build-fasl.patch
|
||||
# fix matrix exponentiation
|
||||
patch -p1 -i ../matrixexp.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $_pkgname-$pkgver
|
||||
|
||||
# set correct python executable to create docs
|
||||
sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
|
||||
|
||||
./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
|
||||
--libexecdir=/usr/lib --enable-ecl --with-default-lisp=ecl
|
||||
make -j1
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $_pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" emacsdir=/usr/share/emacs/site-lisp/maxima install
|
||||
|
||||
# install some freedesktop.org compatibility
|
||||
install -Dm644 ${srcdir}/${_pkgname}.desktop \
|
||||
$pkgdir/usr/share/applications/${_pkgname}.desktop
|
||||
|
||||
# make sure, we have a nice icon for the desktop file at the right place
|
||||
install -d $pkgdir/usr/share/pixmaps/
|
||||
ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \
|
||||
$pkgdir/usr/share/pixmaps/${_pkgname}.png
|
||||
|
||||
_ecldir="/usr/lib/ecl-$_eclver"
|
||||
mkdir -p "$pkgdir/$_ecldir"
|
||||
install src/binary-ecl/maxima.fas "$pkgdir/$_ecldir"
|
||||
}
|
@ -1,23 +0,0 @@
|
||||
Build a fasl library for ecl in addition to an executable program.
|
||||
|
||||
References:
|
||||
* http://trac.sagemath.org/ticket/16178
|
||||
* https://github.com/cschwan/sage-on-gentoo/issues/226
|
||||
* https://bugs.gentoo.org/show_bug.cgi?id=499634
|
||||
|
||||
Index: maxima-5.29.1/src/maxima.system
|
||||
===================================================================
|
||||
--- maxima-5.29.1.orig/src/maxima.system
|
||||
+++ maxima-5.29.1/src/maxima.system
|
||||
@@ -75,6 +75,11 @@
|
||||
;; Convert dir/foo.fas to dir/foo.o
|
||||
(make-pathname :type "o" :defaults p))
|
||||
files)))
|
||||
+ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
|
||||
+ :ld-flags
|
||||
+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
|
||||
+ (find-package "MAXIMA")))))
|
||||
+ (if (and x (not (string= x ""))) (list x))))
|
||||
(c::build-program "binary-ecl/maxima" :lisp-files obj
|
||||
:ld-flags
|
||||
(let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
|
@ -1,13 +0,0 @@
|
||||
--- a/share/linearalgebra/matrixexp.lisp
|
||||
+++ b/share/linearalgebra/matrixexp.lisp
|
||||
@@ -138,8 +138,8 @@
|
||||
(print `(ratvars = ,$ratvars gcd = '$gcd algebraic = ,$algebraic))
|
||||
(print `(ratfac = ,$ratfac))
|
||||
(merror "Unable to find the spectrum")))
|
||||
-
|
||||
- (setq res ($fullratsimp (ncpower (sub (mult z ($ident n)) mat) -1) z))
|
||||
+
|
||||
+ (setq res ($fullratsimp ($invert_by_lu (sub (mult z ($ident n)) mat) '$crering) z))
|
||||
(setq m (length sp))
|
||||
(dotimes (i m)
|
||||
(setq zi (nth i sp))
|
@ -1,11 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=XMaxima
|
||||
GenericName=A computer algebra system
|
||||
GenericName[de]=Computeralgebra System
|
||||
GenericName[it]=algebra a livello avanzato
|
||||
Comment=A sophisticated computer algebra system
|
||||
Exec=xmaxima
|
||||
Icon=maxima
|
||||
Terminal=true
|
||||
Type=Application
|
||||
Categories=Science;Math;
|
@ -1,18 +0,0 @@
|
||||
infodir=/usr/share/info
|
||||
filelist=(imaxima.info maxima.info xmaxima.info)
|
||||
|
||||
post_install() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
@ -1,69 +0,0 @@
|
||||
# $Id: PKGBUILD 150832 2012-02-23 12:01:17Z juergen $
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Ronald van Haren <ronald.archlinux.org>
|
||||
# Contributor: Damir Perisa <damir@archlinux.org>
|
||||
# Modified to compile against ecl by: maribu
|
||||
|
||||
pkgname=maxima-ecl
|
||||
_pkgname=maxima
|
||||
pkgver=5.35.1
|
||||
_eclver=13.5.1
|
||||
pkgrel=3
|
||||
pkgdesc="A sophisticated computer algebra system (compiled against ecl)"
|
||||
arch=('i686' 'x86_64')
|
||||
license=(GPL)
|
||||
url="http://maxima.sourceforge.net"
|
||||
depends=("ecl=$_eclver" texinfo)
|
||||
makedepends=(python2 emacs)
|
||||
optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
|
||||
conflicts=(maxima)
|
||||
provides=(maxima)
|
||||
options=(!zipman) # don't zip info pages or they won't work inside maxima
|
||||
install=maxima.install
|
||||
source=("http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
|
||||
"${_pkgname}.desktop" 'build-fasl.patch' 'matrixexp.patch')
|
||||
md5sums=('4bb0b999645ec2b20b7e301d36f83a4c'
|
||||
'24aa81126fbb8b726854e5a80d4c2415'
|
||||
'eb33481ea06afb97743af06ff52c099b'
|
||||
'0a1fb7bb0cfdede965252b75decc2c0d')
|
||||
|
||||
prepare() {
|
||||
cd $_pkgname-$pkgver
|
||||
|
||||
# set correct python executable to create docs
|
||||
sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
|
||||
|
||||
# build maxima ecl library
|
||||
patch -p1 -i ../build-fasl.patch
|
||||
# fix matrix exponentiation
|
||||
patch -p1 -i ../matrixexp.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $_pkgname-$pkgver
|
||||
|
||||
# set correct python executable to create docs
|
||||
sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
|
||||
|
||||
./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
|
||||
--libexecdir=/usr/lib --enable-ecl --with-default-lisp=ecl
|
||||
make -j1
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $_pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" emacsdir=/usr/share/emacs/site-lisp/maxima install
|
||||
|
||||
# install some freedesktop.org compatibility
|
||||
install -Dm644 ${srcdir}/${_pkgname}.desktop \
|
||||
$pkgdir/usr/share/applications/${_pkgname}.desktop
|
||||
|
||||
# make sure, we have a nice icon for the desktop file at the right place
|
||||
install -d $pkgdir/usr/share/pixmaps/
|
||||
ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \
|
||||
$pkgdir/usr/share/pixmaps/${_pkgname}.png
|
||||
|
||||
_ecldir="/usr/lib/ecl-$_eclver"
|
||||
mkdir -p "$pkgdir/$_ecldir"
|
||||
install src/binary-ecl/maxima.fas "$pkgdir/$_ecldir"
|
||||
}
|
@ -1,23 +0,0 @@
|
||||
Build a fasl library for ecl in addition to an executable program.
|
||||
|
||||
References:
|
||||
* http://trac.sagemath.org/ticket/16178
|
||||
* https://github.com/cschwan/sage-on-gentoo/issues/226
|
||||
* https://bugs.gentoo.org/show_bug.cgi?id=499634
|
||||
|
||||
Index: maxima-5.29.1/src/maxima.system
|
||||
===================================================================
|
||||
--- maxima-5.29.1.orig/src/maxima.system
|
||||
+++ maxima-5.29.1/src/maxima.system
|
||||
@@ -75,6 +75,11 @@
|
||||
;; Convert dir/foo.fas to dir/foo.o
|
||||
(make-pathname :type "o" :defaults p))
|
||||
files)))
|
||||
+ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
|
||||
+ :ld-flags
|
||||
+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
|
||||
+ (find-package "MAXIMA")))))
|
||||
+ (if (and x (not (string= x ""))) (list x))))
|
||||
(c::build-program "binary-ecl/maxima" :lisp-files obj
|
||||
:ld-flags
|
||||
(let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
|
@ -1,13 +0,0 @@
|
||||
--- a/share/linearalgebra/matrixexp.lisp
|
||||
+++ b/share/linearalgebra/matrixexp.lisp
|
||||
@@ -138,8 +138,8 @@
|
||||
(print `(ratvars = ,$ratvars gcd = '$gcd algebraic = ,$algebraic))
|
||||
(print `(ratfac = ,$ratfac))
|
||||
(merror "Unable to find the spectrum")))
|
||||
-
|
||||
- (setq res ($fullratsimp (ncpower (sub (mult z ($ident n)) mat) -1) z))
|
||||
+
|
||||
+ (setq res ($fullratsimp ($invert_by_lu (sub (mult z ($ident n)) mat) '$crering) z))
|
||||
(setq m (length sp))
|
||||
(dotimes (i m)
|
||||
(setq zi (nth i sp))
|
@ -1,11 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=XMaxima
|
||||
GenericName=A computer algebra system
|
||||
GenericName[de]=Computeralgebra System
|
||||
GenericName[it]=algebra a livello avanzato
|
||||
Comment=A sophisticated computer algebra system
|
||||
Exec=xmaxima
|
||||
Icon=maxima
|
||||
Terminal=true
|
||||
Type=Application
|
||||
Categories=Science;Math;
|
@ -1,18 +0,0 @@
|
||||
infodir=/usr/share/info
|
||||
filelist=(imaxima.info maxima.info xmaxima.info)
|
||||
|
||||
post_install() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
@ -1,26 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <remy@archlinux.org>
|
||||
|
||||
pkgname=mpfi
|
||||
pkgver=1.5.1
|
||||
pkgrel=1
|
||||
pkgdesc="C library for interval arithmetic"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://perso.ens-lyon.fr/nathalie.revol/software.html"
|
||||
license=('GPL')
|
||||
depends=('mpfr')
|
||||
source=("https://gforge.inria.fr/frs/download.php/file/30130/mpfi-1.5.1.tar.gz")
|
||||
md5sums=('2787d2fab9ba7fc5b171758e84892fb5')
|
||||
install=mpfi.install
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
./configure --prefix=/usr --enable-shared
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
@ -1,17 +0,0 @@
|
||||
info_dir=usr/share/info
|
||||
|
||||
post_install() {
|
||||
install-info ${info_dir}/mpfi.info.gz ${info_dir}/dir
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
install-info --delete ${info_dir}/mpfi.info.gz ${info_dir}/dir
|
||||
}
|
||||
|
||||
pre_upgrade() {
|
||||
pre_remove
|
||||
}
|
39
ntl/PKGBUILD
39
ntl/PKGBUILD
@ -1,39 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Brad Conte <brad AT bradconte.com>
|
||||
|
||||
pkgname=ntl
|
||||
pkgver=8.1.2
|
||||
pkgrel=1
|
||||
pkgdesc="A Library for doing Number Theory"
|
||||
arch=(i686 x86_64)
|
||||
url="http://www.shoup.net/ntl/"
|
||||
license=(GPL)
|
||||
depends=(gf2x gmp)
|
||||
makedepends=()
|
||||
options=(!libtool)
|
||||
source=("http://www.shoup.net/$pkgname/$pkgname-$pkgver.tar.gz" 'ntl-sage.patch')
|
||||
md5sums=('93f36123ac008db31c1031498a9b1e81'
|
||||
'4cb5f97080281109bf358959ab993691')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
patch -p0 -i $srcdir/ntl-sage.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver/src
|
||||
./configure DEF_PREFIX=/usr SHARED=on NTL_GF2X_LIB=on NTL_GMP_LIP=on
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd $pkgname-$pkgver/src
|
||||
make -k check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver/src
|
||||
make PREFIX="$pkgdir/usr" install
|
||||
}
|
||||
|
@ -1,52 +0,0 @@
|
||||
--- ./include/NTL/tools.h.orig 2015-01-09 06:58:19.000000000 -0700
|
||||
+++ ./include/NTL/tools.h 2015-01-12 20:00:00.000000000 -0700
|
||||
@@ -406,7 +406,12 @@ void swap(WrappedPtr<T,Deleter>& x, Wrap
|
||||
|
||||
// Error Handling
|
||||
|
||||
-
|
||||
+/*
|
||||
+ This function is not present in vanilla NTL.
|
||||
+ See tools.c for documentation.
|
||||
+ */
|
||||
+void SetErrorCallbackFunction(void (*func)(const char *s, void *context),
|
||||
+ void *context);
|
||||
|
||||
class ErrorObject : public NTL_SNS runtime_error {
|
||||
public:
|
||||
--- ./src/tools.c.orig 2015-01-09 06:58:19.000000000 -0700
|
||||
+++ ./src/tools.c 2015-01-12 20:00:00.000000000 -0700
|
||||
@@ -17,9 +17,33 @@ NTL_START_IMPL
|
||||
|
||||
NTL_THREAD_LOCAL void (*ErrorCallback)() = 0;
|
||||
|
||||
+/*
|
||||
+ The following code differs from vanilla NTL.
|
||||
+
|
||||
+ We add a SetErrorCallbackFunction(). This sets a global callback function
|
||||
+ _function_, which gets called with parameter _context_ and an error
|
||||
+ message string whenever Error() gets called.
|
||||
+
|
||||
+ Note that if the custom error handler *returns*, then NTL will dump the
|
||||
+ error message back to stderr and abort() as it habitually does.
|
||||
+
|
||||
+ -- David Harvey (2008-04-12)
|
||||
+*/
|
||||
+
|
||||
+void (*ErrorCallbackFunction)(const char*, void*) = NULL;
|
||||
+void *ErrorCallbackContext = NULL;
|
||||
+
|
||||
+void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context)
|
||||
+{
|
||||
+ ErrorCallbackFunction = function;
|
||||
+ ErrorCallbackContext = context;
|
||||
+}
|
||||
|
||||
void TerminalError(const char *s)
|
||||
{
|
||||
+ if (ErrorCallbackFunction != NULL)
|
||||
+ ErrorCallbackFunction(s, ErrorCallbackContext);
|
||||
+
|
||||
cerr << s << "\n";
|
||||
_ntl_abort();
|
||||
}
|
@ -1,40 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=palp
|
||||
pkgver=2.1
|
||||
pkgrel=1
|
||||
pkgdesc="A Package for analyzing Lattice Polytopes"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"
|
||||
license=('GPL3')
|
||||
depends=('glibc')
|
||||
source=("http://hep.itp.tuwien.ac.at/~kreuzer/CY/$pkgname/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('f3791acd2e60846cb63bc98e87ad7509')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
mkdir bin
|
||||
mv Global.h Global.h-template
|
||||
for dim in 4 5 6 11; do
|
||||
sed "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax $dim/" Global.h-template > Global.h
|
||||
make
|
||||
for file in poly class cws nef mori; do
|
||||
mv ${file}.x bin/${file}-${dim}d.x
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
mkdir -p "$pkgdir"/usr/bin
|
||||
pushd bin
|
||||
for exe in *.x; do
|
||||
install -m 755 $exe "$pkgdir"/usr/bin
|
||||
done
|
||||
popd
|
||||
for file in poly class cws nef mori; do
|
||||
ln -sf ${file}-6d.x "$pkgdir"/usr/bin/${file}.x
|
||||
done
|
||||
}
|
||||
|
@ -1,39 +0,0 @@
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=palp
|
||||
pkgver=2.1
|
||||
pkgrel=1
|
||||
pkgdesc="A Package for analyzing Lattice Polytopes"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"
|
||||
license=('GPL3')
|
||||
depends=('glibc')
|
||||
source=("http://hep.itp.tuwien.ac.at/~kreuzer/CY/$pkgname/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('f3791acd2e60846cb63bc98e87ad7509')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
mkdir bin
|
||||
mv Global.h Global.h-template
|
||||
for dim in 4 5 6 11; do
|
||||
sed "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax $dim/" Global.h-template > Global.h
|
||||
make
|
||||
for file in poly class cws nef mori; do
|
||||
mv ${file}.x bin/${file}-${dim}d.x
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
mkdir -p "$pkgdir"/usr/bin
|
||||
pushd bin
|
||||
for exe in *.x; do
|
||||
install -m 755 $exe "$pkgdir"/usr/bin
|
||||
done
|
||||
popd
|
||||
for file in poly class cws nef mori; do
|
||||
ln -sf ${file}-6d.x "$pkgdir"/usr/bin/${file}.x
|
||||
done
|
||||
}
|
||||
|
@ -1,39 +0,0 @@
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=palp
|
||||
pkgver=2.1
|
||||
pkgrel=1
|
||||
pkgdesc="A Package for analyzing Lattice Polytopes"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"
|
||||
license=('GPL3')
|
||||
depends=('glibc')
|
||||
source=("http://hep.itp.tuwien.ac.at/~kreuzer/CY/$pkgname/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('f3791acd2e60846cb63bc98e87ad7509')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
mkdir bin
|
||||
mv Global.h Global.h-template
|
||||
for dim in 4 5 6 11; do
|
||||
sed "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax $dim/" Global.h-template > Global.h
|
||||
make
|
||||
for file in poly class cws nef mori; do
|
||||
mv ${file}.x bin/${file}-${dim}d.x
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
mkdir -p "$pkgdir"/usr/bin
|
||||
pushd bin
|
||||
for exe in *.x; do
|
||||
install -m 755 $exe "$pkgdir"/usr/bin
|
||||
done
|
||||
popd
|
||||
for file in poly class cws nef mori; do
|
||||
ln -sf ${file}-6d.x "$pkgdir"/usr/bin/${file}.x
|
||||
done
|
||||
}
|
||||
|
@ -1,19 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=pari-galdata
|
||||
pkgver=20080411
|
||||
pkgrel=1
|
||||
pkgdesc="PARI database needed to compute Galois group in degrees 8 through 11"
|
||||
arch=('any')
|
||||
url="http://pari.math.u-bordeaux.fr/"
|
||||
license=('GPL')
|
||||
depends=('pari')
|
||||
makedepends=()
|
||||
source=("http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz")
|
||||
md5sums=('f9f61b2930757a785b568e5d307a7d75')
|
||||
|
||||
package() {
|
||||
mkdir -p "$pkgdir"/usr/share/pari
|
||||
mv data/galdata "$pkgdir"/usr/share/pari
|
||||
}
|
@ -1,19 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=pari-seadata-small
|
||||
pkgver=20090618
|
||||
pkgrel=1
|
||||
pkgdesc="PARI database needed by ellap for large primes"
|
||||
arch=('any')
|
||||
url="http://pari.math.u-bordeaux.fr/"
|
||||
license=('GPL')
|
||||
depends=('pari')
|
||||
makedepends=()
|
||||
source=("http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata-small.tgz")
|
||||
md5sums=('705b51f147872895a7307ed4e57f55f2')
|
||||
|
||||
package() {
|
||||
mkdir -p "$pkgdir"/usr/share/pari
|
||||
mv data/seadata "$pkgdir"/usr/share/pari
|
||||
}
|
@ -1,45 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
|
||||
|
||||
pkgname=pari
|
||||
pkgver=2.7.3
|
||||
pkgrel=1
|
||||
pkgdesc='Computer algebra system designed for fast computations in number theory'
|
||||
url='http://pari.math.u-bordeaux.fr/'
|
||||
license=('GPL')
|
||||
arch=('i686' 'x86_64')
|
||||
depends=('gmp' 'readline' 'libx11')
|
||||
makedepends=('perl' 'texlive-core')
|
||||
optdepends=('perl: gphelp, tex2mail')
|
||||
source=("http://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${pkgver}.tar.gz"
|
||||
'err_handle.patch')
|
||||
sha1sums=('fa01d548839301958564a2bec39928ba3c9c9d39'
|
||||
'182066ab765eddb0b7fd98b441c158304545f5ec')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
sed 's/\$addlib64//g' -i config/get_libpth
|
||||
patch -p1 -i ../err_handle.patch # sage-5.6 uses this¸ from upstream trunk
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
./Configure \
|
||||
--prefix=/usr \
|
||||
--with-readline \
|
||||
--mt=pthread \
|
||||
--with-gmp \
|
||||
|
||||
make all
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make bench
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
ln -sf gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1
|
||||
}
|
@ -1,105 +0,0 @@
|
||||
Add cb_pari_err_handle() callback
|
||||
|
||||
Backported from upstream commits
|
||||
e9e659dc9ecb5ca6a8296c7922528a4ecbb89cb0
|
||||
26a7ae0f42918407febe9901ded41faf26ef43a6
|
||||
|
||||
diff -ru src/src/headers/paricom.h b/src/headers/paricom.h
|
||||
--- src/src/headers/paricom.h 2014-03-25 09:59:21.000000000 +0100
|
||||
+++ b/src/headers/paricom.h 2015-01-13 19:41:47.430885048 +0100
|
||||
@@ -81,6 +81,7 @@
|
||||
extern int (*cb_pari_whatnow)(PariOUT *out, const char *, int);
|
||||
extern void (*cb_pari_sigint)(void);
|
||||
extern int (*cb_pari_handle_exception)(long);
|
||||
+extern int (*cb_pari_err_handle)(GEN);
|
||||
extern void (*cb_pari_pre_recover)(long);
|
||||
extern void (*cb_pari_err_recover)(long);
|
||||
extern const char *pari_library_path;
|
||||
diff -ru src/src/language/init.c b/src/language/init.c
|
||||
--- src/src/language/init.c 2015-01-13 19:40:30.643622993 +0100
|
||||
+++ b/src/language/init.c 2015-01-13 19:41:47.431884833 +0100
|
||||
@@ -87,6 +87,7 @@
|
||||
|
||||
void (*cb_pari_ask_confirm)(const char *);
|
||||
int (*cb_pari_handle_exception)(long);
|
||||
+int (*cb_pari_err_handle)(GEN);
|
||||
int (*cb_pari_whatnow)(PariOUT *out, const char *, int);
|
||||
void (*cb_pari_sigint)(void);
|
||||
void (*cb_pari_pre_recover)(long);
|
||||
@@ -732,6 +733,8 @@
|
||||
static void
|
||||
dflt_err_recover(long errnum) { (void) errnum; pari_exit(); }
|
||||
|
||||
+static int pari_err_display(GEN err);
|
||||
+
|
||||
/* initialize PARI data. Initialize [new|old]fun to NULL for default set. */
|
||||
void
|
||||
pari_init_opts(size_t parisize, ulong maxprime, ulong init_opts)
|
||||
@@ -739,6 +742,8 @@
|
||||
ulong u;
|
||||
|
||||
cb_pari_whatnow = NULL;
|
||||
+ cb_pari_handle_exception = NULL;
|
||||
+ cb_pari_err_handle = pari_err_display;
|
||||
cb_pari_pre_recover = NULL;
|
||||
cb_pari_sigint = dflt_sigint_fun;
|
||||
if (init_opts&INIT_JMPm) cb_pari_err_recover = dflt_err_recover;
|
||||
@@ -887,9 +892,6 @@
|
||||
evalstate_reset();
|
||||
killallfiles();
|
||||
pari_init_errcatch();
|
||||
- out_puts(pariErr, "\n");
|
||||
- pariErr->flush();
|
||||
-
|
||||
cb_pari_err_recover(numerr);
|
||||
}
|
||||
|
||||
@@ -1266,21 +1268,22 @@
|
||||
return NULL; /*NOT REACHED*/
|
||||
}
|
||||
|
||||
-static void
|
||||
+static int
|
||||
pari_err_display(GEN err)
|
||||
{
|
||||
long numerr=err_get_num(err);
|
||||
+ err_init();
|
||||
if (numerr==e_SYNTAX)
|
||||
{
|
||||
const char *msg = GSTR(gel(err,2));
|
||||
const char *s = (const char *) gmael(err,3,1);
|
||||
const char *entry = (const char *) gmael(err,3,2);
|
||||
print_errcontext(pariErr, msg, s, entry);
|
||||
- return;
|
||||
}
|
||||
else
|
||||
{
|
||||
char *s = pari_err2str(err);
|
||||
+ closure_err(0);
|
||||
err_init_msg(numerr, e_USER);
|
||||
pariErr->puts(s);
|
||||
if (numerr==e_NOTFUNC)
|
||||
@@ -1295,6 +1298,8 @@
|
||||
}
|
||||
pari_free(s);
|
||||
}
|
||||
+ out_term_color(pariErr, c_NONE);
|
||||
+ pariErr->flush(); return 0;
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1315,12 +1320,9 @@
|
||||
global_err_data = E;
|
||||
if (*iferr_env) longjmp(*iferr_env, numerr);
|
||||
mt_err_recover(numerr);
|
||||
- err_init();
|
||||
- if (numerr != e_SYNTAX) closure_err(0);
|
||||
- pari_err_display(E);
|
||||
- out_term_color(pariErr, c_NONE);
|
||||
va_end(ap);
|
||||
- pariErr->flush();
|
||||
+ if (cb_pari_err_handle &&
|
||||
+ cb_pari_err_handle(E)) return;
|
||||
if (cb_pari_handle_exception &&
|
||||
cb_pari_handle_exception(numerr)) return;
|
||||
err_recover(numerr);
|
@ -1,32 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
|
||||
|
||||
pkgname=polybori
|
||||
pkgver=0.8.3
|
||||
pkgrel=1
|
||||
pkgdesc="Library for polynomials over boolean rings"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://polybori.sourceforge.net/"
|
||||
license=('GPL')
|
||||
depends=('boost-libs' 'python2' 'm4ri')
|
||||
makedepends=('boost' 'scons')
|
||||
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('0999722a019c4ee5835a115e76a1dfd6')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
scons prepare-install PYTHON=python2
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
scons install install-headers \
|
||||
PYTHON=python2 \
|
||||
PREFIX="$pkgdir"/usr \
|
||||
PYINSTALLPREFIX="$pkgdir"/usr/lib/python2.7/site-packages \
|
||||
MANDIR="$pkgdir"/usr/share/man
|
||||
}
|
||||
|
@ -1,27 +0,0 @@
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
|
||||
|
||||
pkgname=polybori
|
||||
pkgver=0.8.3
|
||||
pkgrel=1
|
||||
pkgdesc="Library for polynomials over boolean rings"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://polybori.sourceforge.net/"
|
||||
license=('GPL')
|
||||
depends=('boost-libs' 'python2' 'm4ri')
|
||||
makedepends=('boost' 'scons')
|
||||
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('0999722a019c4ee5835a115e76a1dfd6')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
scons prepare-install PYTHON=python2
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
scons install install-headers PYTHON=python2 PREFIX="$pkgdir"/usr PYINSTALLPREFIX="$pkgdir"/usr/lib/python2.7/site-packages MANDIR="$pkgdir"/usr/share/man
|
||||
}
|
||||
|
@ -1,27 +0,0 @@
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
|
||||
|
||||
pkgname=polybori
|
||||
pkgver=0.8.3
|
||||
pkgrel=1
|
||||
pkgdesc="Library for polynomials over boolean rings"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://polybori.sourceforge.net/"
|
||||
license=('GPL')
|
||||
depends=('boost-libs' 'python2' 'm4ri')
|
||||
makedepends=('boost' 'scons')
|
||||
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('0999722a019c4ee5835a115e76a1dfd6')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
scons prepare-install PYTHON=python2
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
scons install install-headers PYTHON=python2 PREFIX="$pkgdir"/usr PYINSTALLPREFIX="$pkgdir"/usr/lib/python2.7/site-packages MANDIR="$pkgdir"/usr/share/man
|
||||
}
|
||||
|
@ -1,28 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
|
||||
|
||||
pkgname=pynac
|
||||
pkgver=0.3.2
|
||||
pkgrel=1
|
||||
pkgdesc="Python version of GiNaC, a C++ library for symbolic mathematical calculations"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://pynac.org"
|
||||
license=('GPL')
|
||||
depends=('python2')
|
||||
#source=("http://pynac.org/download/$pkgname-$pkgver.tar.bz2")
|
||||
source=("http://www.sagemath.org/packages/upstream/pynac/$pkgname-$pkgver.tar.bz2")
|
||||
md5sums=('70fae63e2c1cb4ec13eea24a4a780ba8')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
export PYTHON_VERSION=2
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
@ -1,59 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Felix Yan <felixonmars@archlinux.org>
|
||||
# Contributor: Marti Raudsepp <marti@juffo.org>
|
||||
# Contributor: Florijan Hamzic <florijanh@gmail.com>
|
||||
|
||||
pkgbase=python-cairocffi
|
||||
pkgname=(python3-cairocffi python2-cairocffi)
|
||||
pkgver=0.6
|
||||
pkgrel=1
|
||||
pkgdesc="cairocffi is a CFFI-based drop-in replacement for Pycairo, a set of Python bindings and object-oriented API for cairo."
|
||||
arch=('any')
|
||||
url="http://pythonhosted.org/cairocffi/"
|
||||
license=('BSD')
|
||||
makedepends=('python3-cffi' 'python2-cffi' 'python3-setuptools' 'python2-setuptools' 'cairo' 'gdk-pixbuf2')
|
||||
checkdepends=('python3-pytest' 'python2-pytest' 'python3-xcffib' 'python2-xcffib')
|
||||
source=("$pkgbase-$pkgver.tar.gz::https://github.com/SimonSapin/cairocffi/archive/v${pkgver}.tar.gz")
|
||||
md5sums=('4748b086d414e8e6b43b40e22b738f2c')
|
||||
|
||||
prepare() {
|
||||
cp -a cairocffi-$pkgver{,-py2}
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/cairocffi-$pkgver"
|
||||
python3 setup.py build
|
||||
|
||||
cd "$srcdir/cairocffi-$pkgver-py2"
|
||||
python2 setup.py build
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "$srcdir/cairocffi-$pkgver/cairocffi"
|
||||
LC_CTYPE=en_US.utf8 py.test || warning "Tests failed"
|
||||
|
||||
cd "$srcdir/cairocffi-$pkgver-py2/cairocffi"
|
||||
LC_CTYPE=en_US.utf8 py.test2 || warning "Tests failed"
|
||||
}
|
||||
|
||||
package_python3-cairocffi() {
|
||||
depends=('python3-cffi' 'cairo')
|
||||
optdepends=('python3-xcffib: for xcb support'
|
||||
'gdk-pixbuf2: for cairocffi.pixbuf')
|
||||
|
||||
cd "$srcdir/cairocffi-$pkgver"
|
||||
python3 setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build
|
||||
|
||||
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
||||
|
||||
package_python2-cairocffi() {
|
||||
depends=('python2-cffi' 'cairo')
|
||||
optdepends=('python2-xcffib: for xcb support'
|
||||
'gdk-pixbuf2: for cairocffi.pixbuf')
|
||||
|
||||
cd "$srcdir/cairocffi-$pkgver-py2"
|
||||
python2 setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build
|
||||
|
||||
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
@ -1,59 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
|
||||
# Contributor: BinkyTheClown <binky_at_archlinux_dot_us>
|
||||
# Contributor: Julien Ugon <bzklrm at gmail dot com>
|
||||
# Contributor: Lex Black <autumn-wind at web dot de>
|
||||
# Contributor: Gustavao A. Gomez Farhat <gustavo_gomez_farhat_at_gmail_dot_com>
|
||||
|
||||
pkgbase=python3-cvxopt
|
||||
pkgname=('python2-cvxopt' 'python3-cvxopt')
|
||||
pkgver=1.1.7
|
||||
pkgrel=1
|
||||
pkgdesc="A free software package for convex optimization written in Python"
|
||||
url="http://cvxopt.org/"
|
||||
arch=('x86_64' 'i686')
|
||||
license=('GPL3')
|
||||
makedepends=('gsl fftw glpk dsdp python python2 lapack')
|
||||
optdepends=('gsl: for custom random number generators'
|
||||
'fftw: for FFTW interface'
|
||||
'glpk: solver for linear cone and PWL programming problems'
|
||||
'dsdp: solver for linear cone semidefinite programming problems')
|
||||
source=("$pkgbase-$pkgver.tar.gz::https://github.com/cvxopt/cvxopt/archive/${pkgver}.tar.gz")
|
||||
sha1sums=('199ae22f7175be8e46b277993eea7c39e30da1f1')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir"
|
||||
cp -a cvxopt-${pkgver} cvxopt-py2-${pkgver}
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir"/cvxopt-$pkgver
|
||||
|
||||
for lib in GSL FFTW GLPK DSDP; do
|
||||
eval "export $'CVXOPT_BUILD_$lib'=1"
|
||||
done
|
||||
|
||||
msg "Building Python2"
|
||||
cd "$srcdir"/cvxopt-py2-${pkgver}
|
||||
python2 setup.py build
|
||||
|
||||
msg "Building Python3"
|
||||
cd "$srcdir"/cvxopt-${pkgver}
|
||||
python setup.py build
|
||||
}
|
||||
|
||||
package_python2-cvxopt() {
|
||||
depends=("python2" "lapack")
|
||||
|
||||
cd "$srcdir"/cvxopt-py2-${pkgver}
|
||||
|
||||
python2 setup.py install --skip-build --root="$pkgdir" --optimize=1
|
||||
}
|
||||
|
||||
package_python3-cvxopt() {
|
||||
depends=("python" "lapack")
|
||||
|
||||
cd "$srcdir"/cvxopt-${pkgver}
|
||||
|
||||
python setup.py install --skip-build --root="$pkgdir" --optimize=1
|
||||
}
|
@ -1,48 +0,0 @@
|
||||
#/Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
|
||||
#Contributor: lilydjwg <lilydjwg@gmail.com>
|
||||
|
||||
pkgbase=python3-dateutil
|
||||
pkgname=('python3-dateutil' 'python2-dateutil')
|
||||
pkgver=2.4.1
|
||||
pkgrel=1
|
||||
pkgdesc="Provides powerful extensions to the standard datetime module"
|
||||
arch=('any')
|
||||
license=('custom')
|
||||
url="https://github.com/dateutil/dateutil"
|
||||
makedepends=('python3-setuptools' 'python2-setuptools' 'python3-six' 'python2-six')
|
||||
source=("$pkgbase-$pkgver.tar.gz"::https://github.com/dateutil/dateutil/archive/2.4.1.tar.gz)
|
||||
#source=(http://pypi.python.org/packages/source/p/python3-dateutil/python3-dateutil-$pkgver.tar.gz)
|
||||
md5sums=('41972da724ee35eeb26cfb9e9600ad51')
|
||||
|
||||
build() {
|
||||
# Required for unittests
|
||||
cd dateutil-$pkgver
|
||||
./updatezinfo.py
|
||||
|
||||
cd $srcdir
|
||||
cp -r dateutil-$pkgver python2-dateutil-$pkgver
|
||||
}
|
||||
|
||||
package_python3-dateutil()
|
||||
{
|
||||
depends=('python3-six')
|
||||
cd dateutil-$pkgver
|
||||
python3 setup.py install --root=$pkgdir --optimize=1
|
||||
install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
|
||||
}
|
||||
|
||||
package_python2-dateutil()
|
||||
{
|
||||
depends=('python2-six')
|
||||
cd $srcdir/python2-dateutil-$pkgver
|
||||
python2 setup.py install --root=$pkgdir --optimize=1
|
||||
install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
|
||||
}
|
||||
|
||||
check() {
|
||||
cd dateutil-$pkgver
|
||||
python3 setup.py test
|
||||
|
||||
cd $srcdir/python2-dateutil-$pkgver
|
||||
python2 setup.py test
|
||||
}
|
@ -1,26 +0,0 @@
|
||||
Copyright (c) 2007, Michele Simionato
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
|
||||
Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
Redistributions in bytecode form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in
|
||||
the documentation and/or other materials provided with the
|
||||
distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
|
||||
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
|
||||
DAMAGE.
|
@ -1,49 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Thomas Dziedzic < gostrc at gmail >
|
||||
# Contributor: Pierre Chapuis <catwell at archlinux dot us>
|
||||
|
||||
pkgname=('python3-decorator' 'python2-decorator')
|
||||
pkgver=3.4.0
|
||||
pkgrel=1
|
||||
pkgdesc='Python Decorator module'
|
||||
arch=('any')
|
||||
url='http://pypi.python.org/pypi/decorator'
|
||||
license=('BSD')
|
||||
makedepends=('python2' 'python' 'python3-setuptools')
|
||||
source=("http://pypi.python.org/packages/source/d/decorator/decorator-${pkgver}.tar.gz"
|
||||
'LICENSE.txt')
|
||||
md5sums=('1e8756f719d746e2fc0dd28b41251356'
|
||||
'0ca76d2c707f09dbb04acc425ea1a08b')
|
||||
|
||||
build() {
|
||||
# Make python and python2 builds possible
|
||||
cp -r decorator-$pkgver decorator2-$pkgver
|
||||
|
||||
cd "$srcdir/decorator-$pkgver"
|
||||
|
||||
python3 setup.py build
|
||||
|
||||
cd "$srcdir/decorator2-$pkgver"
|
||||
|
||||
python2 setup.py build
|
||||
}
|
||||
|
||||
package_python2-decorator() {
|
||||
depends=('python2')
|
||||
replaces=('python3-decorator<=3.3.2-1')
|
||||
cd "${srcdir}/decorator2-${pkgver}"
|
||||
|
||||
python2 setup.py install --root="${pkgdir}" --optimize=1
|
||||
|
||||
install -D -m644 "${srcdir}/LICENSE.txt" \
|
||||
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||
}
|
||||
package_python3-decorator() {
|
||||
depends=('python')
|
||||
cd "${srcdir}/decorator-${pkgver}"
|
||||
|
||||
python3 setup.py install --root="${pkgdir}" --optimize=1
|
||||
|
||||
install -D -m644 "${srcdir}/LICENSE.txt" \
|
||||
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||
}
|
@ -1,112 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Felix Yan <felixonmars@archlinux.org>
|
||||
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
|
||||
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
|
||||
# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
|
||||
# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
|
||||
|
||||
pkgbase=python-matplotlib
|
||||
pkgname=('python2-matplotlib' 'python3-matplotlib')
|
||||
pkgver=1.4.3
|
||||
pkgrel=1
|
||||
pkgdesc="A python plotting library, making publication quality plots"
|
||||
arch=('i686' 'x86_64')
|
||||
url='http://matplotlib.org'
|
||||
license=('custom')
|
||||
checkdepends=('python3-nose' 'python2-nose' 'python3-mock' 'python2-mock' 'xorg-server-xvfb'
|
||||
'texlive-core' 'texlive-latexextra' 'imagemagick' 'ffmpeg' 'mencoder' 'inkscape')
|
||||
makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt4' 'python3-pytz' 'python3-numpy'
|
||||
'python3-pyqt4' 'tk' 'python3-cairocffi' 'python2-cairocffi' 'python3-dateutil'
|
||||
'python2-dateutil' 'python3-gobject' 'python2-gobject' 'python3-pyparsing'
|
||||
'python2-pyparsing' 'pygtk' 'python3-six' 'ghostscript' 'texlive-bin'
|
||||
'python3-tornado' 'python2-tornado' 'gtk3' 'wxpython' 'python3-pyqt5' 'python2-pyqt5'
|
||||
'libxkbcommon' 'python3-pillow' 'python2-pillow')
|
||||
source=("$pkgbase-$pkgver.tar.gz::https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz")
|
||||
sha512sums=('4aebbda31934bedbee5206b783e5cbe07db17367d50117a50bb80b7ea4aad987ec225958bed58885c561f00582c309d6e8c0a69861d3b4210a09b2d63975d2aa')
|
||||
|
||||
prepare() {
|
||||
cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py2
|
||||
|
||||
cd matplotlib-${pkgver}
|
||||
for file in $(find . -name '*.py' -print); do
|
||||
sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python3|" \
|
||||
-e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python3|" ${file}
|
||||
done
|
||||
|
||||
cd ../matplotlib-${pkgver}-py2
|
||||
for file in $(find . -name '*.py' -print); do
|
||||
sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
|
||||
-e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file}
|
||||
done
|
||||
}
|
||||
|
||||
build() {
|
||||
# this seems to need to be present or gtk/gdk dies
|
||||
# and hangs the build checking if gtk3cairo is installed
|
||||
export XDG_RUNTIME_DIR=/tmp
|
||||
|
||||
cd matplotlib-${pkgver}
|
||||
python3 setup.py build
|
||||
|
||||
cd ../matplotlib-${pkgver}-py2
|
||||
python2 setup.py build
|
||||
}
|
||||
|
||||
check() {
|
||||
cd matplotlib-${pkgver}
|
||||
(
|
||||
export PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.4:$PYTHONPATH"
|
||||
python3 -c "from matplotlib import font_manager"
|
||||
rm -rf ../tmp_test_dir && mkdir ../tmp_test_dir && cd ../tmp_test_dir
|
||||
xvfb-run -a -s "+extension GLX +extension RANDR +render -screen 0 1280x1024x24" \
|
||||
python3 ../matplotlib-${pkgver}/tests.py -sv --processes=8 --process-timeout=300 || warning "Tests failed"
|
||||
)
|
||||
|
||||
cd ../matplotlib-${pkgver}-py2
|
||||
(
|
||||
export PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH"
|
||||
python2 -c "from matplotlib import font_manager"
|
||||
rm -rf ../tmp_test_dir && mkdir ../tmp_test_dir && cd ../tmp_test_dir
|
||||
xvfb-run -a -s "+extension GLX +extension RANDR +render -screen 0 1280x1024x24" \
|
||||
python2 ../matplotlib-${pkgver}-py2/tests.py -sv --processes=8 --process-timeout=300 || warning "Tests failed"
|
||||
)
|
||||
}
|
||||
|
||||
package_python2-matplotlib() {
|
||||
depends=('python2-pytz' 'python2-numpy' 'python2-pyqt5' 'python2-dateutil' 'python2-pyparsing' 'libxkbcommon')
|
||||
optdepends=('pygtk: for GTK/GTKAgg/GTKCairo backend'
|
||||
'python2-cairo: for GTKCairo/GTK3Cairo backend'
|
||||
'python2-cairocffi: for GTKCairo/GTK3Cairo backend (alternative to python2-cairo)'
|
||||
'python2-pyqt4: for Qt4Agg backend'
|
||||
'tk: used by the TkAgg backend'
|
||||
'ghostscript: usetex dependencies'
|
||||
'texlive-bin: usetex dependencies'
|
||||
'python2-tornado: for webagg backend'
|
||||
'python2-gobject: for GTK3Agg/GTK3Cairo backend'
|
||||
'wxpython: for WX/WXAgg backend'
|
||||
'python2-pillow: for reading/saving .jpg/bmp/tiff files')
|
||||
|
||||
cd matplotlib-${pkgver}-py2
|
||||
python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
|
||||
|
||||
install -dm755 "${pkgdir}"/usr/share/licenses/python2-matplotlib
|
||||
install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python2-matplotlib
|
||||
}
|
||||
|
||||
package_python3-matplotlib() {
|
||||
depends=('python3-pytz' 'python3-numpy' 'python3-pyqt5' 'python3-dateutil' 'python3-pyparsing' 'libxkbcommon')
|
||||
optdepends=('python3-gobject: for GTK3Agg/GTK3Cairo backend'
|
||||
'python3-cairocffi: for GTK3Agg/GTK3Cairo backend'
|
||||
'python3-pyqt4: for Qt4Agg backend'
|
||||
'tk: used by the TkAgg backend'
|
||||
'ghostscript: usetex dependencies'
|
||||
'texlive-bin: usetex dependencies'
|
||||
'python3-tornado: for webagg backend'
|
||||
'python3-pillow: for reading/saving .jpg/bmp/tiff files')
|
||||
|
||||
cd matplotlib-${pkgver}
|
||||
python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
|
||||
|
||||
install -dm755 "${pkgdir}"/usr/share/licenses/python3-matplotlib
|
||||
install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python3-matplotlib
|
||||
}
|
@ -1,98 +0,0 @@
|
||||
From 1935f1273aef443895a4da4e5f2c4aa86103a414 Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Seghete <vlad.seghete@gmail.com>
|
||||
Date: Mon, 25 Nov 2013 13:35:57 -0600
|
||||
Subject: [PATCH 1/3] fixes issue #2482 and adds note about incompatibility
|
||||
between bbox options and animation backends
|
||||
|
||||
---
|
||||
lib/matplotlib/animation.py | 8 ++++----
|
||||
matplotlibrc.template | 4 ++++
|
||||
2 files changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
|
||||
index 295d60d..9078c5d 100644
|
||||
--- a/lib/matplotlib/animation.py
|
||||
+++ b/lib/matplotlib/animation.py
|
||||
@@ -399,9 +399,9 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase):
|
||||
def _args(self):
|
||||
# Returns the command line parameters for subprocess to use
|
||||
# ffmpeg to create a movie using a collection of temp images
|
||||
- return [self.bin_path(), '-vframes', str(self._frame_counter),
|
||||
- '-r', str(self.fps), '-i',
|
||||
- self._base_temp_name()] + self.output_args
|
||||
+ return [self.bin_path(), '-i', self._base_temp_name()-vframes,
|
||||
+ '-vframes', str(self._frame_counter),
|
||||
+ '-r', str(self.fps), ] + self.output_args
|
||||
|
||||
|
||||
# Base class of avconv information. AVConv has identical arguments to
|
||||
diff --git a/matplotlibrc.template b/matplotlibrc.template
|
||||
index 473d624..e4d3593 100644
|
||||
--- a/matplotlibrc.template
|
||||
+++ b/matplotlibrc.template
|
||||
@@ -380,6 +380,10 @@ backend : %(backend)s
|
||||
#savefig.edgecolor : white # figure edgecolor when saving
|
||||
#savefig.format : png # png, ps, pdf, svg
|
||||
#savefig.bbox : standard # 'tight' or 'standard'.
|
||||
+ # 'tight' is incompatible with pipe-based animation
|
||||
+ # backends but will workd with temporary file based ones:
|
||||
+ # e.g. setting animation.writer to ffmpeg will not work,
|
||||
+ # use ffmpeg_file instead
|
||||
#savefig.pad_inches : 0.1 # Padding to be used when bbox is set to 'tight'
|
||||
#savefig.jpeg_quality: 95 # when a jpeg is saved, the default quality parameter.
|
||||
#savefig.directory : ~ # default directory in savefig dialog box,
|
||||
--
|
||||
1.8.5.1
|
||||
|
||||
|
||||
From f38fcb392d1d247b933f00e65022892007fb8325 Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Seghete <vlad.seghete@gmail.com>
|
||||
Date: Mon, 25 Nov 2013 13:52:53 -0600
|
||||
Subject: [PATCH 2/3] fixed a typo
|
||||
|
||||
---
|
||||
lib/matplotlib/animation.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
|
||||
index 9078c5d..07c6d27 100644
|
||||
--- a/lib/matplotlib/animation.py
|
||||
+++ b/lib/matplotlib/animation.py
|
||||
@@ -399,7 +399,7 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase):
|
||||
def _args(self):
|
||||
# Returns the command line parameters for subprocess to use
|
||||
# ffmpeg to create a movie using a collection of temp images
|
||||
- return [self.bin_path(), '-i', self._base_temp_name()-vframes,
|
||||
+ return [self.bin_path(), '-i', self._base_temp_name(),
|
||||
'-vframes', str(self._frame_counter),
|
||||
'-r', str(self.fps), ] + self.output_args
|
||||
|
||||
--
|
||||
1.8.5.1
|
||||
|
||||
|
||||
From 5c8f3d605ff045ddfbc3ca950aef85366617af5a Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Seghete <vlad.seghete@gmail.com>
|
||||
Date: Mon, 25 Nov 2013 14:17:54 -0600
|
||||
Subject: [PATCH 3/3] fixed another typo
|
||||
|
||||
---
|
||||
lib/matplotlib/animation.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
|
||||
index 07c6d27..9854ca2 100644
|
||||
--- a/lib/matplotlib/animation.py
|
||||
+++ b/lib/matplotlib/animation.py
|
||||
@@ -401,7 +401,7 @@ def _args(self):
|
||||
# ffmpeg to create a movie using a collection of temp images
|
||||
return [self.bin_path(), '-i', self._base_temp_name(),
|
||||
'-vframes', str(self._frame_counter),
|
||||
- '-r', str(self.fps), ] + self.output_args
|
||||
+ '-r', str(self.fps)] + self.output_args
|
||||
|
||||
|
||||
# Base class of avconv information. AVConv has identical arguments to
|
||||
--
|
||||
1.8.5.1
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,65 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Felix Yan <felixonmars@gmail.com>
|
||||
# Contributor: Clément DEMOULINS <clement@archivel.fr>
|
||||
|
||||
pkgbase=python3-networkx
|
||||
pkgname=(python3-networkx python2-networkx)
|
||||
_pypiname=networkx
|
||||
pkgver=1.9.1
|
||||
pkgrel=1
|
||||
pkgdesc='Python package for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks.'
|
||||
arch=('any')
|
||||
license=('BSD')
|
||||
url="http://networkx.github.io"
|
||||
makedepends=('python3-setuptools' 'python2-setuptools' 'python3-decorator' 'python2-decorator')
|
||||
checkdepends=('python3-nose' 'python2-nose')
|
||||
source=("https://github.com/networkx/networkx/archive/${_pypiname}-${pkgver}.tar.gz")
|
||||
sha512sums=('e1b617da71645ecb2427f4e414e2d6e7052f25279ea04d890968d7dadf63526a6989b07759abc2bf29748c8868cdcc875b76c083c3710f8d331ceb109cdfbed5')
|
||||
|
||||
prepare() {
|
||||
cp -r ${_pypiname}-${_pypiname}-$pkgver{,-py2}
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver"
|
||||
python3 setup.py build
|
||||
|
||||
cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver-py2"
|
||||
python2 setup.py build
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver"
|
||||
python3 setup.py nosetests #|| true # Tests fail randomly
|
||||
|
||||
cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver-py2"
|
||||
python2 setup.py nosetests
|
||||
}
|
||||
|
||||
package_python3-networkx() {
|
||||
depends=('python3-decorator')
|
||||
optdepends=('python3-numpy: Provides sparse matrix representation of graphs and many numerical scientific tools.'
|
||||
'python3-scipy: Provides flexible drawing of graphs.'
|
||||
'python3-pyparsing: Required for pydot, GML file reading.'
|
||||
'python3-yaml: Required for YAML format reading and writing.')
|
||||
|
||||
cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver"
|
||||
python3 setup.py install --root="$pkgdir" --optimize=1
|
||||
install -D -m 644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
|
||||
mv "$pkgdir/usr/share/doc/${_pypiname}-$pkgver" "$pkgdir/usr/share/doc/$pkgname"
|
||||
}
|
||||
|
||||
package_python2-networkx() {
|
||||
depends=('python2-decorator')
|
||||
optdepends=('python2-numpy: Provides sparse matrix representation of graphs and many numerical scientific tools.'
|
||||
'python2-scipy: Provides flexible drawing of graphs.'
|
||||
'python2-pygraphviz: Provides graph drawing and graph layout algorithms.'
|
||||
'python2-pydot: Provides graph drawing and graph layout algorithms.'
|
||||
'python2-pyparsing: Required for pydot, GML file reading.'
|
||||
'python2-yaml: Required for YAML format reading and writing.')
|
||||
|
||||
cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver-py2"
|
||||
python2 setup.py install --root="$pkgdir" --optimize=1
|
||||
install -D -m 644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
|
||||
mv "$pkgdir/usr/share/doc/${_pypiname}-$pkgver" "$pkgdir/usr/share/doc/$pkgname"
|
||||
}
|
@ -1,39 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
|
||||
# Contributor: Chris Brannon <cmbrannon79@gmail.com>
|
||||
# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
|
||||
# Contributor: Arvid Ephraim Picciani <aep@exys.org>
|
||||
# Contributor: Michael Krauss <hippodriver@gmx.net>
|
||||
|
||||
pkgbase=python-pyparsing
|
||||
pkgname=('python3-pyparsing' 'python2-pyparsing')
|
||||
pkgver=2.0.3
|
||||
pkgrel=1
|
||||
pkgdesc='General parsing module for Python'
|
||||
arch=('any')
|
||||
url='http://pyparsing.wikispaces.com'
|
||||
license=('MIT')
|
||||
makedepends=('python3' 'python2')
|
||||
source=("http://downloads.sourceforge.net/pyparsing/pyparsing-$pkgver.tar.gz")
|
||||
sha256sums=('06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f')
|
||||
|
||||
prepare() {
|
||||
cp -vr $srcdir/pyparsing-$pkgver $srcdir/pyparsing-$pkgver-py2
|
||||
}
|
||||
package_python3-pyparsing() {
|
||||
cd "$srcdir/pyparsing-$pkgver"
|
||||
|
||||
rm -rf build
|
||||
python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
|
||||
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
||||
|
||||
package_python2-pyparsing() {
|
||||
cd "pyparsing-$pkgver-py2"
|
||||
|
||||
rm -rf build
|
||||
python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
|
||||
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/python2-pyparsing/LICENSE"
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
@ -1,93 +0,0 @@
|
||||
# Maintainer: Thomas Dziedzic < gostrc at gmail >
|
||||
# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
|
||||
# Contributor: Ray Rashif <schiv@archlinux.org>
|
||||
# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
|
||||
# Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com>
|
||||
# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
|
||||
|
||||
pkgname=('python3-scipy' 'python2-scipy')
|
||||
pkgver=0.15.1
|
||||
pkgrel=2
|
||||
pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.scipy.org/"
|
||||
license=('BSD')
|
||||
makedepends=('gcc-fortran' 'python3-numpy' 'python2-numpy' 'python3-setuptools' 'python2-setuptools')
|
||||
checkdepends=('python3-nose' 'python2-nose')
|
||||
source=("https://pypi.python.org/packages/source/s/scipy/scipy-${pkgver}.tar.gz"{,.asc})
|
||||
validpgpkeys=('9F8C0817E257343E841DF83DE814316FB3B4A560')
|
||||
md5sums=('be56cd8e60591d6332aac792a5880110'
|
||||
'SKIP')
|
||||
|
||||
build() {
|
||||
export LDFLAGS="-Wall -shared"
|
||||
|
||||
# 2 builds
|
||||
cp -r scipy-${pkgver} scipy-${pkgver}-py2
|
||||
|
||||
# build for python3
|
||||
cd scipy-${pkgver}
|
||||
python3 setup.py config_fc --fcompiler=gnu95 build
|
||||
|
||||
# build for python2
|
||||
cd ../scipy-${pkgver}-py2
|
||||
|
||||
for file in $(find . -name '*.py' -print); do
|
||||
sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
|
||||
sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
|
||||
done
|
||||
|
||||
python2 setup.py config_fc --fcompiler=gnu95 build
|
||||
}
|
||||
|
||||
check() {
|
||||
# we need to do a temp install so we can import scipy
|
||||
# also, the tests must not be run from the scipy source directory
|
||||
export LDFLAGS="-Wall -shared"
|
||||
|
||||
cd ${srcdir}/scipy-${pkgver}
|
||||
python3 setup.py config_fc --fcompiler=gnu95 install \
|
||||
--prefix=/usr --root=${srcdir}/test --optimize=1
|
||||
export PYTHONPATH=${srcdir}/test/usr/lib/python3.4/site-packages
|
||||
cd ${srcdir}
|
||||
python3 -c "from scipy import test; test('full')"
|
||||
|
||||
cd ${srcdir}/scipy-${pkgver}-py2
|
||||
python2 setup.py config_fc --fcompiler=gnu95 install \
|
||||
--prefix=/usr --root=${srcdir}/test --optimize=1
|
||||
export PYTHONPATH=${srcdir}/test/usr/lib/python2.7/site-packages
|
||||
cd ${srcdir}
|
||||
python2 -c "from scipy import test; test('full')"
|
||||
}
|
||||
|
||||
package_python3-scipy() {
|
||||
depends=('python3-numpy')
|
||||
provides=('python3-scipy' 'scipy')
|
||||
optdepends=('python3-pillow: for image saving module')
|
||||
|
||||
cd scipy-${pkgver}
|
||||
export LDFLAGS="-Wall -shared"
|
||||
|
||||
python3 setup.py config_fc --fcompiler=gnu95 install \
|
||||
--prefix=/usr --root=${pkgdir} --optimize=1
|
||||
|
||||
install -Dm644 LICENSE.txt \
|
||||
"${pkgdir}/usr/share/licenses/python3-scipy/LICENSE"
|
||||
}
|
||||
|
||||
package_python2-scipy() {
|
||||
depends=('python2-numpy')
|
||||
optdepends=('python2-pillow: for image saving module')
|
||||
conflicts=('python3-scipy<0.9.0')
|
||||
|
||||
cd scipy-${pkgver}-py2
|
||||
export LDFLAGS="-Wall -shared"
|
||||
|
||||
python2 setup.py config_fc --fcompiler=gnu95 install \
|
||||
--prefix=/usr --root=${pkgdir} --optimize=1
|
||||
|
||||
install -Dm644 LICENSE.txt \
|
||||
"${pkgdir}/usr/share/licenses/python2-scipy/LICENSE"
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
@ -1,83 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Felix Yan <felixonmars@archlinux.org>
|
||||
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
|
||||
# Contributor: Thomas Dziedzic < gostrc at gmail >
|
||||
# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
|
||||
# Contributor: Peter Garceau <RockyChimp@gmail.com>
|
||||
|
||||
pkgbase=python3-sympy
|
||||
pkgname=('python2-sympy' 'python3-sympy')
|
||||
pkgver=0.7.6
|
||||
pkgrel=2
|
||||
arch=('any')
|
||||
pkgdesc='Symbolic manipulation package (Computer Algebra System), written in pure Python'
|
||||
url='http://sympy.org/en/index.html'
|
||||
license=('BSD')
|
||||
makedepends=('python2-mpmath' 'python3-mpmath' 'git')
|
||||
source=("git+https://github.com/sympy/sympy.git#tag=sympy-${pkgver}"
|
||||
sympy-0.7.6-strip-internal-mpmath.patch)
|
||||
sha512sums=('SKIP'
|
||||
'0b3836580e742c4a22c0b7306a219ebf56eb87b62f7c119cbe56887e642a28097f5223af043874968183601c06c327ad2beade9f34066ab2fd49d365cbc2caec')
|
||||
|
||||
prepare() {
|
||||
cd sympy
|
||||
# FS#43210
|
||||
patch -p1 -i ../sympy-0.7.6-strip-internal-mpmath.patch
|
||||
|
||||
cd "$srcdir"
|
||||
cp -a sympy py3-sympy
|
||||
|
||||
sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
|
||||
-e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
|
||||
sympy/sympy/mpmath/tests/{runtests.py,test_eigen.py,test_levin.py,test_eigen_symmetric.py} \
|
||||
sympy/sympy/mpmath/matrices/{eigen.py,eigen_symmetric.py} \
|
||||
sympy/sympy/utilities/tests/diagnose_imports.py sympy/sympy/benchmarks/bench_symbench.py
|
||||
sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \
|
||||
-e 's|#!/usr/bin/python|#!/usr/bin/python3|' \
|
||||
py3-sympy/sympy/mpmath/tests/{runtests.py,test_eigen.py,test_levin.py,test_eigen_symmetric.py} \
|
||||
py3-sympy/sympy/mpmath/matrices/{eigen.py,eigen_symmetric.py} \
|
||||
py3-sympy/sympy/utilities/tests/diagnose_imports.py py3-sympy/sympy/benchmarks/bench_symbench.py
|
||||
}
|
||||
|
||||
build() {
|
||||
cd sympy
|
||||
python2 setup.py build
|
||||
|
||||
cd ../py3-sympy
|
||||
python3 setup.py build
|
||||
}
|
||||
|
||||
check() {
|
||||
cd sympy
|
||||
python2 setup.py test
|
||||
|
||||
cd ../py3-sympy
|
||||
python3 setup.py test
|
||||
}
|
||||
|
||||
package_python2-sympy() {
|
||||
depends=('python2-mpmath')
|
||||
optdepends=('python2-pyglet: plotting'
|
||||
'ipython2: user friendly interface for isympy')
|
||||
|
||||
cd sympy
|
||||
|
||||
python2 setup.py install --root "${pkgdir}" --optimize=1
|
||||
|
||||
install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
|
||||
}
|
||||
|
||||
package_python3-sympy() {
|
||||
depends=('python3-mpmath')
|
||||
optdepends=('ipython: user friendly interface for isympy')
|
||||
|
||||
cd py3-sympy
|
||||
|
||||
python3 setup.py install --root "${pkgdir}" --optimize=1
|
||||
|
||||
# rename files that exists in both 'python2-sympy' and 'python3-sympy'
|
||||
mv "${pkgdir}"/usr/bin/isympy{,-py3}
|
||||
mv "${pkgdir}"/usr/share/man/man1/isympy{,-py3}.1
|
||||
|
||||
install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
|
||||
}
|
@ -1,776 +0,0 @@
|
||||
--- ./examples/advanced/autowrap_ufuncify.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./examples/advanced/autowrap_ufuncify.py 2014-12-04 10:30:58.017350207 -0700
|
||||
@@ -25,7 +25,7 @@ np = import_module('numpy')
|
||||
if not np:
|
||||
sys.exit("Cannot import numpy. Exiting.")
|
||||
|
||||
-import sympy.mpmath as mpmath
|
||||
+import mpmath
|
||||
from sympy.utilities.autowrap import ufuncify
|
||||
from sympy.utilities.lambdify import implemented_function
|
||||
from sympy import symbols, legendre, Plot, pprint
|
||||
--- ./examples/advanced/pidigits.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./examples/advanced/pidigits.py 2014-12-04 10:30:58.017350207 -0700
|
||||
@@ -6,8 +6,8 @@ Example shows arbitrary precision using
|
||||
computation of the digits of pi.
|
||||
"""
|
||||
|
||||
-from sympy.mpmath import libmp, pi
|
||||
-from sympy.mpmath import functions as mpf_funs
|
||||
+from mpmath import libmp, pi
|
||||
+from mpmath import functions as mpf_funs
|
||||
|
||||
import math
|
||||
from time import clock
|
||||
--- ./setup.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./setup.py 2014-12-04 10:30:58.017350207 -0700
|
||||
@@ -73,11 +73,6 @@ modules = [
|
||||
'sympy.matrices',
|
||||
'sympy.matrices.benchmarks',
|
||||
'sympy.matrices.expressions',
|
||||
- 'sympy.mpmath',
|
||||
- 'sympy.mpmath.calculus',
|
||||
- 'sympy.mpmath.functions',
|
||||
- 'sympy.mpmath.libmp',
|
||||
- 'sympy.mpmath.matrices',
|
||||
'sympy.ntheory',
|
||||
'sympy.parsing',
|
||||
'sympy.physics',
|
||||
@@ -246,7 +241,6 @@ tests = [
|
||||
'sympy.logic.tests',
|
||||
'sympy.matrices.expressions.tests',
|
||||
'sympy.matrices.tests',
|
||||
- 'sympy.mpmath.tests',
|
||||
'sympy.ntheory.tests',
|
||||
'sympy.parsing.tests',
|
||||
'sympy.physics.hep.tests',
|
||||
--- ./sympy/combinatorics/permutations.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/combinatorics/permutations.py 2014-12-04 10:30:58.018350206 -0700
|
||||
@@ -9,7 +9,7 @@ from sympy.utilities.iterables import (f
|
||||
has_dups, runs)
|
||||
from sympy.polys.polytools import lcm
|
||||
from sympy.matrices import zeros
|
||||
-from sympy.mpmath.libmp.libintmath import ifac
|
||||
+from mpmath.libmp.libintmath import ifac
|
||||
|
||||
|
||||
def _af_rmul(a, b):
|
||||
--- ./sympy/core/evalf.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/core/evalf.py 2014-12-04 14:05:59.235169407 -0700
|
||||
@@ -6,20 +6,20 @@ from __future__ import print_function, d
|
||||
|
||||
import math
|
||||
|
||||
-import sympy.mpmath.libmp as libmp
|
||||
-from sympy.mpmath import (
|
||||
+import mpmath.libmp as libmp
|
||||
+from mpmath import (
|
||||
make_mpc, make_mpf, mp, mpc, mpf, nsum, quadts, quadosc, workprec)
|
||||
-from sympy.mpmath import inf as mpmath_inf
|
||||
-from sympy.mpmath.libmp import (from_int, from_man_exp, from_rational, fhalf,
|
||||
+from mpmath import inf as mpmath_inf
|
||||
+from mpmath.libmp import (from_int, from_man_exp, from_rational, fhalf,
|
||||
fnan, fnone, fone, fzero, mpf_abs, mpf_add,
|
||||
mpf_atan, mpf_atan2, mpf_cmp, mpf_cos, mpf_e, mpf_exp, mpf_log, mpf_lt,
|
||||
mpf_mul, mpf_neg, mpf_pi, mpf_pow, mpf_pow_int, mpf_shift, mpf_sin,
|
||||
mpf_sqrt, normalize, round_nearest, to_int, to_str)
|
||||
-from sympy.mpmath.libmp import bitcount as mpmath_bitcount
|
||||
-from sympy.mpmath.libmp.backend import MPZ
|
||||
-from sympy.mpmath.libmp.libmpc import _infs_nan
|
||||
-from sympy.mpmath.libmp.libmpf import dps_to_prec
|
||||
-from sympy.mpmath.libmp.gammazeta import mpf_bernoulli
|
||||
+from mpmath.libmp import bitcount as mpmath_bitcount
|
||||
+from mpmath.libmp.backend import MPZ
|
||||
+from mpmath.libmp.libmpc import _infs_nan
|
||||
+from mpmath.libmp.libmpf import dps_to_prec
|
||||
+from mpmath.libmp.gammazeta import mpf_bernoulli
|
||||
|
||||
from .compatibility import SYMPY_INTS
|
||||
from .sympify import sympify
|
||||
--- ./sympy/core/expr.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/core/expr.py 2014-12-04 11:07:54.359742059 -0700
|
||||
@@ -8,7 +8,7 @@ from .evalf import EvalfMixin, pure_comp
|
||||
from .decorators import _sympifyit, call_highest_priority
|
||||
from .cache import cacheit
|
||||
from .compatibility import reduce, as_int, default_sort_key, xrange
|
||||
-from sympy.mpmath.libmp import mpf_log, prec_to_dps
|
||||
+from mpmath.libmp import mpf_log, prec_to_dps
|
||||
|
||||
from collections import defaultdict
|
||||
|
||||
@@ -384,7 +384,7 @@ class Expr(Basic, EvalfMixin):
|
||||
# increase the precision up to the default maximum
|
||||
# precision to see if we can get any significance
|
||||
|
||||
- from sympy.mpmath.libmp.libintmath import giant_steps
|
||||
+ from mpmath.libmp.libintmath import giant_steps
|
||||
from sympy.core.evalf import DEFAULT_MAXPREC as target
|
||||
|
||||
# evaluate
|
||||
--- ./sympy/core/function.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/core/function.py 2014-12-04 10:30:58.020350202 -0700
|
||||
@@ -51,8 +51,8 @@ from sympy.utilities import default_sort
|
||||
from sympy.utilities.iterables import uniq
|
||||
from sympy.core.evaluate import global_evaluate
|
||||
|
||||
-from sympy import mpmath
|
||||
-import sympy.mpmath.libmp as mlib
|
||||
+import mpmath
|
||||
+import mpmath.libmp as mlib
|
||||
|
||||
import inspect
|
||||
|
||||
@@ -460,7 +460,7 @@ class Function(Application, Expr):
|
||||
try:
|
||||
args = [arg._to_mpmath(prec + 5) for arg in self.args]
|
||||
def bad(m):
|
||||
- from sympy.mpmath import mpf, mpc
|
||||
+ from mpmath import mpf, mpc
|
||||
# the precision of an mpf value is the last element
|
||||
# if that is 1 (and m[1] is not 1 which would indicate a
|
||||
# power of 2), then the eval failed; so check that none of
|
||||
@@ -1223,7 +1223,7 @@ class Derivative(Expr):
|
||||
When we can represent derivatives at a point, this should be folded
|
||||
into the normal evalf. For now, we need a special method.
|
||||
"""
|
||||
- from sympy import mpmath
|
||||
+ import mpmath
|
||||
from sympy.core.expr import Expr
|
||||
if len(self.free_symbols) != 1 or len(self.variables) != 1:
|
||||
raise NotImplementedError('partials and higher order derivatives')
|
||||
--- ./sympy/core/numbers.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/core/numbers.py 2014-12-04 10:30:58.021350201 -0700
|
||||
@@ -16,11 +16,11 @@ from .cache import cacheit, clear_cache
|
||||
from sympy.core.compatibility import (
|
||||
as_int, integer_types, long, string_types, with_metaclass, HAS_GMPY,
|
||||
SYMPY_INTS)
|
||||
-import sympy.mpmath as mpmath
|
||||
-import sympy.mpmath.libmp as mlib
|
||||
-from sympy.mpmath.libmp import mpf_pow, mpf_pi, mpf_e, phi_fixed
|
||||
-from sympy.mpmath.ctx_mp import mpnumeric
|
||||
-from sympy.mpmath.libmp.libmpf import (
|
||||
+import mpmath
|
||||
+import mpmath.libmp as mlib
|
||||
+from mpmath.libmp import mpf_pow, mpf_pi, mpf_e, phi_fixed
|
||||
+from mpmath.ctx_mp import mpnumeric
|
||||
+from mpmath.libmp.libmpf import (
|
||||
finf as _mpf_inf, fninf as _mpf_ninf,
|
||||
fnan as _mpf_nan, fzero as _mpf_zero, _normalize as mpf_normalize,
|
||||
prec_to_dps)
|
||||
--- ./sympy/core/power.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/core/power.py 2014-12-04 10:30:58.021350201 -0700
|
||||
@@ -14,7 +14,7 @@ from .logic import fuzzy_bool
|
||||
from .compatibility import as_int, xrange
|
||||
from .evaluate import global_evaluate
|
||||
|
||||
-from sympy.mpmath.libmp import sqrtrem as mpmath_sqrtrem
|
||||
+from mpmath.libmp import sqrtrem as mpmath_sqrtrem
|
||||
from sympy.utilities.iterables import sift
|
||||
|
||||
|
||||
--- ./sympy/core/tests/test_evalf.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/core/tests/test_evalf.py 2014-12-04 10:31:03.063341891 -0700
|
||||
@@ -4,9 +4,9 @@ from sympy import (Add, ceiling, cos, E,
|
||||
Sum, Product, Integral)
|
||||
from sympy.core.evalf import complex_accuracy, PrecisionExhausted, scaled_zero
|
||||
from sympy.core.compatibility import long
|
||||
-from sympy.mpmath import inf, ninf, nan
|
||||
+from mpmath import inf, ninf, nan
|
||||
from sympy.abc import n, x, y
|
||||
-from sympy.mpmath.libmp.libmpf import from_float
|
||||
+from mpmath.libmp.libmpf import from_float
|
||||
from sympy.utilities.pytest import raises, XFAIL
|
||||
|
||||
|
||||
--- ./sympy/core/tests/test_numbers.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/core/tests/test_numbers.py 2014-12-04 10:56:49.005878896 -0700
|
||||
@@ -6,9 +6,9 @@ from sympy.core.basic import _aresame
|
||||
from sympy.core.compatibility import long, u
|
||||
from sympy.core.power import integer_nthroot
|
||||
from sympy.core.numbers import igcd, ilcm, igcdex, seterr, _intcache, mpf_norm
|
||||
-from sympy.mpmath import mpf
|
||||
+from mpmath import mpf
|
||||
from sympy.utilities.pytest import XFAIL, slow, raises
|
||||
-from sympy import mpmath
|
||||
+import mpmath
|
||||
|
||||
|
||||
def test_integers_cache():
|
||||
@@ -1355,8 +1355,8 @@ def test_issue_4172():
|
||||
|
||||
@XFAIL
|
||||
def test_mpmath_issues():
|
||||
- from sympy.mpmath.libmp.libmpf import _normalize
|
||||
- import sympy.mpmath.libmp as mlib
|
||||
+ from mpmath.libmp.libmpf import _normalize
|
||||
+ import mpmath.libmp as mlib
|
||||
rnd = mlib.round_nearest
|
||||
mpf = (0, long(0), -123, -1, 53, rnd) # nan
|
||||
assert _normalize(mpf, 53) != (0, long(0), 0, 0)
|
||||
@@ -1365,7 +1365,7 @@ def test_mpmath_issues():
|
||||
mpf = (1, long(0), -789, -3, 53, rnd) # -inf
|
||||
assert _normalize(mpf, 53) != (0, long(0), 0, 0)
|
||||
|
||||
- from sympy.mpmath.libmp.libmpf import fnan
|
||||
+ from mpmath.libmp.libmpf import fnan
|
||||
assert mlib.mpf_eq(fnan, fnan)
|
||||
|
||||
|
||||
@@ -1396,7 +1396,7 @@ def test_int_NumberSymbols():
|
||||
|
||||
|
||||
def test_issue_6640():
|
||||
- from sympy.mpmath.libmp.libmpf import (
|
||||
+ from mpmath.libmp.libmpf import (
|
||||
_normalize as mpf_normalize, finf, fninf, fzero)
|
||||
# fnan is not included because Float no longer returns fnan,
|
||||
# but otherwise, the same sort of test could apply
|
||||
--- ./sympy/core/tests/test_sympify.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/core/tests/test_sympify.py 2014-12-04 10:31:04.375339729 -0700
|
||||
@@ -11,7 +11,7 @@ from sympy.functions.combinatorial.facto
|
||||
from sympy.abc import _clash, _clash1, _clash2
|
||||
from sympy.core.compatibility import exec_, HAS_GMPY
|
||||
|
||||
-from sympy import mpmath
|
||||
+import mpmath
|
||||
|
||||
|
||||
def test_issue_3538():
|
||||
--- ./sympy/core/tests/test_wester.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/core/tests/test_wester.py 2014-12-04 10:31:04.377339726 -0700
|
||||
@@ -6,6 +6,7 @@ See also http://math.unm.edu/~wester/cas
|
||||
each tested system.
|
||||
"""
|
||||
|
||||
+import mpmath
|
||||
from sympy import (Rational, symbols, factorial, sqrt, log, exp, oo, zoo,
|
||||
product, binomial, rf, pi, gamma, igcd, factorint, radsimp, combsimp,
|
||||
npartitions, totient, primerange, factor, simplify, gcd, resultant, expand,
|
||||
@@ -13,7 +14,7 @@ from sympy import (Rational, symbols, fa
|
||||
bernoulli, hyper, hyperexpand, besselj, asin, assoc_legendre, Function, re,
|
||||
im, DiracDelta, chebyshevt, legendre_poly, polylog, series, O,
|
||||
atan, sinh, cosh, tanh, floor, ceiling, solve, asinh, acot, csc, sec,
|
||||
- LambertW, N, apart, sqrtdenest, factorial2, powdenest, Mul, S, mpmath, ZZ,
|
||||
+ LambertW, N, apart, sqrtdenest, factorial2, powdenest, Mul, S, ZZ,
|
||||
Poly, expand_func, E, Q, And, Or, Ne, Eq, Le, Lt,
|
||||
ask, refine, AlgebraicNumber, continued_fraction_iterator as cf_i,
|
||||
continued_fraction_periodic as cf_p, continued_fraction_convergents as cf_c,
|
||||
@@ -26,7 +27,7 @@ from sympy.functions.special.zeta_functi
|
||||
from sympy.integrals.deltafunctions import deltaintegrate
|
||||
from sympy.utilities.pytest import XFAIL, slow, SKIP, skip, ON_TRAVIS
|
||||
from sympy.utilities.iterables import partitions
|
||||
-from sympy.mpmath import mpi, mpc
|
||||
+from mpmath import mpi, mpc
|
||||
from sympy.matrices import Matrix, GramSchmidt, eye
|
||||
from sympy.matrices.expressions.blockmatrix import BlockMatrix, block_collapse
|
||||
from sympy.matrices.expressions import MatrixSymbol, ZeroMatrix
|
||||
--- ./sympy/external/tests/test_numpy.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/external/tests/test_numpy.py 2014-12-04 10:31:04.378339724 -0700
|
||||
@@ -21,7 +21,7 @@ from sympy import (Rational, Symbol, lis
|
||||
Matrix, lambdify, symarray, symbols, Integer)
|
||||
import sympy
|
||||
|
||||
-from sympy import mpmath
|
||||
+import mpmath
|
||||
from sympy.abc import x, y, z
|
||||
from sympy.utilities.decorator import conserve_mpmath_dps
|
||||
|
||||
--- ./sympy/functions/combinatorial/numbers.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/functions/combinatorial/numbers.py 2014-12-04 10:59:59.605872355 -0700
|
||||
@@ -21,8 +21,8 @@ from sympy.functions.elementary.exponent
|
||||
from sympy.functions.elementary.trigonometric import sin, cos, cot
|
||||
from sympy.functions.combinatorial.factorials import factorial
|
||||
|
||||
-from sympy.mpmath import bernfrac, workprec
|
||||
-from sympy.mpmath.libmp import ifib as _ifib
|
||||
+from mpmath import bernfrac, workprec
|
||||
+from mpmath.libmp import ifib as _ifib
|
||||
|
||||
|
||||
def _product(a, b):
|
||||
@@ -706,7 +706,7 @@ class euler(Function):
|
||||
if m.is_odd:
|
||||
return S.Zero
|
||||
if m.is_Integer and m.is_nonnegative:
|
||||
- from sympy.mpmath import mp
|
||||
+ from mpmath import mp
|
||||
m = m._to_mpmath(mp.prec)
|
||||
res = mp.eulernum(m, exact=True)
|
||||
return Integer(res)
|
||||
@@ -725,7 +725,7 @@ class euler(Function):
|
||||
m = self.args[0]
|
||||
|
||||
if m.is_Integer and m.is_nonnegative:
|
||||
- from sympy.mpmath import mp
|
||||
+ from mpmath import mp
|
||||
from sympy import Expr
|
||||
m = m._to_mpmath(prec)
|
||||
with workprec(prec):
|
||||
--- ./sympy/functions/special/bessel.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/functions/special/bessel.py 2014-12-04 11:01:02.478869466 -0700
|
||||
@@ -706,8 +706,8 @@ def jn_zeros(n, k, method="sympy", dps=1
|
||||
from math import pi
|
||||
|
||||
if method == "sympy":
|
||||
- from sympy.mpmath import besseljzero
|
||||
- from sympy.mpmath.libmp.libmpf import dps_to_prec
|
||||
+ from mpmath import besseljzero
|
||||
+ from mpmath.libmp.libmpf import dps_to_prec
|
||||
from sympy import Expr
|
||||
prec = dps_to_prec(dps)
|
||||
return [Expr._from_mpmath(besseljzero(S(n + 0.5)._to_mpmath(prec),
|
||||
@@ -1209,7 +1209,7 @@ class airyaiprime(AiryBase):
|
||||
raise ArgumentIndexError(self, argindex)
|
||||
|
||||
def _eval_evalf(self, prec):
|
||||
- from sympy.mpmath import mp, workprec
|
||||
+ from mpmath import mp, workprec
|
||||
from sympy import Expr
|
||||
z = self.args[0]._to_mpmath(prec)
|
||||
with workprec(prec):
|
||||
@@ -1365,7 +1365,7 @@ class airybiprime(AiryBase):
|
||||
raise ArgumentIndexError(self, argindex)
|
||||
|
||||
def _eval_evalf(self, prec):
|
||||
- from sympy.mpmath import mp, workprec
|
||||
+ from mpmath import mp, workprec
|
||||
from sympy import Expr
|
||||
z = self.args[0]._to_mpmath(prec)
|
||||
with workprec(prec):
|
||||
--- ./sympy/functions/special/error_functions.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/functions/special/error_functions.py 2014-12-04 10:31:04.380339721 -0700
|
||||
@@ -1339,7 +1339,7 @@ class li(Function):
|
||||
|
||||
We can even compute Soldner's constant by the help of mpmath:
|
||||
|
||||
- >>> from sympy.mpmath import findroot
|
||||
+ >>> from mpmath import findroot
|
||||
>>> findroot(li, 2)
|
||||
1.45136923488338
|
||||
|
||||
--- ./sympy/functions/special/gamma_functions.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/functions/special/gamma_functions.py 2014-12-04 14:05:59.241169397 -0700
|
||||
@@ -296,7 +296,7 @@ class lowergamma(Function):
|
||||
return (cls(a + 1, x) + x**a * C.exp(-x))/a
|
||||
|
||||
def _eval_evalf(self, prec):
|
||||
- from sympy.mpmath import mp, workprec
|
||||
+ from mpmath import mp, workprec
|
||||
from sympy import Expr
|
||||
a = self.args[0]._to_mpmath(prec)
|
||||
z = self.args[1]._to_mpmath(prec)
|
||||
@@ -395,7 +395,7 @@ class uppergamma(Function):
|
||||
raise ArgumentIndexError(self, argindex)
|
||||
|
||||
def _eval_evalf(self, prec):
|
||||
- from sympy.mpmath import mp, workprec
|
||||
+ from mpmath import mp, workprec
|
||||
from sympy import Expr
|
||||
a = self.args[0]._to_mpmath(prec)
|
||||
z = self.args[1]._to_mpmath(prec)
|
||||
--- ./sympy/functions/special/hyper.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/functions/special/hyper.py 2014-12-04 10:31:04.381339719 -0700
|
||||
@@ -600,7 +600,8 @@ class meijerg(TupleParametersBase):
|
||||
# (carefully so as not to loose the branch information), and evaluate
|
||||
# G(z'**(1/r)) = G(z'**n) = G(z).
|
||||
from sympy.functions import exp_polar, ceiling
|
||||
- from sympy import mpmath, Expr
|
||||
+ from sympy import Expr
|
||||
+ import mpmath
|
||||
z = self.argument
|
||||
znum = self.argument._eval_evalf(prec)
|
||||
if znum.has(exp_polar):
|
||||
--- ./sympy/functions/special/spherical_harmonics.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/functions/special/spherical_harmonics.py 2014-12-04 14:05:59.242169395 -0700
|
||||
@@ -219,7 +219,7 @@ class Ynm(Function):
|
||||
# Note: works without this function by just calling
|
||||
# mpmath for Legendre polynomials. But using
|
||||
# the dedicated function directly is cleaner.
|
||||
- from sympy.mpmath import mp, workprec
|
||||
+ from mpmath import mp, workprec
|
||||
from sympy import Expr
|
||||
n = self.args[0]._to_mpmath(prec)
|
||||
m = self.args[1]._to_mpmath(prec)
|
||||
--- ./sympy/geometry/ellipse.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/geometry/ellipse.py 2014-12-04 10:31:04.383339716 -0700
|
||||
@@ -24,7 +24,7 @@ from .entity import GeometryEntity
|
||||
from .point import Point
|
||||
from .line import LinearEntity, Line
|
||||
from .util import _symbol, idiff
|
||||
-from sympy.mpmath import findroot as nroot
|
||||
+from mpmath import findroot as nroot
|
||||
|
||||
|
||||
import random
|
||||
--- ./sympy/liealgebras/weyl_group.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/liealgebras/weyl_group.py 2014-12-04 10:31:04.383339716 -0700
|
||||
@@ -3,7 +3,7 @@
|
||||
from sympy.core import Basic, Rational
|
||||
from sympy.core.numbers import igcd
|
||||
from .cartan_type import CartanType
|
||||
-from sympy.mpmath import fac
|
||||
+from mpmath import fac
|
||||
from operator import itemgetter
|
||||
from itertools import groupby
|
||||
from sympy.matrices import Matrix, eye
|
||||
--- ./sympy/matrices/matrices.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/matrices/matrices.py 2014-12-04 10:31:04.384339714 -0700
|
||||
@@ -1238,7 +1238,7 @@ class MatrixBase(object):
|
||||
"""Solve the linear system Ax = rhs for x where A = self.
|
||||
|
||||
This is for symbolic matrices, for real or complex ones use
|
||||
- sympy.mpmath.lu_solve or sympy.mpmath.qr_solve.
|
||||
+ mpmath.lu_solve or mpmath.qr_solve.
|
||||
|
||||
See Also
|
||||
========
|
||||
@@ -1615,7 +1615,7 @@ class MatrixBase(object):
|
||||
to use QRsolve.
|
||||
|
||||
This is mainly for educational purposes and symbolic matrices, for real
|
||||
- (or complex) matrices use sympy.mpmath.qr_solve.
|
||||
+ (or complex) matrices use mpmath.qr_solve.
|
||||
|
||||
See Also
|
||||
========
|
||||
--- ./sympy/ntheory/partitions_.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/ntheory/partitions_.py 2014-12-04 10:31:04.384339714 -0700
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import print_function, division
|
||||
|
||||
-from sympy.mpmath.libmp import (fzero,
|
||||
+from mpmath.libmp import (fzero,
|
||||
from_man_exp, from_int, from_rational,
|
||||
fone, fhalf, bitcount, to_int, to_str, mpf_mul, mpf_div, mpf_sub,
|
||||
mpf_add, mpf_sqrt, mpf_pi, mpf_cosh_sinh, pi_fixed, mpf_cos)
|
||||
--- ./sympy/physics/quantum/constants.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/physics/quantum/constants.py 2014-12-04 10:31:04.384339714 -0700
|
||||
@@ -6,7 +6,7 @@ from sympy.core.numbers import NumberSym
|
||||
from sympy.core.singleton import Singleton
|
||||
from sympy.core.compatibility import u, with_metaclass
|
||||
from sympy.printing.pretty.stringpict import prettyForm
|
||||
-import sympy.mpmath.libmp as mlib
|
||||
+import mpmath.libmp as mlib
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Constants
|
||||
--- ./sympy/physics/quantum/qubit.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/physics/quantum/qubit.py 2014-12-04 10:31:04.385339712 -0700
|
||||
@@ -24,7 +24,7 @@ from sympy.physics.quantum.represent imp
|
||||
from sympy.physics.quantum.matrixutils import (
|
||||
numpy_ndarray, scipy_sparse_matrix
|
||||
)
|
||||
-from sympy.mpmath.libmp.libintmath import bitcount
|
||||
+from mpmath.libmp.libintmath import bitcount
|
||||
|
||||
__all__ = [
|
||||
'Qubit',
|
||||
--- ./sympy/polys/domains/groundtypes.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/polys/domains/groundtypes.py 2014-12-04 10:31:04.385339712 -0700
|
||||
@@ -69,7 +69,7 @@ else:
|
||||
gmpy_qdiv = None
|
||||
|
||||
|
||||
-import sympy.mpmath.libmp as mlib
|
||||
+import mpmath.libmp as mlib
|
||||
|
||||
|
||||
def python_sqrt(n):
|
||||
--- ./sympy/polys/domains/mpelements.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/polys/domains/mpelements.py 2014-12-04 10:31:04.385339712 -0700
|
||||
@@ -4,11 +4,11 @@ from __future__ import print_function, d
|
||||
|
||||
from sympy.polys.domains.domainelement import DomainElement
|
||||
|
||||
-from sympy.mpmath.ctx_mp_python import PythonMPContext, _mpf, _mpc, _constant
|
||||
-from sympy.mpmath.libmp import (MPZ_ONE, fzero, fone, finf, fninf, fnan,
|
||||
+from mpmath.ctx_mp_python import PythonMPContext, _mpf, _mpc, _constant
|
||||
+from mpmath.libmp import (MPZ_ONE, fzero, fone, finf, fninf, fnan,
|
||||
round_nearest, mpf_mul, mpf_abs, mpf_lt, mpc_abs, repr_dps, int_types,
|
||||
from_int, from_float, from_str, to_rational)
|
||||
-from sympy.mpmath.rational import mpq
|
||||
+from mpmath.rational import mpq
|
||||
|
||||
from sympy.utilities import public
|
||||
|
||||
--- ./sympy/polys/modulargcd.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/polys/modulargcd.py 2014-12-04 10:31:04.386339711 -0700
|
||||
@@ -7,7 +7,7 @@ from sympy.polys.polyerrors import Modul
|
||||
from sympy.polys.domains import PolynomialRing
|
||||
|
||||
from sympy.core.compatibility import xrange
|
||||
-from sympy.mpmath import sqrt
|
||||
+from mpmath import sqrt
|
||||
from sympy import Dummy
|
||||
import random
|
||||
|
||||
--- ./sympy/polys/numberfields.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/polys/numberfields.py 2014-12-04 10:31:04.386339711 -0700
|
||||
@@ -47,7 +47,7 @@ from sympy.core.exprtools import Factors
|
||||
from sympy.simplify.simplify import _mexpand, _is_sum_surds
|
||||
from sympy.ntheory import sieve
|
||||
from sympy.ntheory.factor_ import divisors
|
||||
-from sympy.mpmath import pslq, mp
|
||||
+from mpmath import pslq, mp
|
||||
|
||||
from sympy.core.compatibility import reduce
|
||||
from sympy.core.compatibility import xrange
|
||||
--- ./sympy/polys/polytools.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/polys/polytools.py 2014-12-04 11:04:04.672827949 -0700
|
||||
@@ -47,8 +47,8 @@ from sympy.polys.polyerrors import (
|
||||
from sympy.utilities import group, sift, public
|
||||
|
||||
import sympy.polys
|
||||
-import sympy.mpmath
|
||||
-from sympy.mpmath.libmp.libhyper import NoConvergence
|
||||
+import mpmath
|
||||
+from mpmath.libmp.libhyper import NoConvergence
|
||||
|
||||
from sympy.polys.domains import FF, QQ, ZZ
|
||||
from sympy.polys.constructor import construct_domain
|
||||
@@ -3391,18 +3391,18 @@ class Poly(Expr):
|
||||
coeffs = [coeff.evalf(n=n).as_real_imag()
|
||||
for coeff in f.all_coeffs()]
|
||||
try:
|
||||
- coeffs = [sympy.mpmath.mpc(*coeff) for coeff in coeffs]
|
||||
+ coeffs = [mpmath.mpc(*coeff) for coeff in coeffs]
|
||||
except TypeError:
|
||||
raise DomainError("Numerical domain expected, got %s" % \
|
||||
f.rep.dom)
|
||||
|
||||
- dps = sympy.mpmath.mp.dps
|
||||
- sympy.mpmath.mp.dps = n
|
||||
+ dps = mpmath.mp.dps
|
||||
+ mpmath.mp.dps = n
|
||||
|
||||
try:
|
||||
# We need to add extra precision to guard against losing accuracy.
|
||||
# 10 times the degree of the polynomial seems to work well.
|
||||
- roots = sympy.mpmath.polyroots(coeffs, maxsteps=maxsteps,
|
||||
+ roots = mpmath.polyroots(coeffs, maxsteps=maxsteps,
|
||||
cleanup=cleanup, error=False, extraprec=f.degree()*10)
|
||||
|
||||
# Mpmath puts real roots first, then complex ones (as does all_roots)
|
||||
@@ -3414,7 +3414,7 @@ class Poly(Expr):
|
||||
'convergence to root failed; try n < %s or maxsteps > %s' % (
|
||||
n, maxsteps))
|
||||
finally:
|
||||
- sympy.mpmath.mp.dps = dps
|
||||
+ mpmath.mp.dps = dps
|
||||
|
||||
return roots
|
||||
|
||||
--- ./sympy/polys/ring_series.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/polys/ring_series.py 2014-12-04 11:09:16.774704452 -0700
|
||||
@@ -3,10 +3,10 @@
|
||||
from sympy.polys.domains import QQ
|
||||
from sympy.polys.rings import ring, PolyElement
|
||||
from sympy.polys.monomials import monomial_min, monomial_mul
|
||||
-from sympy.mpmath.libmp.libintmath import ifac
|
||||
+from mpmath.libmp.libintmath import ifac
|
||||
from sympy.core.numbers import Rational
|
||||
from sympy.core.compatibility import as_int
|
||||
-from sympy.mpmath.libmp.libintmath import giant_steps
|
||||
+from mpmath.libmp.libintmath import giant_steps
|
||||
import math
|
||||
|
||||
def _invert_monoms(p1):
|
||||
--- ./sympy/polys/rootoftools.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/polys/rootoftools.py 2014-12-04 14:05:59.247169386 -0700
|
||||
@@ -28,8 +28,8 @@ from sympy.polys.polyerrors import (
|
||||
|
||||
from sympy.polys.domains import QQ
|
||||
|
||||
-from sympy.mpmath import mp, mpf, mpc, findroot, workprec
|
||||
-from sympy.mpmath.libmp.libmpf import prec_to_dps
|
||||
+from mpmath import mp, mpf, mpc, findroot, workprec
|
||||
+from mpmath.libmp.libmpf import prec_to_dps
|
||||
|
||||
from sympy.utilities import lambdify, public
|
||||
|
||||
--- ./sympy/polys/tests/test_polyroots.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/polys/tests/test_polyroots.py 2014-12-04 14:06:31.622109815 -0700
|
||||
@@ -17,6 +17,7 @@ from sympy.utilities.iterables import ca
|
||||
from sympy.utilities.pytest import raises, XFAIL
|
||||
from sympy.utilities.randtest import verify_numerically
|
||||
import sympy
|
||||
+import mpmath
|
||||
|
||||
|
||||
a, b, c, d, e, q, t, x, y, z = symbols('a,b,c,d,e,q,t,x,y,z')
|
||||
@@ -584,7 +585,7 @@ def test_nroots1():
|
||||
n = 64
|
||||
p = legendre_poly(n, x, polys=True)
|
||||
|
||||
- raises(sympy.mpmath.mp.NoConvergence, lambda: p.nroots(n=3, maxsteps=5))
|
||||
+ raises(mpmath.mp.NoConvergence, lambda: p.nroots(n=3, maxsteps=5))
|
||||
|
||||
roots = p.nroots(n=3)
|
||||
# The order of roots matters. They are ordered from smallest to the
|
||||
--- ./sympy/printing/latex.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/printing/latex.py 2014-12-04 10:31:04.391339702 -0700
|
||||
@@ -15,8 +15,8 @@ from .printer import Printer
|
||||
from .conventions import split_super_sub, requires_partial
|
||||
from .precedence import precedence, PRECEDENCE
|
||||
|
||||
-import sympy.mpmath.libmp as mlib
|
||||
-from sympy.mpmath.libmp import prec_to_dps
|
||||
+import mpmath.libmp as mlib
|
||||
+from mpmath.libmp import prec_to_dps
|
||||
|
||||
from sympy.core.compatibility import default_sort_key, xrange
|
||||
from sympy.utilities.iterables import has_variety
|
||||
--- ./sympy/printing/repr.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/printing/repr.py 2014-12-04 10:31:04.392339701 -0700
|
||||
@@ -9,8 +9,8 @@ from __future__ import print_function, d
|
||||
|
||||
from sympy.core.function import AppliedUndef
|
||||
from .printer import Printer
|
||||
-import sympy.mpmath.libmp as mlib
|
||||
-from sympy.mpmath.libmp import prec_to_dps, repr_dps
|
||||
+import mpmath.libmp as mlib
|
||||
+from mpmath.libmp import prec_to_dps, repr_dps
|
||||
|
||||
|
||||
class ReprPrinter(Printer):
|
||||
--- ./sympy/printing/str.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/printing/str.py 2014-12-04 10:31:04.392339701 -0700
|
||||
@@ -10,8 +10,8 @@ from sympy.core.numbers import Integer
|
||||
from .printer import Printer
|
||||
from sympy.printing.precedence import precedence, PRECEDENCE
|
||||
|
||||
-import sympy.mpmath.libmp as mlib
|
||||
-from sympy.mpmath.libmp import prec_to_dps
|
||||
+import mpmath.libmp as mlib
|
||||
+from mpmath.libmp import prec_to_dps
|
||||
|
||||
from sympy.utilities import default_sort_key
|
||||
|
||||
--- ./sympy/sets/sets.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/sets/sets.py 2014-12-04 11:10:31.446662910 -0700
|
||||
@@ -13,7 +13,7 @@ from sympy.core.decorators import deprec
|
||||
from sympy.core.mul import Mul
|
||||
from sympy.sets.contains import Contains
|
||||
|
||||
-from sympy.mpmath import mpi, mpf
|
||||
+from mpmath import mpi, mpf
|
||||
from sympy.logic.boolalg import And, Or, Not, true, false
|
||||
from sympy.utilities import default_sort_key, subsets
|
||||
|
||||
--- ./sympy/sets/tests/test_sets.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/sets/tests/test_sets.py 2014-12-04 11:10:10.615676162 -0700
|
||||
@@ -2,7 +2,7 @@ from sympy import (Symbol, Set, Union, I
|
||||
GreaterThan, LessThan, Max, Min, And, Or, Eq, Ge, Le, Gt, Lt, Float,
|
||||
FiniteSet, Intersection, imageset, I, true, false, ProductSet, E,
|
||||
sqrt, Complement, EmptySet, sin, cos, Lambda, ImageSet, pi)
|
||||
-from sympy.mpmath import mpi
|
||||
+from mpmath import mpi
|
||||
|
||||
from sympy.utilities.pytest import raises
|
||||
from sympy.utilities.pytest import raises, XFAIL
|
||||
--- ./sympy/simplify/simplify.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/simplify/simplify.py 2014-12-04 10:31:04.393339699 -0700
|
||||
@@ -34,7 +34,7 @@ from sympy.ntheory.factor_ import multip
|
||||
from sympy.polys import (Poly, together, reduced, cancel, factor,
|
||||
ComputationFailed, lcm, gcd)
|
||||
|
||||
-import sympy.mpmath as mpmath
|
||||
+import mpmath
|
||||
|
||||
|
||||
def _mexpand(expr):
|
||||
--- ./sympy/solvers/solvers.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/solvers/solvers.py 2014-12-04 10:31:04.394339698 -0700
|
||||
@@ -47,7 +47,7 @@ from sympy.utilities.lambdify import lam
|
||||
from sympy.utilities.misc import filldedent
|
||||
from sympy.utilities.iterables import uniq, generate_bell, flatten
|
||||
|
||||
-from sympy.mpmath import findroot
|
||||
+from mpmath import findroot
|
||||
|
||||
from sympy.solvers.polysys import solve_poly_system
|
||||
from sympy.solvers.inequalities import reduce_inequalities
|
||||
@@ -2417,8 +2417,8 @@ def nsolve(*args, **kwargs):
|
||||
Overdetermined systems are supported.
|
||||
|
||||
>>> from sympy import Symbol, nsolve
|
||||
- >>> import sympy
|
||||
- >>> sympy.mpmath.mp.dps = 15
|
||||
+ >>> import mpmath, sympy
|
||||
+ >>> mpmath.mp.dps = 15
|
||||
>>> x1 = Symbol('x1')
|
||||
>>> x2 = Symbol('x2')
|
||||
>>> f1 = 3 * x1**2 - 2 * x2**2 - 1
|
||||
--- ./sympy/solvers/tests/test_numeric.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/solvers/tests/test_numeric.py 2014-12-04 10:31:04.395339696 -0700
|
||||
@@ -1,5 +1,5 @@
|
||||
from sympy import Eq, Matrix, pi, sin, sqrt, Symbol, Integral, Piecewise, symbols
|
||||
-from sympy.mpmath import mnorm, mpf
|
||||
+from mpmath import mnorm, mpf
|
||||
from sympy.solvers import nsolve
|
||||
from sympy.utilities.lambdify import lambdify
|
||||
from sympy.utilities.pytest import raises, XFAIL
|
||||
--- ./sympy/utilities/decorator.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/utilities/decorator.py 2014-12-04 10:31:06.039336987 -0700
|
||||
@@ -81,7 +81,7 @@ def conserve_mpmath_dps(func):
|
||||
"""After the function finishes, resets the value of mpmath.mp.dps to
|
||||
the value it had before the function was run."""
|
||||
import functools
|
||||
- from sympy import mpmath
|
||||
+ import mpmath
|
||||
|
||||
def func_wrapper():
|
||||
dps = mpmath.mp.dps
|
||||
--- ./sympy/utilities/lambdify.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/utilities/lambdify.py 2014-12-04 10:31:06.040336985 -0700
|
||||
@@ -93,7 +93,7 @@ NUMEXPR_TRANSLATIONS = {}
|
||||
# Available modules:
|
||||
MODULES = {
|
||||
"math": (MATH, MATH_DEFAULT, MATH_TRANSLATIONS, ("from math import *",)),
|
||||
- "mpmath": (MPMATH, MPMATH_DEFAULT, MPMATH_TRANSLATIONS, ("from sympy.mpmath import *",)),
|
||||
+ "mpmath": (MPMATH, MPMATH_DEFAULT, MPMATH_TRANSLATIONS, ("from mpmath import *",)),
|
||||
"numpy": (NUMPY, NUMPY_DEFAULT, NUMPY_TRANSLATIONS, ("import_module('numpy')",)),
|
||||
"sympy": (SYMPY, SYMPY_DEFAULT, {}, (
|
||||
"from sympy.functions import *",
|
||||
--- ./sympy/utilities/runtests.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/utilities/runtests.py 2014-12-04 11:05:35.646805355 -0700
|
||||
@@ -473,7 +473,7 @@ def _test(*paths, **kwargs):
|
||||
split = kwargs.get('split', None)
|
||||
blacklist = kwargs.get('blacklist', [])
|
||||
blacklist.extend([
|
||||
- "sympy/mpmath", # needs to be fixed upstream
|
||||
+ "mpmath", # needs to be fixed upstream
|
||||
])
|
||||
blacklist = convert_to_native_paths(blacklist)
|
||||
r = PyTestReporter(verbose=verbose, tb=tb, colors=colors,
|
||||
@@ -607,7 +607,7 @@ def _doctest(*paths, **kwargs):
|
||||
split = kwargs.get('split', None)
|
||||
blacklist.extend([
|
||||
"doc/src/modules/mpmath", # needs to be fixed upstream
|
||||
- "sympy/mpmath", # needs to be fixed upstream
|
||||
+ "mpmath", # needs to be fixed upstream
|
||||
"doc/src/modules/plotting.rst", # generates live plots
|
||||
"sympy/utilities/compilef.py", # needs tcc
|
||||
"sympy/physics/gaussopt.py", # raises deprecation warning
|
||||
--- ./sympy/utilities/tests/diagnose_imports.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/utilities/tests/diagnose_imports.py 2014-12-04 10:31:06.041336983 -0700
|
||||
@@ -117,7 +117,7 @@ if __name__ == "__main__":
|
||||
"""Is module relevant for import checking?
|
||||
|
||||
Only imports between relevant modules will be checked."""
|
||||
- return in_module(module, 'sympy') and not in_module(module, 'sympy.mpmath')
|
||||
+ return in_module(module, 'sympy') and not in_module(module, 'mpmath')
|
||||
|
||||
sorted_messages = []
|
||||
|
||||
--- ./sympy/utilities/tests/test_lambdify.py.orig 2014-11-20 13:00:41.000000000 -0700
|
||||
+++ ./sympy/utilities/tests/test_lambdify.py 2014-12-04 10:31:06.041336983 -0700
|
||||
@@ -3,7 +3,7 @@ from sympy import (
|
||||
symbols, lambdify, sqrt, sin, cos, tan, pi, atan, acos, acosh, Rational,
|
||||
Float, Matrix, Lambda, exp, Integral, oo, I, Abs, Function, true, false)
|
||||
from sympy.printing.lambdarepr import LambdaPrinter
|
||||
-from sympy import mpmath
|
||||
+import mpmath
|
||||
from sympy.utilities.lambdify import implemented_function
|
||||
from sympy.utilities.pytest import skip
|
||||
from sympy.utilities.decorator import conserve_mpmath_dps
|
@ -1,57 +0,0 @@
|
||||
diff --git a/setup.py b/setup.py
|
||||
index f09169f..d42c486 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and
|
||||
|
||||
if setuptools is not None:
|
||||
# If setuptools is not available, you're on your own for dependencies.
|
||||
- install_requires = ['certifi']
|
||||
+ install_requires = []
|
||||
if sys.version_info < (3, 2):
|
||||
install_requires.append('backports.ssl_match_hostname')
|
||||
kwargs['install_requires'] = install_requires
|
||||
diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
|
||||
index f0f73fa..ffe3e40 100644
|
||||
--- a/tornado/simple_httpclient.py
|
||||
+++ b/tornado/simple_httpclient.py
|
||||
@@ -33,17 +33,9 @@ except ImportError:
|
||||
# ssl is not available on Google App Engine.
|
||||
ssl = None
|
||||
|
||||
-try:
|
||||
- import certifi
|
||||
-except ImportError:
|
||||
- certifi = None
|
||||
-
|
||||
|
||||
def _default_ca_certs():
|
||||
- if certifi is None:
|
||||
- raise Exception("The 'certifi' package is required to use https "
|
||||
- "in simple_httpclient")
|
||||
- return certifi.where()
|
||||
+ return "/etc/ssl/certs/ca-certificates.crt"
|
||||
|
||||
|
||||
class SimpleAsyncHTTPClient(AsyncHTTPClient):
|
||||
diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
|
||||
index 01b0d95..47a64e7 100644
|
||||
--- a/tornado/test/iostream_test.py
|
||||
+++ b/tornado/test/iostream_test.py
|
||||
@@ -10,7 +10,6 @@ from tornado.stack_context import NullContext
|
||||
from tornado.testing import AsyncHTTPTestCase, AsyncHTTPSTestCase, AsyncTestCase, bind_unused_port, ExpectLog, gen_test
|
||||
from tornado.test.util import unittest, skipIfNonUnix
|
||||
from tornado.web import RequestHandler, Application
|
||||
-import certifi
|
||||
import errno
|
||||
import logging
|
||||
import os
|
||||
@@ -855,7 +854,7 @@ class TestIOStreamStartTLS(AsyncTestCase):
|
||||
def test_handshake_fail(self):
|
||||
self.server_start_tls(_server_ssl_options())
|
||||
client_future = self.client_start_tls(
|
||||
- dict(cert_reqs=ssl.CERT_REQUIRED, ca_certs=certifi.where()))
|
||||
+ dict(cert_reqs=ssl.CERT_REQUIRED, ca_certs="/etc/ssl/certs/ca-certificates.crt"))
|
||||
with ExpectLog(gen_log, "SSL Error"):
|
||||
with self.assertRaises(ssl.SSLError):
|
||||
yield client_future
|
@ -1,23 +0,0 @@
|
||||
From f8f2ffca1928aeca2fa9771093436dba49baa538 Mon Sep 17 00:00:00 2001
|
||||
From: Felix Yan <felixonmars@gmail.com>
|
||||
Date: Fri, 12 Dec 2014 23:10:15 +0800
|
||||
Subject: [PATCH] Don't depend on backports.ssl-match-hostname with python
|
||||
>=2.7.9, <3.0
|
||||
|
||||
---
|
||||
setup.py | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index f09169f..f795807 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -121,7 +121,7 @@ def build_extension(self, ext):
|
||||
if setuptools is not None:
|
||||
# If setuptools is not available, you're on your own for dependencies.
|
||||
install_requires = []
|
||||
- if sys.version_info < (3, 2):
|
||||
+ if sys.version_info < (2, 7, 9) or (3, 0) <= sys.version_info < (3, 2):
|
||||
install_requires.append('backports.ssl_match_hostname')
|
||||
kwargs['install_requires'] = install_requires
|
||||
|
@ -1,82 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Felix Yan <felixonmars@archlinux.org>
|
||||
# Contributor: Thomas Dziedzic < gostrc at gmail >
|
||||
|
||||
pkgname=('python3-tornado' 'python2-tornado')
|
||||
pkgver=4.1.0
|
||||
pkgrel=2
|
||||
pkgdesc='open source version of the scalable, non-blocking web server and tools'
|
||||
arch=('i686' 'x86_64')
|
||||
url='http://www.tornadoweb.org/'
|
||||
license=('Apache')
|
||||
makedepends=('python3-setuptools' 'python2-setuptools' 'git')
|
||||
checkdepends=('python3-pycurl' 'python2-pycurl' 'python3-mock' 'python2-mock' 'python3-twisted' 'python2-twisted' 'python2-futures' 'python2-singledispatch')
|
||||
source=("git+https://github.com/facebook/tornado.git#tag=v$pkgver"
|
||||
0001-use_system_ca_certificates.patch
|
||||
0002-get-rid-of-backports-ssl-match-hostname.patch)
|
||||
sha512sums=('SKIP'
|
||||
'6e50e9ecf361d54d9f67e1f12185cf58863ad0eae72fbe7cc24e8eaf94874255009a030249bb51adf06e98c7ed0b17d8c6d9ee65190ebc341d6857c0efbc7840'
|
||||
'798f1c5f659138aa4d775edde7c962ec6410671f528b7ec44ca12ac342ddf9ec51d998c676b9025292a58c2140ba8492fcc76759b63adaf08320f96b11bcbfea')
|
||||
|
||||
prepare() {
|
||||
cd tornado
|
||||
patch -p1 -i ../0001-use_system_ca_certificates.patch
|
||||
patch -p1 -i ../0002-get-rid-of-backports-ssl-match-hostname.patch
|
||||
|
||||
cd "$srcdir"
|
||||
cp -a tornado{,-py2}
|
||||
|
||||
# python -> python2 rename
|
||||
find tornado-py2 -name '*py' -exec sed -e 's_#!/usr/bin/env python_&2_' -i {} \;
|
||||
}
|
||||
|
||||
build() {
|
||||
cd tornado
|
||||
python3 setup.py build
|
||||
|
||||
cd ../tornado-py2
|
||||
python2 setup.py build
|
||||
}
|
||||
|
||||
check() {
|
||||
(
|
||||
cd tornado
|
||||
# TODO: exporting PYTHONPATH didn't fix the tornado.speedups not found problem...
|
||||
export PYTHONPATH="$(pwd)/build/lib.linux-$CARCH-3.4:$PYTHONPATH"
|
||||
python3 -m tornado.test.runtests
|
||||
python3 -m tornado.test.runtests --httpclient=tornado.curl_httpclient.CurlAsyncHTTPClient
|
||||
# python -m tornado.test.runtests --resolver=tornado.platform.caresresolver.CaresResolver # pycares not in the repos
|
||||
python3 -m tornado.test.runtests --resolver=tornado.netutil.ThreadedResolver
|
||||
python3 -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop
|
||||
python3 -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop
|
||||
python3 -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop
|
||||
python3 -m tornado.test.runtests --ioloop=tornado.test.twisted_test.LayeredTwistedIOLoop --resolver=tornado.platform.twisted.TwistedResolver
|
||||
) || warning "Python 3 tests failed"
|
||||
|
||||
(
|
||||
cd tornado-py2
|
||||
export PYTHONPATH="$(pwd)/build/lib.linux-$CARCH-2.7:$PYTHONPATH"
|
||||
python2 -m tornado.test.runtests
|
||||
python2 -m tornado.test.runtests --httpclient=tornado.curl_httpclient.CurlAsyncHTTPClient
|
||||
# python2 -m tornado.test.runtests --resolver=tornado.platform.caresresolver.CaresResolver # pycares not in the repos
|
||||
python2 -m tornado.test.runtests --resolver=tornado.netutil.ThreadedResolver
|
||||
python2 -m tornado.test.runtests --ioloop=tornado.platform.select.SelectIOLoop
|
||||
python2 -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop
|
||||
python2 -m tornado.test.runtests --ioloop=tornado.test.twisted_test.LayeredTwistedIOLoop --resolver=tornado.platform.twisted.TwistedResolver
|
||||
) || warning "Python 2 tests failed"
|
||||
}
|
||||
|
||||
package_python3-tornado() {
|
||||
depends=('python')
|
||||
|
||||
cd tornado
|
||||
python3 setup.py install --root="${pkgdir}" --optimize=1
|
||||
}
|
||||
|
||||
package_python2-tornado() {
|
||||
depends=('python2>=2.7.9')
|
||||
|
||||
cd tornado-py2
|
||||
python2 setup.py install --root="${pkgdir}" --optimize=1
|
||||
}
|
||||
|
@ -1,21 +0,0 @@
|
||||
Copyright 2009 Brian Quinlan. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification,
|
||||
are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY BRIAN QUINLAN "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
|
||||
HALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
@ -1,30 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
|
||||
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
|
||||
# Contributor: Allan McRae <allan@archlinux.org>
|
||||
|
||||
pkgname=python2-futures
|
||||
_pkgname=futures
|
||||
pkgver=2.2.0
|
||||
pkgrel=1
|
||||
pkgdesc="Backport of the concurrent.futures package from Python 3.2"
|
||||
arch=('any')
|
||||
url="http://code.google.com/p/pythonfutures/"
|
||||
license=('BSD')
|
||||
depends=('python2')
|
||||
source=("http://pypi.python.org/packages/source/f/$_pkgname/$_pkgname-$pkgver.tar.gz"
|
||||
LICENSE)
|
||||
md5sums=('310e446de8609ddb59d0886e35edb534'
|
||||
'dd6708d05936d3f6c4e20ed14c87b5e3')
|
||||
|
||||
build() {
|
||||
cd $_pkgname-$pkgver
|
||||
python2 setup.py build
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $_pkgname-$pkgver
|
||||
python2 setup.py install --root "$pkgdir" --optimize=1
|
||||
|
||||
install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
@ -1,27 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Rémy Oudompheng <remy@archlinux.org>
|
||||
|
||||
pkgname=python2-gd
|
||||
arch=('i686' 'x86_64')
|
||||
pkgver=0.58
|
||||
pkgrel=1
|
||||
pkgdesc="Python bindings for the gd library"
|
||||
license=("BSD")
|
||||
url="https://github.com/Solomoriah/gdmodule/"
|
||||
depends=('python2' 'gd')
|
||||
source=("$pkgname-$pkgver.tar.gz::https://github.com/Solomoriah/gdmodule/archive/v$pkgver.tar.gz")
|
||||
md5sums=('330edf336f38ede060908ce8bc6a6ce0')
|
||||
|
||||
build() {
|
||||
cd gdmodule-$pkgver
|
||||
python2 Setup.py build
|
||||
}
|
||||
|
||||
package_python2-gd() {
|
||||
cd gdmodule-$pkgver
|
||||
python2 Setup.py install --root="$pkgdir" --optimize=1
|
||||
|
||||
install -d "$pkgdir"/usr/share/licenses/python2-gd
|
||||
install -m644 LICENSE "$pkgdir"/usr/share/licenses/python2-gd
|
||||
}
|
@ -1,37 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
|
||||
|
||||
pkgname=python2-singledispatch
|
||||
pkgver=3.4.0.3
|
||||
pkgrel=1
|
||||
pkgdesc="Implementation of functools.singledispatch from Python 3.4"
|
||||
arch=('any')
|
||||
url="https://bitbucket.org/ambv/singledispatch"
|
||||
license=('MIT')
|
||||
depends=('python2')
|
||||
makedepends=('python2-setuptools')
|
||||
source=("https://pypi.python.org/packages/source/s/singledispatch/singledispatch-$pkgver.tar.gz" license)
|
||||
md5sums=('af2fc6a3d6cc5a02d0bf54d909785fcb'
|
||||
'360faaffcf297a20e20e2289af00ce07')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}"/singledispatch-$pkgver
|
||||
|
||||
sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
|
||||
$(find "${srcdir}" -name '*.py')
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}"/singledispatch-$pkgver
|
||||
|
||||
python2 setup.py build
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}"/singledispatch-$pkgver
|
||||
|
||||
python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
|
||||
|
||||
install -D "${srcdir}"/license "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
||||
|
@ -1,19 +0,0 @@
|
||||
Copyright (c) 2013 Łukasz Langa
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
@ -1,32 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
pkgname=rubiks
|
||||
pkgver=20070912
|
||||
pkgrel=1
|
||||
pkgdesc="Several programs for working with Rubik's cubes"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.sagemath.org"
|
||||
license=('GPL')
|
||||
depends=('gcc-libs')
|
||||
makedepends=()
|
||||
source=("http://www.sagemath.org/packages/upstream/$pkgname/$pkgname-$pkgver.tar.bz2" 'dietz-cu2-Makefile' 'dietz-mcube-Makefile' 'dietz-solver-Makefile' 'reid-Makefile')
|
||||
md5sums=('af005309b248f0bba49673a0e5ba3ce8'
|
||||
'817c6fccae52a5f4c839153ef5d7419f'
|
||||
'296780d7921fbdbefeef59e37770b8ce'
|
||||
'8bd416351a0e1e80078832270e7c9690'
|
||||
'3a1f748d4a556c2d0440b52cf715b38b')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
cp $srcdir/dietz-mcube-Makefile dietz/mcube/Makefile
|
||||
cp $srcdir/dietz-solver-Makefile dietz/solver/Makefile
|
||||
cp $srcdir/dietz-cu2-Makefile dietz/cu2/Makefile
|
||||
cp $srcdir/reid-Makefile reid/Makefile
|
||||
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
INSTALL=/usr/bin/install make PREFIX="$pkgdir"/usr install
|
||||
}
|
@ -1,38 +0,0 @@
|
||||
RM=rm -f
|
||||
INCLUDES=cu2.h config.h
|
||||
OBJS=cu2.o main.o
|
||||
LIBS=
|
||||
DBGCFLAGS=
|
||||
DBGLFLAGS=
|
||||
DBGOBJS=cu2.o.dbg main.o.dbg
|
||||
DBGLIBS=
|
||||
|
||||
all: build
|
||||
|
||||
debug: build-debug
|
||||
|
||||
build: $(OBJS)
|
||||
$(CXX) $(CXXFLAGS) -o cu2 $(OBJS) $(LIBS)
|
||||
|
||||
build-debug: $(DBGOBJS)
|
||||
$(CXX) $(DBGLFLAGS) -o cu2 $(OBJS) $(DBGLIBS)
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS)
|
||||
|
||||
distclean: clean
|
||||
$(RM) cu2
|
||||
|
||||
main.o: main.cpp $(INCLUDES)
|
||||
$(CXX) $(CXXFLAGS) -c main.cpp
|
||||
|
||||
cu2.o: cu2.cpp $(INCLUDES)
|
||||
$(CXX) $(CXXFLAGS) -c cu2.cpp
|
||||
|
||||
main.o.dbg: main.cpp $(INCLUDES)
|
||||
$(CXX) $(DBGCFLAGS) -c main.cpp
|
||||
|
||||
cu2.o.dbg: cu2.cpp $(INCLUDES)
|
||||
$(CXX) $(DBGCFLAGS) -c cu2.cpp
|
||||
|
||||
dummy:
|
@ -1,43 +0,0 @@
|
||||
# makefile for mcube with gcc on *nix by Eric
|
||||
# This makefile was seriously broken, using for example CPP for
|
||||
# the C++ compiler, CFLAGS for compiler flags for the C++ compiler
|
||||
# DBGCFLAGS was set to an empty value, but then used. Not a serious
|
||||
# issue, but as it was surpurflous, I removed it.
|
||||
# It was broken in other ways too numerous to mention.
|
||||
# Edited by David Kirkby, 29th Sept 2009
|
||||
|
||||
RM=rm -f
|
||||
INCLUDES=mcube.h config.h
|
||||
OBJS=mcube.o main.o
|
||||
DBGOBJS=mcube.o.dbg main.o.dbg
|
||||
DBGLIBS=
|
||||
|
||||
all: build
|
||||
|
||||
debug: build-debug
|
||||
|
||||
build: $(OBJS)
|
||||
$(CXX) $(CXXFLAGS) -o mcube $(OBJS) $(LIBS)
|
||||
|
||||
build-debug: $(DBGOBJS)
|
||||
$(CXX) $(CXXFLAGS) -o mcube $(OBJS) $(DBGLIBS)
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS)
|
||||
|
||||
distclean: clean
|
||||
$(RM) mcube
|
||||
|
||||
main.o: main.cpp $(INCLUDES)
|
||||
$(CXX) $(CXXFLAGS) -c main.cpp
|
||||
|
||||
mcube.o: mcube.cpp $(INCLUDES)
|
||||
$(CXX) $(CXXFLAGS) -c mcube.cpp
|
||||
|
||||
main.o.dbg: main.cpp $(INCLUDES)
|
||||
$(CXX) -c main.cpp
|
||||
|
||||
mcube.o.dbg: mcube.cpp $(INCLUDES)
|
||||
$(CXX) -c mcube.cpp
|
||||
|
||||
dummy:
|
@ -1,33 +0,0 @@
|
||||
# Makefile for cubex by Eric
|
||||
# This Makefile was seriously broken.
|
||||
# CC was set to g++. Since it was compiling C++ files,
|
||||
# CXX should have been used.
|
||||
# LINK was set to g++, so I changed that to LD
|
||||
# CFLAGS was set to -O2. I've removed that, so it can be set
|
||||
# in spkg-install.
|
||||
# In any case, it should have been CXXFLAGS
|
||||
# LFLAGS and INCLUDES were both empty
|
||||
# David Kirkby, 29th Sept 2009
|
||||
|
||||
INCLUDES=
|
||||
OBJS=cubex.o main.o
|
||||
RM=/bin/rm -f
|
||||
|
||||
all: build
|
||||
|
||||
build: $(OBJS)
|
||||
$(CXX) $(CXXFLAGS) -o cubex $(OBJS)
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS)
|
||||
|
||||
distclean: clean
|
||||
$(RM) cubex
|
||||
|
||||
cubex.o: cubex.cpp $(INCLUDES) cubex.h
|
||||
$(CXX) $(CXXFLAGS) -c cubex.cpp
|
||||
|
||||
main.o: main.cpp $(INCLUDES) cubex.h
|
||||
$(CXX) $(CXXFLAGS) -c main.cpp
|
||||
|
||||
dummy:
|
@ -1,8 +0,0 @@
|
||||
all: optimal twist
|
||||
|
||||
|
||||
clean:
|
||||
rm -f *.o
|
||||
|
||||
distclean: clean
|
||||
rm -f optimal twist
|
@ -1,21 +0,0 @@
|
||||
# $Id$
|
||||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
|
||||
_dbname=combinatorial_designs
|
||||
pkgname=sage-data-$_dbname
|
||||
pkgver=20140630
|
||||
pkgrel=1
|
||||
pkgdesc="Data for Combinatorial Designs"
|
||||
arch=('any')
|
||||
url="http://www.sagemath.org"
|
||||
license=('custom:public domain')
|
||||
depends=()
|
||||
makedepends=()
|
||||
source=("http://www.sagemath.org/packages/upstream/combinatorial_designs/$_dbname-$pkgver.tar.bz2")
|
||||
md5sums=('f345a6918b1bcf34fcd71c2f26d10de0')
|
||||
|
||||
package() {
|
||||
cd $_dbname-$pkgver
|
||||
mkdir -p "$pkgdir"/usr/share/sage/$_dbname
|
||||
install -m644 MOLS_table.txt "$pkgdir"/usr/share/sage/$_dbname
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user