gentoo auto-resync : 04:03:2024 - 17:43:01

6 files changed, 98 insertions, 37 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 009ac7dd0bc5..7e57e060bfbc 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index bd11b39bed9a..db44f23f4541 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -3,10 +3,11 @@ AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88
 AUX giac-1.9.0.21-pari-2.15.patch 298 BLAKE2B 99329cfd473ec3b580caf8f9700501e8b5dca9143cd04d883729880109d4e1962d19dce19aaf51e5d26ab09dc399a45a3a052847837f53a60c1b21087ebeabb8 SHA512 f9335dd47ee43ca10b784c8302422efcd5a835b1fe13fa134f5d36e453327e96624e77e086710f9d556352b1d62e6e693b3308fe8af329492e11d68cc9451b5b
 AUX giac-1.9.0.55-pari-2.15-test.patch 356 BLAKE2B 93863190cb64dbf0073f56e9657478b5e6d166da5ae36b81e55a45bbb75359cf63b23089b8191ae1e60958bf14652d5ac935b1aaf900b2bfb7d30b7ef3dc9504 SHA512 09155a08d8078d9bff610be15a2df0329ab9db53ca3873f01e61b02095361ab201ec93600cebc2ef42ccac67be40095a71bdaecaf54561e824fa267085245c7f
 AUX giac-1.9.0.55-undefined-behavior.patch 2081 BLAKE2B 68a3b7f2a56b6d425442f47fe6f069c1cce1bda38d85421519c68fdc9fd256ff7228886c74697151a80ec79016b436c82bc033be098b62e848e49ec499273d2d SHA512 ae531a42c9670d1ecb2cc6546ed256532705a99e13154fef6024f0ab69d5ff07b2872746b164b1cf234dce1ffe9c448a174a60dfb34eb914535ae92816007a2a
-AUX giac-1.9.0.67-glibcxx-assertions.patch 990 BLAKE2B 9dc38f425038ecb645e00893ed61b053e7c3963827a18ebf2a74423b9b5cd4506760becd50b83cd7587401e1088268580f4350e20fd8eaec500c34144e97ec40 SHA512 33fe0350196763acbd409156a137f9468b9e60f97c42682887d9d75fcfe75b4cf870e3ba9a166fadc5a2f3bf70b8ff2dc87b93b157d4dc1e05d25596b135bb09
 AUX giac-1.9.0.67-system-gl2ps.patch 2283 BLAKE2B 6c98e3ea09f0f8b0e34e2634218595d576e7eee85234e56436db24fe0aa276288f58049bcfb374ae42d7f104b44f0d51b3e81acc6e2e9af1cecc4e4adadfada8 SHA512 88dae722242b81ee22b7d377e4fd4b98d1e687307aaf3091ab17ffc720678bedb93c30bc0fd92c0388b7994945b820f31dd57e831736b6dd29e5d8285320d4e6
+AUX giac-1.9.0.93-glibcxx-assertions.patch 1135 BLAKE2B 5dc1f882f0832f305dbc24789e1ec3fde79ac6f203fef013d330f6cc268fe5366dd938cf6f141d7f3dad7aff6d012d65693d9daea20745d8bc87f15dc55453d1 SHA512 cd882c469a7af89dad475cd77f9a3625f914a6b522eba8eb12275535552da5d98bab63e6b84ba730766976ee3fe70bd414143febb3b5de55727e7da854c0cad9
+AUX giac-1.9.0.93-no-fltk-buildfix.patch 1690 BLAKE2B 7ff97352ebe164107700ed0a45cfe25df7685ac69684cdfe6811235db2d2020322791868ef2b503281095120083ac8c63f0982c1eec9baac009c8642dca2229d SHA512 4a739550164d0555ddfaec7a02e2fe43f5dcdbc752d7d785ae8c4d1bad7b3e18d15ff2c5670129fc99b9680e6198f87b1517255a03b390bfcadfa0a02f28752f
 DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
