diff --git a/.gitignore b/.gitignore index b0df62e..56b9ef6 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,3 @@ /giac-1.9.0.99.tar.gz /giac-1.9.0.992.tar.gz /giac-1.9.0.993.tar.gz -/giac-1.9.0.998.tar.gz -/giac-1.9.0.999.tar.gz -/giac-2.0.0.17.tar.gz -/giac-2.0.0.18.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index e7cca4e..9f07b88 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -4,8 +4,8 @@ # package maintainer. # -VERSION="2.0.0" -VERSIONREV="18" +VERSION="1.9.0" +VERSIONREV="993" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" @@ -20,11 +20,13 @@ if [ -f "$OUTPUTFILEBASENAME".tar.gz -o -f "$OUTPUTFILEBASENAME".tar.bz2 ] ; the fi echo >&2 "Build a temporary working dir" -mkdir -p giac-src -cd giac-src +TARGET=$(mkdir -p "giac-src") +ORIGDIR=`pwd` +cd "$TARGET" echo >&2 "Downloading upstream source ..." -wget "https://www-fourier.univ-grenoble-alpes.fr/~parisse/debian/dists/stable/main/source/giac$SOURCEORIG.tar.gz" +wget "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source//giac$SOURCEORIG.tar.gz" + echo >&2 "Untar upstream source ..." tar -xzf giac"$SOURCEORIG".tar.gz @@ -58,10 +60,11 @@ touch html_vall echo >&2 "Building giac source tarball ..." cd ../../../ tar -cz giac-"$VERSION" -f "$OUTPUTFILEBASENAME".tar.gz -mv "giac"$OUTPUTFILEBASENAME".tar.gz" ../ -cd ../ + echo >&2 "Cleaning extracted dir ..." rm -rf giac-src +rm -f "giac$SOURCEORIG.tar.gz" +rm -rf giac-"$VERSION" echo >&2 "Finished." diff --git a/giac-undefine_GLIBCXX_ASSERTIONS.patch b/giac-undefine_GLIBCXX_ASSERTIONS.patch index 1b36832..76ae2d4 100644 --- a/giac-undefine_GLIBCXX_ASSERTIONS.patch +++ b/giac-undefine_GLIBCXX_ASSERTIONS.patch @@ -1,8 +1,8 @@ --- a/src/first.orig.h 2023-05-24 09:52:40.000000000 +0200 +++ b/src/first.h 2024-02-10 19:37:26.376884368 +0100 -@@ -27,12 +27,7 @@ - #endif - +@@ -22,12 +22,7 @@ + #define _GIAC_FIRST_H_ + // register is deprecated in c++17 -#define register - @@ -14,24 +14,3 @@ #if defined NUMWORKS && !defined SDL_KHICAS #define KHICAS 1 ---- a/src/vecteur.orig.cc 2024-06-04 08:13:22.000000000 +0200 -+++ b/src/vecteur.cc 2024-11-01 17:58:56.061073533 +0100 -@@ -8498,15 +8498,15 @@ - } - else { - int C=col+1; -- longlong * ptr= &buffer[C],*ptrend=&buffer[0]+cmax-4; -- const int *ptrN=&Nline[C]; -+ longlong * ptr= &buffer[0]+C,*ptrend=&buffer[0]+cmax-4; -+ const int *ptrN=&Nline[0]+C; - for (;ptr>giacdoclist -# Change permissions to following files -chmod a+x %{buildroot}%{_datadir}/giac/doc/send18 -chmod a+x %{buildroot}%{_datadir}/giac/doc/send19 - -# Symlink duplicated files -%fdupes -s %{buildroot}%{_datadir} - %if %{with check} %check -export LD_LIBRARY_PATH=%{buildroot}%{_libdir} +export LD_LIBRARY_PATH=../src/.libs make -C check check -# This is for debugging purpose only -#make -j1 -C check check -#cat check/test-suite.log %endif -%files +%files -f %{name}.lang %license COPYING micropython-1.12/micropython-LICENSE %license LICENSE.tinymt32 %{_bindir}/icas @@ -412,13 +384,8 @@ make -C check check %{_bindir}/*_help %{_libdir}/libgiac.so.0.0.0 %{_libdir}/libgiac.so.0 -%{_libdir}/libxcas.so.0.0.0 -%{_libdir}/libxcas.so.0 %{_libdir}/libgiac.a -%{_libexecdir}/giac/khicas.nwa -%ifnarch %{power64} %{_libdir}/libmicropython.a -%endif %{_libdir}/libxcas.a # The following files are required at runtime by icas AND xcas. # (Ex: if LANG is fr, alea(5) should give an INT) @@ -446,7 +413,6 @@ make -C check check # The gui files %files xcas %{_bindir}/xcas -%{_datadir}/giac/xcas.html # The dirs shared %dir %{_datadir}/giac %dir %{_datadir}/giac/doc @@ -478,7 +444,6 @@ make -C check check %files devel %{_includedir}/giac/ %{_libdir}/libgiac.so -%{_libdir}/libxcas.so # DOC Files %files doc -f giacdoclist @@ -494,9 +459,9 @@ make -C check check # character encoding. # - The .cas and .cxx files are giac code and function. They are text files # -# NB: _docdir/giac is in the -filsystem package +# NB: %%{_docdir}/giac is in the -filsystem package %{_docdir}/giac/* -# Add all the files that are in _datadir/giac but not giac/aide_cas +# Add all the files that are in %%{_datadir}/giac but not giac/aide_cas # and not those in giac/doc/ %dir %{_datadir}/giac %dir %{_docdir}/giac diff --git a/sources b/sources index 0a2dd00..caaa507 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-2.0.0.18.tar.gz) = 9b92320c21a94c758e4c18d5393c91f5cd2e2eb66c13ad4aeeb66c70bb53181fb8f82e5288a1c18bf4ae870f132baf6af0ffa5940819d40187b045de24503edc +SHA512 (giac-1.9.0.993.tar.gz) = 2fcc5199ef0cd6811b5fd231c316c1ca0279c85216f6cf46b332fb562f55d21945f5c8f26d1a61aa4e0db897602ffd0b4c1b54e9a9ac1c2796f469d1a6493f83