From 6c8284cb0fff9be5324b256f69544f67ecdefdef Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Aug 18 2022 17:21:36 +0000
Subject: Update to 1.9.0 sub-19


---

diff --git a/.gitignore b/.gitignore
index b1cb26c..c169609 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /giac-1.7.0.1.tar.gz
 /giac-1.7.0.13.tar.gz
 /giac-1.7.0.29.tar.gz
+/giac-1.9.0.19.tar.gz
diff --git a/giac-1.9.0-bug2792.patch b/giac-1.9.0-bug2792.patch
new file mode 100644
index 0000000..1c89946
--- /dev/null
+++ b/giac-1.9.0-bug2792.patch
@@ -0,0 +1,11 @@
+--- a/src/optimization.orig.cc	2022-04-11 09:52:40.000000000 +0200
++++ b/src/optimization.cc	2022-08-18 17:58:16.714974337 +0200
+@@ -4825,7 +4825,7 @@
+             *kt=initp[i];
+             ok=compute_obj_val(*kt->_VECTptr,*ft);
+         } else *kt=vecteur(0);
+-        if ((i>=ips || !ok) && !make_random_initial_point(*kt->_VECTptr,ft))
++        if ((i>=ips || !ok) && !make_random_initial_point(*kt->_VECTptr,&*ft))
+             return false;
+         if (is_strictly_greater(best_obj_val,*ft,ctx)) {
+             best_obj_val=*ft;
diff --git a/giac-fix_graphe_file.patch b/giac-fix_graphe_file.patch
index c171d66..5129aa9 100644
--- a/giac-fix_graphe_file.patch
+++ b/giac-fix_graphe_file.patch
@@ -1,11 +1,11 @@
 --- a/src/graphe.orig.cc	2021-09-06 21:27:18.514049316 +0200
 +++ b/src/graphe.cc	2021-09-06 21:27:17.150072679 +0200
-@@ -15704,7 +15704,7 @@
+@@ -15757,7 +15757,7 @@
                          continue;
                      std::sort(d.begin(),d.end());
                      if (d==d0) {
 -                        G.make_haar_graph(n);
 +                        G.make_haar_graph(int(n));
                          if (is_isomorphic(G,isom,false)) {
-                             spec.push_back(make_ivector(2,_GT_SEQ_HAAR,n));
-                             break;
+                             vecteur v(k);
+                             for (int i=0;i<k;++i) {
diff --git a/giac-makesrc.sh b/giac-makesrc.sh
index b6c70d0..4f5f382 100755
--- a/giac-makesrc.sh
+++ b/giac-makesrc.sh
@@ -4,8 +4,8 @@
 # package maintainer.
 #
 
-VERSION="1.7.0"
-VERSIONREV="29"
+VERSION="1.9.0"
+VERSIONREV="19"
 
 # The upstream tarball name is: giac"$SOURCEORIG".tar.gz
 SOURCEORIG=_"$VERSION"-"$VERSIONREV"
diff --git a/giac.spec b/giac.spec
index fb03c21..d7e0e28 100644
--- a/giac.spec
+++ b/giac.spec
@@ -4,15 +4,12 @@
 
 %bcond_without flexiblas
 
-# giac does not support LTO
-%define _lto_cflags %{nil}
-
-%global subversion .29
+%global subversion .19
 
 Name:          giac
 Summary:       Computer Algebra System, Symbolic calculus, Geometry
-Version:       1.7.0%{subversion}
-Release:       4%{?dist}
+Version:       1.9.0%{subversion}
+Release:       1%{?dist}
 # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc
 # BSD: src/tinymt32*
 # MIT: libmicropython.a
@@ -39,6 +36,9 @@ Patch3:        %{name}-cocoalib.patch
 # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2724
 Patch4:        %{name}-fix_graphe_file.patch
 
+# https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2792
+Patch5:        %{name}-1.9.0-bug2792.patch
+
 BuildRequires: autoconf, libtool
 BuildRequires: python3-devel
 BuildRequires: readline-devel
@@ -77,8 +77,8 @@ Provides: bundled(tinymt32)
 # The micropython inside is a custom port with
 # addtional built-in modules that are linked to giac.
 Provides: libmicropython-static = 1.12
-Provides: libgiac-static = 1.6.0
-Provides: libxcas-static = 1.6.0
+Provides: libgiac-static = 1.9.0
+Provides: libxcas-static = 1.9.0
 
 %global majver %(cut -d. -f1-3 <<< %{version})
 
@@ -158,12 +158,13 @@ with Giac computations.
 %prep
 %autosetup -p0 -n %{name}-%{majver} -N
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%ifarch %{arm} %{ix86}
-%patch4 -p1
+%patch0 -p1 -b .backup
+%patch1 -p1 -b .backup
+%patch2 -p0 -b .backup
+%patch3 -p0 -b .backup
+%patch4 -p1 -b .backup
+%ifarch s390x
+%patch5 -p1 -b .backup
 %endif
 
 # Remove local intl (already bundled in fedora)
@@ -451,6 +452,9 @@ make -C check check
 %{_datadir}/giac/examples/
 
 %changelog
+* Fri Aug 12 2022 Antonio Trande <sagitter@fedoraproject.org> 1.9.0.19-1
+- Update to 1.9.0 sub-19
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0.29-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 9231452..e891fba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (giac-1.7.0.29.tar.gz) = 79d21d11d345e7fc917e24fd7e6fe71fa2389d506d2977dd91a64aa4ab3480c3d7a06a2167eef7a838cd55ef65830f42020b35688f0df8619e347fca079aef39
+SHA512 (giac-1.9.0.19.tar.gz) = ff8ad4c1176ca40811a7358224e2fbc80c47a899decb838ad8c5d036e66e41fbc905b05f1c6e689d805850fe52e118c5b8c493a2a3c76c679f1243b8f2389938