[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/giac/, sci-mathematics/giac/files/

["Michael Orlitzky" <mjo@gentoo.org>]

commit:     78c461e76cd6cf349fc2fda89618b2cfa56fe60f
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 02:19:12 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 12:56:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c461e7

sci-mathematics/giac: add 1.9.0.67, drop 1.9.0.55-r1

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 sci-mathematics/giac/Manifest                      |  2 +-
 .../files/giac-1.9.0.67-glibcxx-assertions.patch   | 30 ++++++++++++++++++++++
 ...l2ps.patch => giac-1.9.0.67-system-gl2ps.patch} | 30 +++++++++++-----------
 ...iac-1.9.0.55-r1.ebuild => giac-1.9.0.67.ebuild} |  4 +--
 4 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index c7aa8276edf2..0ba59daf473f 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,2 +1,2 @@
 DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
-DIST giac_1.9.0-55.tar.gz 113729553 BLAKE2B 8e95693623cfc8558e9a3b2dcc5e11cdbc4f2e25f0c2e88322dee986c5e010a63ced682bdbcb8b6dda61c8309477e8a106360a56f3a88d76043359bdb64f5d61 SHA512 c8043893fbe8951662c6c2fdd53adf6d2602ae7d3810254cd76d8478992005d9320de5e6be9453a03d5ed976900ec7721790ee61dace58e7121e0cfc330ecad9
+DIST giac_1.9.0-67.tar.gz 114193594 BLAKE2B aaa43b9b0eb9db04b55f995e4b47a5513a6a7238111d63900a33e8cc0d632cc24f1136e2bc5a2e3d6109fbd06405105684e571eacea5f887ef96f0f70a51adf5 SHA512 c03a7d22ea64f6281671eace533b7d7581ed3a3af060c112f8634fc7f13d450ba42568d9e26f8d8736e851f53ba1e9de8482fdb775427b71fcd78e2ca0ba4a69

diff --git a/sci-mathematics/giac/files/giac-1.9.0.67-glibcxx-assertions.patch b/sci-mathematics/giac/files/giac-1.9.0.67-glibcxx-assertions.patch
new file mode 100644
index 000000000000..dcdcfb5a728e
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.67-glibcxx-assertions.patch
@@ -0,0 +1,30 @@
+From 8fa2b53ee0db1827a4ddd88a7e754a7b1d91ca2c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 25 Aug 2023 20:33:31 -0400
+Subject: [PATCH 1/1] configure.ac: delete _GLIBCXX_ASSERTIONS override
+
+This was added upstream when it was pointed out that the codebase
+contains undefined behavior that triggers glibcxx's assertions.
+Disabling the assertions without fixing the undefined behavior is not
+a satisfactory solution, so we drop the override.
+---
+ configure.ac | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d66c3e1..6fef28b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,10 +45,6 @@ GINAC_STD_CXX_HEADERS
+ AC_CHECK_HEADERS(regex)
+ AC_CHECK_FUNCS(tgammaf)
+ 
+-dnl CXXFLAGS="$CXXFLAGS -std=c++0x"
+-dnl avoid "security" checks for vectors
+-CXXFLAGS="$CXXFLAGS -U_GLIBCXX_ASSERTIONS"
+-
+ dnl Define DOUBLEVAL if bigendian
+ if test "x$ac_cv_c_bigendian" = "xyes"; then
+ 	CXXFLAGS="$CXXFLAGS -DDOUBLEVAL"
+-- 
+2.41.0

diff --git a/sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch b/sci-mathematics/giac/files/giac-1.9.0.67-system-gl2ps.patch
similarity index 80%
rename from sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch
rename to sci-mathematics/giac/files/giac-1.9.0.67-system-gl2ps.patch
index e82d892560da..88c0fbc4f5a8 100644
--- a/sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch
+++ b/sci-mathematics/giac/files/giac-1.9.0.67-system-gl2ps.patch
@@ -1,7 +1,7 @@
-From ca8eda770e36d2649bfc808464415308a5e9fc47 Mon Sep 17 00:00:00 2001
+From 753b67c88d7feb166cf99243118943c09beba62a Mon Sep 17 00:00:00 2001
 From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 6 Jul 2023 21:27:09 -0400
-Subject: [PATCH 1/1] src: unbundle gl2ps.
+Date: Mon, 30 Oct 2023 21:40:57 -0400
+Subject: [PATCH 1/1] src: unbundle gl2ps
 
 Updated patch based on the one by infinity0@debian.org. Ours links
 only libxcas (and not libgiac) to gl2ps.
@@ -12,10 +12,10 @@ only libxcas (and not libgiac) to gl2ps.
  3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 8e1813e..2f7f644 100644
+index d66c3e1..2acbf30 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -465,6 +465,10 @@ dnl		AC_CHECK_LIB(GLU, main)
+@@ -469,6 +469,10 @@ dnl		AC_CHECK_LIB(GLU, main)
  	      AC_CHECK_LIB(fltk_images, main)
  	      FLTK_LIBS="$LIBS $X_LIBS"
  	      AC_SUBST(FLTK_LIBS)
@@ -27,20 +27,20 @@ index 8e1813e..2f7f644 100644
             fi
          fi
 diff --git a/src/Graph3d.cc b/src/Graph3d.cc
-index 7f54327..12d4723 100644
+index e653cc4..a6c3468 100644
 --- a/src/Graph3d.cc
 +++ b/src/Graph3d.cc
-@@ -45,7 +45,7 @@
- #include "Xcas1.h"
- #include "Cfg.h"
- #include "Print.h"
+@@ -23,7 +23,7 @@
+ #define __CARBONSOUND__
+ #ifdef HAVE_LIBFLTK
+ #ifdef HAVE_LIBFLTK_GL
 -#include "gl2ps.h"
 +#include <gl2ps.h>
- 
- #ifdef __APPLE__
- //#include <OpenGL/gl.h>
+ #else
+ void gl_font(int fontid, int size){}
+ void gl_draw(const char *){}
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 3fdd209..120ccb6 100644
+index 7c90381..2ae8003 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -35,17 +35,17 @@ libbf.h list.h cutils.h qjsgiac.h \
@@ -65,5 +65,5 @@ index 3fdd209..120ccb6 100644
  ##libjavagiac_la_LIBADD = libgiac.la 
  
 -- 
-2.39.3
+2.41.0
 

diff --git a/sci-mathematics/giac/giac-1.9.0.55-r1.ebuild b/sci-mathematics/giac/giac-1.9.0.67.ebuild
similarity index 97%
rename from sci-mathematics/giac/giac-1.9.0.55-r1.ebuild
rename to sci-mathematics/giac/giac-1.9.0.67.ebuild
index ecc901270b63..a9165fd96178 100644
--- a/sci-mathematics/giac/giac-1.9.0.55-r1.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.67.ebuild
@@ -51,11 +51,11 @@ BDEPEND="dev-tex/hevea
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
-	"${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
 	"${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
 	"${FILESDIR}/${PN}-1.9.0.55-pari-2.15-test.patch"
 	"${FILESDIR}/${PN}-1.9.0.55-undefined-behavior.patch"
-	"${FILESDIR}/${PN}-1.9.0.55-system-gl2ps.patch"
+	"${FILESDIR}/${PN}-1.9.0.67-system-gl2ps.patch"
+	"${FILESDIR}/${PN}-1.9.0.67-glibcxx-assertions.patch"
 )
 
 REQUIRED_USE="test? ( gui )"