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

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

[Michael Orlitzky]

commit:     28248bae50dcc098de86226fb32efa7143a1c945
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 16:29:51 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 16:31:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28248bae

sci-mathematics/giac: drop unused patch

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

 .../files/giac-1.9.0.67-glibcxx-assertions.patch   | 30 ----------------------
 1 file changed, 30 deletions(-)

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
deleted file mode 100644
index dcdcfb5a728e..000000000000
--- a/sci-mathematics/giac/files/giac-1.9.0.67-glibcxx-assertions.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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

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

[Conrad Kostecki]

commit:     ccb3314faadf6a1a39f30084728081b7179c7a17
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Mar  9 09:43:46 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 12:13:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb3314f

sci-mathematics/giac: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../giac/files/giac-1.9.0.55-pari-2.15-test.patch  | 10 ----
 .../files/giac-1.9.0.55-undefined-behavior.patch   | 62 ----------------------
 2 files changed, 72 deletions(-)

diff --git a/sci-mathematics/giac/files/giac-1.9.0.55-pari-2.15-test.patch b/sci-mathematics/giac/files/giac-1.9.0.55-pari-2.15-test.patch
deleted file mode 100644
index 956ade485edd..000000000000
--- a/sci-mathematics/giac/files/giac-1.9.0.55-pari-2.15-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-https://github.com/void-linux/void-packages/blob/master/srcpkgs/giac/patches/giac-pari-2.15-test.patch
-
---- a/check/chk_fhan4	2018-03-13 15:27:11.000000000 -0300
-+++ b/check/chk_fhan4	2022-10-14 18:51:12.604731890 -0300
-@@ -1,4 +1,5 @@
- #! /bin/sh
- unset LANG
-+export PARI_SIZE=2048000
- ../src/icas TP04-sol.cas > TP04.tst
- diff TP04.tst TP04-sol.cas.out1

