[PR PATCH] pari: update to 2.13.0.

[PR PATCH] pari: update to 2.13.0.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages pari-2.13
https://github.com/void-linux/void-packages/pull/26306

pari: update to 2.13.0.
@motorto @dkwo Please test.

A patch file from https://github.com/void-linux/void-packages/pull/26306.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pari-2.13-26306.patch --]
[-- Type: text/x-diff, Size: 2170 bytes --]

From a5804eb76a441629dfaee2cf5d2ba99fd573b023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Nov 2020 06:20:25 +0700
Subject: [PATCH] pari: update to 2.13.0.

---
 srcpkgs/pari/template | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e6ecc4c58d..fb789a8646d 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,6 +1,6 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.11.4
+version=2.13.0
 revision=1
 build_style=configure
 build_helper=qemu
@@ -9,16 +9,31 @@ configure_args="--prefix=/usr"
 make_build_target=all
 make_check_target=test-all
 hostmakedepends="perl texlive"
-makedepends="gmp-devel libX11-devel readline-devel"
+makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum="bfc88fc4f7352f4840e6e352c72f0369cbea8a45403b1834a6269f3709970b1c"
+checksum=c811946de9d2c1ed0e97ff08e80d966f9a0b55848b7688406fab229e3948ba93
+
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
-	vsed -i -e 's/ulong/unsigned long/' config/has_sse2.c
+	local _date
+	# Reproducibility
+	_date=$(date +"%b %d %Y")
+	vsed -i -e "s/__DATE__/\"$_date\"/" src/language/paricfg.c
+
+	# sse2 is not available on all i686
+	# and it's available on all x86_64
+	if [ "${XBPS_TARGET_MACHINE%-musl}" != x86_64 ]; then
+		echo 'int main() { return 1; }' > config/has_sse2.c
+	else
+		echo 'int main() { return 0; }' > config/has_sse2.c
+	fi
+
 	cat <<-EOF >config/arch-osname
 	#!/bin/sh
 	echo "${XBPS_TARGET_MACHINE%-musl}-linux"
