From 73954a2f02d1d57129c2591a65fe75a4f0452bc7 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Thu, 13 Jun 2024 13:52:15 -0600
Subject: [PATCH] Version 0.9.15

---
 apron-division.patch | 23 -----------------------
 apron-flint.patch    | 17 +++++++++++++++++
 apron.spec           | 12 +++++-------
 sources              |  2 +-
 4 files changed, 23 insertions(+), 31 deletions(-)
 delete mode 100644 apron-division.patch
 create mode 100644 apron-flint.patch

diff --git a/apron-division.patch b/apron-division.patch
deleted file mode 100644
index 1d3729d..0000000
--- a/apron-division.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- itv/itv.c.orig	2023-09-20 13:55:04.000000000 -0600
-+++ itv/itv.c	2024-04-11 10:06:42.240079202 -0600
-@@ -519,13 +519,15 @@ void itv_divn(itv_internal_t* intern,
-   else {
-     /* 0 is in the middle of b: one cross-divide b by c->sup */
-     if (a!=b) {
--      bound_div(a->inf,b->sup,c->sup);
--      bound_div(a->sup,b->inf,c->sup);
-+      bound_neg(intern->mul_bound,c->sup);
-+      bound_div(a->inf,b->sup,intern->mul_bound);
-+      bound_div(a->sup,b->inf,intern->mul_bound);
-     }
-     else {
--      bound_div(intern->mul_bound,b->sup,c->sup);
--      bound_div(a->sup,b->inf,c->sup);
--      bound_set(a->inf,intern->mul_bound);
-+      bound_neg(intern->mul_bound,c->sup);
-+      bound_div(intern->sqrt_bound,b->sup,intern->mul_bound);
-+      bound_div(a->sup,b->inf,intern->mul_bound);
-+      bound_set(a->inf,intern->sqrt_bound);
-     }
-   }
- }
diff --git a/apron-flint.patch b/apron-flint.patch
new file mode 100644
index 0000000..46d72da
--- /dev/null
+++ b/apron-flint.patch
@@ -0,0 +1,17 @@
+Fixes this error:
+
+pplite_poly.cc: In destructor ‘pplite::apron::pplite_internal::~pplite_internal()’:
+pplite_poly.cc:46:7: error: ‘flint_cleanup’ was not declared in this scope
+   46 |       flint_cleanup();
+      |       ^~~~~~~~~~~~~
+
+--- pplite/pplite_poly.cc.orig	2024-06-07 09:36:08.000000000 -0600
++++ pplite/pplite_poly.cc	2024-06-13 08:21:55.536500683 -0600
+@@ -18,6 +18,7 @@
+ #include "ap_pplite.h"
+ #include "pplite_user.hh"
+ #include "pplite_poly.hh"
++#include <flint/flint.h>
+ 
+ #include <cassert>
+ 
diff --git a/apron.spec b/apron.spec
index fa94b4b..33f22fd 100644
--- a/apron.spec
+++ b/apron.spec
@@ -1,5 +1,5 @@
 Name:           apron
-Version:        0.9.14
+Version:        0.9.15
 Summary:        Numerical abstract domain library
 Release:        %autorelease
 
@@ -29,10 +29,8 @@ Patch3:         %{name}-japron-link.patch
 # https://github.com/antoinemine/apron/issues/94
 # https://github.com/antoinemine/apron/pull/95
 Patch4:         %{name}-hasvar.patch
-# Fix an internal division bug
-# https://github.com/antoinemine/apron/issues/100
-# https://github.com/antoinemine/apron/pull/101
-Patch5:         %{name}-division.patch
+# Add a missing flint #include
+Patch5:         %{name}-flint.patch
 
 # OCaml packages not built on i686 since OCaml 5 / Fedora 39.
 ExcludeArch:    %{ix86}
@@ -153,13 +151,13 @@ sed -i 's/^\([[:blank:]]*cp[[:blank:]]\)/\1-p /' Makefile */Makefile
 
 # Build with debuginfo
 sed -i 's/^OCAMLOPTFLAGS =/& -g/' configure
-sed -i "s|\$(OCAMLMKLIB) -L.*|& -g|" vars.mk
+sed -i 's|\$(OCAMLMKLIB) -L.*|& -g|' vars.mk
 
 # Give the C++ library an soname
 sed -i '/shared/s/\$(CXX)/$(CXX_APRON_DYLIB)/' apronxx/Makefile
 
 # For reproducibility, omit timestamps from generated documentation
-sed -i '/HTML_TIMESTAMP/s/YES/NO/' apronxx/doc/Doxyfile
+sed -i '/HTML_TIMESTAMP/s/= YES/= NO/' apronxx/doc/Doxyfile
 
 %build
 # This is NOT an autoconf-generated script.  Do not use %%configure
diff --git a/sources b/sources
index 9f8bd3a..8d2dee7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apron-0.9.14.tar.gz) = 9c1107cea95d56a377f221724064bc65dc605a624171064e681c07e1dece688e06b5511e9974df7c20d883d7dc6cdb25bf1431a8968d721d5c587875ffef751a
+SHA512 (apron-0.9.15.tar.gz) = c96dc5904c4126f84b01ed0d5a8f38e2c4b9653fa714e3c77fc305d7b8cf8e239eb9a6838dcdc015b2722cbf38f378e5d07122d4c7c5a62f27137992f35a665d