diff --git a/sci-mathematics/giac/files/giac-1.9.0.55-undefined-behavior.patch b/sci-mathematics/giac/files/giac-1.9.0.55-undefined-behavior.patch
deleted file mode 100644
index 78eac91a5244..000000000000
--- a/sci-mathematics/giac/files/giac-1.9.0.55-undefined-behavior.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From fc0fb5ba02953d6e15424ce3a2d8f5b52380ffb4 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sun, 25 Jun 2023 13:43:35 -0400
-Subject: [PATCH 1/1] src/vecteur.cc: fix invalid vector indexing.
-
-A few places in vector.cc use the construct &buffer[n]-m where
-"buffer" is an std::vector and "n" its size. This is undefined
-behavior since the index is outside of the allowed range (0 through
-n-1). With GLIBCXX_ASSERTIONS enabled, it crashes on the out-of-
-bounds index.
-
-The most obvious fix is to use &buffer[n-1]-(m+1), which avoids the
-issue so long as n >= 1. I think this will always be the case in the
-affected code, but if I'm wrong, it can be fixed by adding a special
-case for n == 0.
----
- src/vecteur.cc | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/vecteur.cc b/src/vecteur.cc
-index 89b1445..c91af66 100644
---- a/src/vecteur.cc
-+++ b/src/vecteur.cc
-@@ -7998,7 +7998,7 @@ namespace giac {
- 	if (convertpos){
- 	  int C=col+1;
- 	  longlong * buf=&buffer[C];
--	  longlong * bufend=&buffer[cmax]-8;
-+	  longlong * bufend=&buffer[cmax-1]-7;
- 	  const int * nline=&Nline[C];
- 	  for (;buf<=bufend;buf+=8,nline+=8){
- 	    longlong x,y;
-@@ -8022,7 +8022,7 @@ namespace giac {
- 	else {
- 	  int C=col+1;
- 	  longlong * buf=&buffer[C];
--	  longlong * bufend=&buffer[cmax]-8;
-+	  longlong * bufend=&buffer[cmax-1]-7;
- 	  const int * nline=&Nline[C];
- 	  for (;buf<=bufend;buf+=8,nline+=8){
- 	    buf[0] -= coeff*nline[0];
-@@ -8268,7 +8268,7 @@ namespace giac {
- 	    }
- #else
- 	    int C=col+1;
--	    longlong * ptr= &buffer[C],*ptrend=&buffer[cmax]-4;
-+	    longlong * ptr= &buffer[C],*ptrend=&buffer[cmax-1]-3;
- 	    const int *ptrN=&Nline[C];
- 	    for (;ptr<ptrend;ptrN+=4,ptr+=4){
- 	      longlong x = *ptr;
-@@ -8300,7 +8300,7 @@ namespace giac {
- 	  }
- 	  else {
- 	    int C=col+1;
--	    longlong * ptr= &buffer[C],*ptrend=&buffer[cmax]-4;
-+	    longlong * ptr= &buffer[C],*ptrend=&buffer[cmax-1] - 3;
- 	    const int *ptrN=&Nline[C];
- 	    for (;ptr<ptrend;ptrN+=4,ptr+=4){
- 	      *ptr -= coeff*(*ptrN);
--- 
-2.39.3
-

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

[Michael Orlitzky]

commit:     b1389d8b3ff59a19d19298e5217611ed810cbe53
Author:     François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Sun Aug 25 22:27:51 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 23:48:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1389d8b

sci-mathematics/giac: Update glibcxx assertion patch for a more complete coverage.

Signed-off-by: François Bissey <frp.bissey <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 .../giac/files/giac-1.9.0.995-glibcxx-assertions.patch  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/sci-mathematics/giac/files/giac-1.9.0.995-glibcxx-assertions.patch b/sci-mathematics/giac/files/giac-1.9.0.995-glibcxx-assertions.patch
index 60172a814d2c..4c0d6d7d8d0a 100644
--- a/sci-mathematics/giac/files/giac-1.9.0.995-glibcxx-assertions.patch
+++ b/sci-mathematics/giac/files/giac-1.9.0.995-glibcxx-assertions.patch
@@ -19,3 +19,20 @@ index 96b0223..cdc5618 100644
  
  dnl Define DOUBLEVAL if bigendian
  if test "x$ac_cv_c_bigendian" = "xyes"; then
+diff --git a/src/first.h b/src/first.h
+index 7852c73..21e15b9 100644
+--- a/src/first.h
++++ b/src/first.h
+@@ -25,9 +25,9 @@
+ #define register 
+ 
+ 
+-#ifdef _GLIBCXX_ASSERTIONS
+-#undef _GLIBCXX_ASSERTIONS
+-#endif
++// #ifdef _GLIBCXX_ASSERTIONS
++// #undef _GLIBCXX_ASSERTIONS
++// #endif
+ 
+ #if defined NUMWORKS && !defined SDL_KHICAS
+ #define KHICAS 1

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

[Andreas Sturmlechner]

commit:     d46ff72f832ed30c12935f9b91471a59149835bf
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Sep 19 17:39:15 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 16:35:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46ff72f

sci-mathematics/giac: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/38692
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/giac-1.9.0.93-glibcxx-assertions.patch   | 31 -----------
 .../files/giac-1.9.0.93-no-fltk-buildfix.patch     | 60 ----------------------
 2 files changed, 91 deletions(-)

diff --git a/sci-mathematics/giac/files/giac-1.9.0.93-glibcxx-assertions.patch b/sci-mathematics/giac/files/giac-1.9.0.93-glibcxx-assertions.patch
deleted file mode 100644
index d11eaf9ab01d..000000000000
--- a/sci-mathematics/giac/files/giac-1.9.0.93-glibcxx-assertions.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 77a08fddd1687e245f9f7567376f858607a76db0 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Mon, 4 Mar 2024 10:58:21 -0500
-Subject: [PATCH] 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 | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 62b63fb..3e4909f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,9 +46,8 @@ AC_CHECK_HEADERS(regex)
- AC_CHECK_FUNCS(tgammaf)
- 
- dnl CXXFLAGS="$CXXFLAGS -std=c++0x"
--dnl avoid "security" checks for vectors
- dnl -DUSE_OBJET_BIDON added because xcas::localisation() does not load locales correctly for modules loaded before main() is executed
--CXXFLAGS="$CXXFLAGS -U_GLIBCXX_ASSERTIONS -DUSE_OBJET_BIDON"
-+CXXFLAGS="$CXXFLAGS -DUSE_OBJET_BIDON"
- 
- dnl Define DOUBLEVAL if bigendian
- if test "x$ac_cv_c_bigendian" = "xyes"; then
--- 
-2.43.0
-

diff --git a/sci-mathematics/giac/files/giac-1.9.0.93-no-fltk-buildfix.patch b/sci-mathematics/giac/files/giac-1.9.0.93-no-fltk-buildfix.patch
deleted file mode 100644
index 970ba22c6cca..000000000000
--- a/sci-mathematics/giac/files/giac-1.9.0.93-no-fltk-buildfix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/src/Editeur.cc b/src/Editeur.cc
-index d69dce2..f7725bb 100644
---- a/src/Editeur.cc
-+++ b/src/Editeur.cc
-@@ -3,7 +3,6 @@
- #include "Input.h"
- #include "Tableur.h"
- #include "Python.h"
--Fl_Tabs * xcas_main_tab=0;
- #ifdef HAVE_LIBMICROPYTHON
- extern "C" int mp_token(const char * line);
- #endif
-@@ -27,6 +26,7 @@ extern "C" int mp_token(const char * line);
- 
- 
- #ifdef HAVE_LIBFLTK
-+Fl_Tabs * xcas_main_tab=0;
- #include <FL/fl_ask.H>
- #include <FL/fl_ask.H>
- #include <FL/Fl_Return_Button.H>
-diff --git a/src/icas.cc b/src/icas.cc
-index a5e3711..44ec905 100644
---- a/src/icas.cc
-+++ b/src/icas.cc
-@@ -2166,11 +2166,13 @@ int main(int ARGC, char *ARGV[]){
- 	printf("%s\n","Running ./xcas");
- 	continue;
-       }
-+#ifdef HAVE_LIBFLTK
-       if (s=="xcas"){
- 	giac::gen ge; std::string filename;
- 	xcas::fltk_view(0,ge,"session.xws",filename,5,contextptr);
- 	continue;
-       }
-+#endif
-       if (s=="giac"){
- 	python_compat(python_compat(contextptr)&3,contextptr);
- 	printf("%s\n","Switching to giac interpreter");
-@@ -2251,7 +2253,9 @@ int main(int ARGC, char *ARGV[]){
- #else
-       start=clock();
- #endif
-+#ifdef HAVE_LIBFLTK
-       xcas::icas_eval(gq,ge,reading_file,filename,contextptr);
-+#endif
- #ifdef __APPLE_
-       startc=clock()-startc;
- #endif
-@@ -2265,9 +2269,11 @@ int main(int ARGC, char *ARGV[]){
-       // 2-d plot?
-       int graph_output=graph_output_type(ge);
-       if (reading_file>=2 || graph_output || (giac::ckmatrix(ge,true) &&ge.subtype==giac::_SPREAD__VECT) ){
-+#ifdef HAVE_LIBFLTK
- 	if (xcas::fltk_view(gq,ge,"",filename,reading_file,contextptr))
- 	  cout << "Done";
- 	else
-+#endif
- 	  cout << "Plot cancelled or unable to plot";
-       }
-       else {