From 34c688d2edf93fb6b24cd93e2cc82756538977ae Mon Sep 17 00:00:00 2001
From: Mahrud Sayrafi <mahrud@berkeley.edu>
Date: Thu, 22 Aug 2024 11:44:54 +0200
Subject: [PATCH] gfan: 0.7

---
 Formula/gfan.rb | 62 +++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 36 deletions(-)

diff --git a/Formula/gfan.rb b/Formula/gfan.rb
index cf73098..1e14d60 100644
--- a/Formula/gfan.rb
+++ b/Formula/gfan.rb
@@ -1,10 +1,9 @@
 class Gfan < Formula
   desc "Grobner fans and tropical varieties"
   homepage "https://users-math.au.dk/~jensen/software/gfan/gfan.html"
-  url "https://users-math.au.dk/~jensen/software/gfan/gfan0.6.2.tar.gz"
-  sha256 "a674d5e5dc43634397de0d55dd5da3c32bd358d05f72b73a50e62c1a1686f10a"
+  url "https://users-math.au.dk/~jensen/software/gfan/gfan0.7.tar.gz"
+  sha256 "ab833757e1e4d4a98662f4aa691394013ea9a226f6416b8f8565356d6fcc989e"
   license "GPL-2.0-or-later"
-  revision 11
 
   bottle do
     root_url "https://ghcr.io/v2/macaulay2/tap"
@@ -16,22 +15,11 @@ class Gfan < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:  "2ac80a1fd89713e142750d8adf6f976e4249d38f58c5c2eafcfc0f6aec35793a"
   end
 
-  if OS.mac?
-    depends_on "gcc" => :build
-    fails_with :clang
-  else
-    fails_with gcc: "4"
-    fails_with gcc: "5"
-  end
+  depends_on "gcc@14" => :build
 
   depends_on "cddlib"
   depends_on "gmp"
 
-  patch do
-    url "https://raw.githubusercontent.com/Macaulay2/M2/d51564127d757a3132684e9730f4085cb89297bb/M2/libraries/gfan/patch-0.6.2"
-    sha256 "9ebbf25e6de16baec877050bef69c85504e7bfa81e79407c2ab00ea4433e838c"
-  end
-
   patch :DATA
 
   def install
@@ -57,31 +45,33 @@ def install
 
 __END__
 
-diff --git a/Makefile-orig b/Makefile
-index 737208abfb..52e010e0b3 100644
+diff --git a/Makefile b/Makefile
+index 67c8164..ab0b9c6 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -110,15 +110,15 @@ MKDIR=mkdir -p
- PREFIX =
+@@ -117,9 +117,9 @@ PREFIX =
  SHELL       = /bin/sh
  #ARCH        = LINUX
+
 -CC          = $(PREFIX)gcc
--CLINKER     = $(CC)
++CC          = $(PREFIX)gcc-14
+ CLINKER     = $(CC)
 -CXX         = $(PREFIX)g++
--CCLINKER    = $(CXX)
-+#CC          = $(PREFIX)gcc
-+#CLINKER     = $(CC)
-+#CXX         = $(PREFIX)g++
-+#CCLINKER    = $(CXX)
- #OPTFLAGS    = -O2 -DGMPRATIONAL -DNDEBUG
- # Note that gcc produces wrong code with -O3
--OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O2	 #-O3 -fno-guess-branch-probability #-DNDEBUG
-+#OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O2	 #-O3 -fno-guess-branch-probability #-DNDEBUG
- #OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O3 -mavx -msse2  -finline-limit=1000 -ffast-math -Wuninitialized # -fno-guess-branch-probability #-DNDEBUG -ftree-vectorizer-verbose=2
--#OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O1             -fno-guess-branch-probability
-+OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O1             -fno-guess-branch-probability
-  #-DNDEBUG
- #OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O3 -mavx -msse2 -ftree-vectorizer-verbose=2 -finline-limit=1000 -ffast-math #-DNDEBUG
- #OPTFLAGS    =  -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O3 -mavx -msse2 -ftree-vectorizer-verbose=2 -march=native -unroll-loops --param max-unroll-times=4 -ffast-math #-DNDEBUG
++CXX         = $(PREFIX)g++-14
+ CCLINKER    = $(CXX)
+
+ #CC          = $(PREFIX)gcc-8.1
+diff --git a/src/gfanlib_z.h b/src/gfanlib_z.h
+index f56597c..8c84ed1 100644
+--- a/src/gfanlib_z.h
++++ b/src/gfanlib_z.h
+@@ -9,6 +9,7 @@
+ #define LIB_Z_H_
+
+ #include <string.h>
++#include <cstdint>
+ #include <ostream>
+ #include <iostream>
+ #define OLD 1
 -- 
-2.31.1
+2.46.0