Date: Wednesday, October 19, 2016 @ 14:31:34 Author: arojas Revision: 192590
Update to 4.0.3.p4 Modified: singular/trunk/PKGBUILD Deleted: singular/trunk/singular-datadir.patch ------------------------+ PKGBUILD | 16 ++++++++-------- singular-datadir.patch | 19 ------------------- 2 files changed, 8 insertions(+), 27 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-10-19 14:17:48 UTC (rev 192589) +++ PKGBUILD 2016-10-19 14:31:34 UTC (rev 192590) @@ -4,9 +4,9 @@ pkgname=singular _majver=4-0-3 -_patchver=3 +_patchver=4 pkgver=${_majver//-/.}.p${_patchver} -pkgrel=2 +pkgrel=1 pkgdesc="Computer Algebra System for polynomial computations" arch=(i686 x86_64) url="http://www.singular.uni-kl.de/" @@ -14,15 +14,15 @@ depends=(flint cddlib) # polymake makedepends=(doxygen python2) optdepends=('python2: Python interface') -source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}p${_patchver}.tar.gz" - singular-datadir.patch) -md5sums=('129a642d9dca9efe6015e38935b0c6f7' - '489a368564957ce863941612fed038a3') +source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}p${_patchver}.tar.gz" + singular-ntl10.patch::"https://github.com/Singular/Sources/commit/861b7899.patch") +md5sums=('5b5c67b2ff2e8fa12d2fc5afc327e2d8' + '3dce1e6533a1b4686f9730e0b534df65') prepare() { cd singular-${_majver//-/.} -# Fix paths in .desktop files - patch -p1 -i ../singular-datadir.patch +# Fix build with NTL 10 + patch -p1 -i ../singular-ntl10.patch } build() { Deleted: singular-datadir.patch =================================================================== --- singular-datadir.patch 2016-10-19 14:17:48 UTC (rev 192589) +++ singular-datadir.patch 2016-10-19 14:31:34 UTC (rev 192590) @@ -1,19 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index b90379a..822c9d6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -202,12 +202,12 @@ AC_DEFINE_UNQUOTED([BIN_DIR],"$config_bindir",[bindir]) - AX_RECURSIVE_EVAL([[$]datadir], [config_datadir]) - AX_NORMALIZE_PATH([config_datadir],['/']) - AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir]) --AC_SUBST(DATA_DIR) -+AC_SUBST(DATA_DIR, "$config_datadir") - - AX_RECURSIVE_EVAL([[$]docdir], [config_docdir]) - AX_NORMALIZE_PATH([config_docdir],['/']) - AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir]) --AC_SUBST(DOC_DIR) -+AC_SUBST(DOC_DIR, "$config_docdir") - - SING_SHOW_FLAGS([Compiler/linker flags: ]) -