@@ -34,7 +49,7 @@ pre_configure() {
 
 pari-devel_package() {
 	short_desc+=" - development files"
-	depends="pari-${version}_${revision}"
+	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

Re: pari: update to 2.13.0.

[motorto]

[-- Attachment #1: Type: text/plain, Size: 1109 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/26306#issuecomment-725956409

Comment:
Can't seem to compile it

'''
=> ERROR: libreadline8-8.0.004_1: failed to install 'ncurses-devel-6.2_3' dependency! (error 19)
ncurses-libs-6.2_3 in transaction breaks installed pkg `ncurses-6.2_4'
Transaction aborted due to unresolved dependencies.
=> ERROR: Please see above for the real error, exiting...
'''

On 2020/11/11 15:31, Đoàn Trần Công Danh wrote:
> @motorto @dkwo Please test.
> You can view, comment on, or merge this pull request online at:
> 
>   https://github.com/void-linux/void-packages/pull/26306
> 
> -- Commit Summary --
> 
>   * pari: update to 2.13.0.
> 
> -- File Changes --
> 
>     M srcpkgs/pari/template (25)
> 
> -- Patch Links --
> 
> https://github.com/void-linux/void-packages/pull/26306.patch
> https://github.com/void-linux/void-packages/pull/26306.diff
> 
> -- 
> You are receiving this because you were mentioned.
> Reply to this email directly or view it on GitHub:
> https://github.com/void-linux/void-packages/pull/26306

Re: pari: update to 2.13.0.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 580 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26306#issuecomment-726117785

Comment:
On 2020-11-12 01:27:11-0800, André Cerqueira <notifications@github.com> wrote:
> Can't seem to compile it
> 
> '''
> => ERROR: libreadline8-8.0.004_1: failed to install 'ncurses-devel-6.2_3' dependency! (error 19)
> ncurses-libs-6.2_3 in transaction breaks installed pkg `ncurses-6.2_4'
> Transaction aborted due to unresolved dependencies.
> => ERROR: Please see above for the real error, exiting...
> '''

Please update your void-packages.

Re: pari: update to 2.13.0.

[motorto]

[-- Attachment #1: Type: text/plain, Size: 994 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/26306#issuecomment-726174074

Comment:
You are totally right ! Forgot that sorry.

The program does compile and seems to be working fine (tested with some 
small functions) 


On 2020/11/12 06:38, Đoàn Trần Công Danh wrote:
> On 2020-11-12 01:27:11-0800, André Cerqueira <notifications@github.com> wrote:
> > Can't seem to compile it
> > 
> > '''
> > => ERROR: libreadline8-8.0.004_1: failed to install 'ncurses-devel-6.2_3' dependency! (error 19)
> > ncurses-libs-6.2_3 in transaction breaks installed pkg `ncurses-6.2_4'
> > Transaction aborted due to unresolved dependencies.
> > => ERROR: Please see above for the real error, exiting...
> > '''
> 
> Please update your void-packages.
> 
> 
> -- 
> You are receiving this because you were mentioned.
> Reply to this email directly or view it on GitHub:
> https://github.com/void-linux/void-packages/pull/26306#issuecomment-726117785

Re: pari: update to 2.13.0.

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/26306#issuecomment-726365023

Comment:
It builds and works fine on x86_64-musl as well, thank you.
I will try to build sagemath using this version soon, but first I'd like to update isl or isl15.

Re: pari: update to 2.13.0.

[motorto]

[-- Attachment #1: Type: text/plain, Size: 1061 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/26306#issuecomment-726174074

Comment:
You are totally right ! Forgot that sorry.

The program does compile and seems to be working fine (tested with some 
small functions) 

Forgot to say that I am on x86_64 glibc


On 2020/11/12 06:38, Đoàn Trần Công Danh wrote:
> On 2020-11-12 01:27:11-0800, André Cerqueira <notifications@github.com> wrote:
> > Can't seem to compile it
> > 
> > '''
> > => ERROR: libreadline8-8.0.004_1: failed to install 'ncurses-devel-6.2_3' dependency! (error 19)
> > ncurses-libs-6.2_3 in transaction breaks installed pkg `ncurses-6.2_4'
> > Transaction aborted due to unresolved dependencies.
> > => ERROR: Please see above for the real error, exiting...
> > '''
> 
> Please update your void-packages.
> 
> 
> -- 
> You are receiving this because you were mentioned.
> Reply to this email directly or view it on GitHub:
> https://github.com/void-linux/void-packages/pull/26306#issuecomment-726117785

Re: pari: update to 2.13.0.

[motorto]

[-- Attachment #1: Type: text/plain, Size: 1072 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/26306#issuecomment-726174074

Comment:
You are totally right ! Forgot that sorry.

The program does compile and seems to be working fine (tested with some 
small functions) 


EDIT:  
Forgot to say that I am on x86_64 glibc


On 2020/11/12 06:38, Đoàn Trần Công Danh wrote:
> On 2020-11-12 01:27:11-0800, André Cerqueira <notifications@github.com> wrote:
> > Can't seem to compile it
> > 
> > '''
> > => ERROR: libreadline8-8.0.004_1: failed to install 'ncurses-devel-6.2_3' dependency! (error 19)
> > ncurses-libs-6.2_3 in transaction breaks installed pkg `ncurses-6.2_4'
> > Transaction aborted due to unresolved dependencies.
> > => ERROR: Please see above for the real error, exiting...
> > '''
> 
> Please update your void-packages.
> 
> 
> -- 
> You are receiving this because you were mentioned.
> Reply to this email directly or view it on GitHub:
> https://github.com/void-linux/void-packages/pull/26306#issuecomment-726117785

Re: [PR PATCH] [Updated] pari: update to 2.13.0.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages pari-2.13
https://github.com/void-linux/void-packages/pull/26306

pari: update to 2.13.0.
@motorto @dkwo Please test.

A patch file from https://github.com/void-linux/void-packages/pull/26306.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pari-2.13-26306.patch --]
[-- Type: text/x-diff, Size: 2392 bytes --]

From 47d3c5812bce8ad71b7055a417e71918d147b551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Nov 2020 06:20:25 +0700
Subject: [PATCH] pari: update to 2.13.0.

---
 srcpkgs/pari/template | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e6ecc4c58d..fddb1dfcd5e 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,6 +1,6 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.11.4
+version=2.13.0
 revision=1
 build_style=configure
 build_helper=qemu
@@ -9,16 +9,26 @@ configure_args="--prefix=/usr"
 make_build_target=all
 make_check_target=test-all
 hostmakedepends="perl texlive"
-makedepends="gmp-devel libX11-devel readline-devel"
+makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum="bfc88fc4f7352f4840e6e352c72f0369cbea8a45403b1834a6269f3709970b1c"
+checksum=c811946de9d2c1ed0e97ff08e80d966f9a0b55848b7688406fab229e3948ba93
+
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
-	vsed -i -e 's/ulong/unsigned long/' config/has_sse2.c
+	# sse2 is not available on all i686
+	# and it's available on all x86_64
+	if [ "${XBPS_TARGET_MACHINE%-musl}" != x86_64 ]; then
+		echo 'int main() { return 1; }' > config/has_sse2.c
+	else
+		echo 'int main() { return 0; }' > config/has_sse2.c
+	fi
+
 	cat <<-EOF >config/arch-osname
 	#!/bin/sh
 	echo "${XBPS_TARGET_MACHINE%-musl}-linux"
@@ -26,6 +36,12 @@ post_patch() {
 }
 
 pre_configure() {
+	local _date
+	# Reproducibility
+	# date's wrapper is not available in do_patch
+	_date=$(date +"%b %d %Y")
+	vsed -i -e "s/__DATE__/\"$_date\"/" src/language/paricfg.c
+
 	export LD="$CC"
 	if [ "$CROSS_BUILD" ]; then
 		export RUNTEST="/usr/bin/qemu-$XBPS_TARGET_QEMU_MACHINE-static"
@@ -34,7 +50,7 @@ pre_configure() {
 
 pari-devel_package() {
 	short_desc+=" - development files"
-	depends="pari-${version}_${revision}"
+	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

Re: [PR PATCH] [Merged]: pari: update to 2.13.0.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

There's a merged pull request on the void-packages repository

pari: update to 2.13.0.
https://github.com/void-linux/void-packages/pull/26306

Description:
@motorto @dkwo Please test.