From 99ea017a869ff1f7e6df7c9a99542a763cde952f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 12 Dec 2021 23:48:01 -0300 Subject: [PATCH] lcalc: update to 2.0.4. --- common/shlibs | 2 +- srcpkgs/lcalc/files/test | 30 ---------- srcpkgs/lcalc/files/test.out | 112 ----------------------------------- srcpkgs/lcalc/template | 69 ++++----------------- 4 files changed, 14 insertions(+), 199 deletions(-) delete mode 100644 srcpkgs/lcalc/files/test delete mode 100644 srcpkgs/lcalc/files/test.out diff --git a/common/shlibs b/common/shlibs index 8c7f5cf3a1..a634e46b47 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4025,7 +4025,7 @@ libflint.so.16 flintlib-2.8.0_1 libarb.so.2 arb-2.20.0_1 libec.so.8 eclib-20210625_1 libsymmetrica.so.2 symmetrica-3.0.1_1 -libLfunction.so lcalc-1.23_2 +libLfunction.so.1 lcalc-2.0.4_1 liblrcalc.so.1 lrcalc-1.2_1 libwayland-client++.so.0 libwaylandpp-0.2.8_1 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1 diff --git a/srcpkgs/lcalc/files/test b/srcpkgs/lcalc/files/test deleted file mode 100644 index de1f2a6b34..0000000000 --- a/srcpkgs/lcalc/files/test +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/sh -# -# Quick minimal test for lcalc. -# -# Test running the main binary (lcalc) and running the provided -# example program which is dynamically linked to the library. -# Also test that loading of L-function data files works. -# -# The precision is truncated at 13 (rather than the default 14), -# otherwise the output could vary a little bit depending on -# architecture and compiler flags. For the example program we -# patch-round using sed the two outputs that seem to vary. -# -echo "### First 1000 zeros of zeta function" -./lcalc -z 10 -P 13 -echo -echo "### Analytic rank of elliptic curve 5077a1" -./lcalc -e --a1=0 --a2=0 --a3=1 --a4=-7 --a6=6 -r -echo -echo "### run example program" -# do some ad hoc rounding to avoid minor differences -LD_LIBRARY_PATH=. example_programs/example | sed -e ' - s/\(L4(1,0) = ([0-9.]*\)[0-9],/\1,/; - s/6.123[0-9]*e-17/6.123e-17/' -echo -echo "### test data files: zeros of data_mass" -./lcalc -F example_data_files/data_maass -z 10 -P 13 -echo -echo "### test data files: zeros of data_tau" -./lcalc -F example_data_files/data_tau -z 10 -P 13 diff --git a/srcpkgs/lcalc/files/test.out b/srcpkgs/lcalc/files/test.out deleted file mode 100644 index b8e661e7e6..0000000000 --- a/srcpkgs/lcalc/files/test.out +++ /dev/null @@ -1,112 +0,0 @@ -### First 1000 zeros of zeta function - 14.1347251417 - 21.0220396388 - 25.0108575801 - 30.4248761259 - 32.9350615877 - 37.5861781588 - 40.9187190121 - 43.3270732809 - 48.0051508812 - 49.7738324777 - -### Analytic rank of elliptic curve 5077a1 -analytic rank equals 3 - -### run example program ------------------------------------------------ - -Name of L_function: zeta -All coefficients are equal to 1 - -Q = 0.564189583548 -OMEGA = (1,0) -a = 1 (the quasi degree) -gamma[1] =0.5 lambda[1] =(0,0) - - -number of poles (of the completed L function) = 2 -pole[1] =(1,0) residue[1] =(1,0) -pole[2] =(0,0) residue[2] =(-1,0) ------------------------------------------------ - ------------------------------------------------ - -Name of L_function: L4 -number of dirichlet coefficients = 4 -coefficients are periodic -b[1] = 1 -b[2] = 0 -b[3] = -1 -b[4] = 0 - -Q = 1.1283791671 -OMEGA = (1,0) -a = 1 (the quasi degree) -gamma[1] =0.5 lambda[1] =(0.5,0) - - -number of poles (of the completed L function) = 0 ------------------------------------------------ - ------------------------------------------------ - -Name of L_function: L5 -number of dirichlet coefficients = 5 -coefficients are periodic -b[1] = (1,0) -b[2] = (0,1) -b[3] = (-0,-1) -b[4] = (-1,0) -b[5] = (0,0) - -Q = 1.26156626101 -OMEGA = (0.850650808352,0.525731112119) -a = 1 (the quasi degree) -gamma[1] =0.5 lambda[1] =(0.5,0) - - -number of poles (of the completed L function) = 0 ------------------------------------------------ - -zeta(0.5,0) = (-1.46035450881,0) -L4(0.5,0) = (0.6676914571896,0) -L5(0.5,0) = (0.7637478801173,0.2169647675189) -L4(1,0) = (0.785398163397,0) -L5(1,0) = (0.8648062659772,0.2041530661384) -0.4285714285714 -1.5 -0.1666666666667 -0.6666666666667 -0.5714285714286 -0 -0.5714285714286 -0.5714285714286 -0 -0.8888888888889 -6.123e-17 --0.7071067811865 - -### test data files: zeros of data_mass - 2.8977246783 - 5.5912453153 - 21.0903775087 - 23.1575104846 - 25.4393003898 - 29.1892067135 - 31.0617394845 - 32.4527182375 - 34.027279684 - 36.9312371969 - -### test data files: zeros of data_tau - 9.22237939992 - 13.9075498614 - 17.4427769782 - 19.656513142 - 22.3361036372 - 25.2746365481 - 26.8043911584 - 28.8316826242 - 31.1782094984 - 32.7748753822 diff --git a/srcpkgs/lcalc/template b/srcpkgs/lcalc/template index 1b3df018d5..a030c96039 100644 --- a/srcpkgs/lcalc/template +++ b/srcpkgs/lcalc/template @@ -1,66 +1,21 @@ # Template file for 'lcalc' pkgname=lcalc -version=1.23 -revision=2 -build_wrksrc="src" -build_style=gnu-makefile +version=2.0.4 +revision=1 +build_style=gnu-configure +configure_args="--with-pari" +hostmakedepends="automake libtool pkg-config gengetopt" makedepends="gmp-devel pari-devel" short_desc="Michael Rubinstein's L-function calculator" maintainer="Gonzalo Tornaría " license="GPL-2.0-or-later" -homepage="https://mirrors.mit.edu/sage/spkg/upstream/lcalc/" -distfiles="https://mirrors.mit.edu/sage/spkg/upstream/lcalc/lcalc-${version}.tar.bz2" -checksum="83d4253ec2f38553b21190d6d0c6b71bab7ea14717f6dde5bd18f60775d3cdb0 - bd39a43b24a332e1826e667f85ca2ce2ca14749d56f60069cd886c96f55e9e3c - d8c660f68f33b6eeb4b801d4028faaaaccbfff5797efe654bb6367e0a687542d - dadf6fc6d481595cb041f8b0dd92bc2e2bc390cbb3e0dd36b7fe63b74942db26 - 342cde1c9effda48597bfee439acb37c91458a100580c97c84da6a142d2cc5b6 - 55c6c9f969593f24c75a85e7a150b876671356aa68ceb8e77c563a645897643e - 906ef33de15bb0d94883b7797d8cb3c889b9f59bceebeb171e65f1546faf1c37 - 437e3870342ef4cb5749398ead9381504403e7e1f99efadab95f4a607678b400 - 6471f2f30497486e289fc8977cbb89c495cf0d5ff58af2b1f479a497a28165e6 - dde1f80b0ca42fb43917c24e6016c19e4a8d28de9c50cd0a523a318866bdc0eb - 941d4ac025f5d6f0142fb785b27f7a221729466dc83d45fd206cce102c012eaf - 045f23ea9131b8039001c8f13d22152f7b3c2e91adcf8c555354eaf39e7a7b48" -shlib_provides="libLfunction.so" +homepage="https://gitlab.com/sagemath/lcalc" +changelog="https://gitlab.com/sagemath/lcalc/-/raw/master/doc/ChangeLog" +distfiles="https://gitlab.com/sagemath/lcalc/-/archive/${version}/lcalc-${version}.tar.bz2" +checksum=28b9d33307d0aa002accf6950fa4547df8c6764df8d025bc8523aa857423417b -# get patches from sagemath -_patchurl="https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches" -_patchtag="?h=9.3.rc2" -_patches=" - Lcommon.h.patch - Lvalue.h.patch - Makefile.patch - clang.patch - lcalc-1.23_default_parameters_1.patch - lcalc-1.23_default_parameters_2.patch - pari-2.7.patch - pari-mem.patch - pari_include.patch - time.h.patch - using_namespace_std.patch" -for patch in $_patches ; do - distfiles+=" ${_patchurl}/${patch}${_patchtag}>${patch}" -done -skip_extraction="$_patches" - -post_extract() { - for patch in $_patches ; do - patch -p1 < "$XBPS_SRCDISTDIR/${pkgname}-${version}/${patch}" - done -} - -CXXFLAGS="-fPIC -Wno-deprecated" - -pre_install() { - mkdir -p ${DESTDIR}/usr/{bin,lib,include} - make_install_args+=" INSTALL_DIR=${DESTDIR}/usr" -} - -do_check() { - echo "Testing lcalc ..." - sh "${FILESDIR}"/test > test.log - diff "${FILESDIR}"/test.out test.log && echo PASS +pre_configure() { + autoreconf -fi } lcalc-devel_package() { @@ -68,5 +23,7 @@ lcalc-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" } }