-DIST giac_1.9.0-67.tar.gz 114193594 BLAKE2B aaa43b9b0eb9db04b55f995e4b47a5513a6a7238111d63900a33e8cc0d632cc24f1136e2bc5a2e3d6109fbd06405105684e571eacea5f887ef96f0f70a51adf5 SHA512 c03a7d22ea64f6281671eace533b7d7581ed3a3af060c112f8634fc7f13d450ba42568d9e26f8d8736e851f53ba1e9de8482fdb775427b71fcd78e2ca0ba4a69
+DIST giac_1.9.0-93.tar.gz 115117442 BLAKE2B 397c64c5587fadca37b3298fef8c15c2977ded30849af2f3d3ee8a083d26f8db4645ac6a0db2fce4e254144cdc70b88d3313de58a502510e21a22927e1af3505 SHA512 b8c7d7070218afdfdb8f9a94911407860ab81ead9a60adf7f0c0cec3c50cec5fad3a439269192a01ef4d55ed822a4a619b123b6938ba76f9aba3537d14bc4680
 EBUILD giac-1.9.0.29-r1.ebuild 4542 BLAKE2B dce03818ac9af080b4416b6546563e4be99617b220c4661a540f77e0127760582cfe0a3df8c6a2f94da676b8a0e9fa967be59748184b86eb8934481c607d7500 SHA512 6915110b6964d2e79d7da01cee85ee3b51b944f9879e5659447f0cba5d74bda8c4113ee9290203510fdb57ad1ba60eae52639b134ed74eec01b04a97d75cf066
-EBUILD giac-1.9.0.67.ebuild 5185 BLAKE2B 841e94d3b688043c578c75f97b979315153d7e90ab3df58aab87507d4913c55d6e0ad0ba06899295944e7a3e7c59194b6e98e0c2efee46e10b135d84ac52f4d3 SHA512 099ef1a97e4a1fe0a5d3abefaef862ff1462cefe5e191139b506a2745a86dfd1357125a3ef09f6d8d24c6813ee20e1c1c28f7f7a9f5ff033cc79b4a6bc3c1469
+EBUILD giac-1.9.0.93.ebuild 5112 BLAKE2B c9de1431f29cc2d4c75c0584887bceb7856e5e1277d3238cc442a786fe52ed46ca27b21fc4202a0707d958a7a8b0440208917e8ea9c72aa2d9f3fefb28827c66 SHA512 93faf00338c23b2893be12b630d5de460c921cb23f70822f17f3017f91416783f93b2984f01e12a66f0b4b546e20d70a5896f6af439749c6a2fb84ae68df1ce0
 MISC metadata.xml 1315 BLAKE2B a461d359b33617422f5863466bdbec9ddf56db03467b992c887bce9967d434913489602fd684edc893303078f89cf94d01b44cfdc0ccff33db9b42c5e686cfa8 SHA512 eaeb480010c9dbdfd75516e45e97e3226d2b2812c44e217b318c5a1d86dc40820bac0de69686d7b502775b14a6f1ed3bc11d2372b891c46a37080b4e84da9a1c
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
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
new file mode 100644
index 000000000000..d11eaf9ab01d
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.93-glibcxx-assertions.patch
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000000..970ba22c6cca
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.93-no-fltk-buildfix.patch
@@ -0,0 +1,60 @@
+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 {
diff --git a/sci-mathematics/giac/giac-1.9.0.67.ebuild b/sci-mathematics/giac/giac-1.9.0.93.ebuild
index 8e4bf2f1a4ce..9f42bdacc1a7 100644
--- a/sci-mathematics/giac/giac-1.9.0.67.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -56,10 +56,9 @@ BDEPEND="dev-tex/hevea
 PATCHES=(
 	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.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.67-system-gl2ps.patch"
-	"${FILESDIR}/${PN}-1.9.0.67-glibcxx-assertions.patch"
+	"${FILESDIR}/${P}-glibcxx-assertions.patch"
+	"${FILESDIR}/${P}-no-fltk-buildfix.patch"
 )
 
 REQUIRED_USE="test? ( gui )"