From f47d856ac47db1362f9e3d9a467edb37545dbb25 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Jul 18 2022 22:47:44 +0000
Subject: Fix build with Emacs 28.


---

diff --git a/bigloo-emacs28.patch b/bigloo-emacs28.patch
new file mode 100644
index 0000000..c3af03a
--- /dev/null
+++ b/bigloo-emacs28.patch
@@ -0,0 +1,40 @@
+--- autoconf/emacsbrand.orig	2022-01-04 00:38:56.000000000 -0700
++++ autoconf/emacsbrand	2022-07-18 16:27:26.957881516 -0600
+@@ -35,6 +35,7 @@ done
+ #*    The autodetection ELisp expression                               */
+ #*---------------------------------------------------------------------*/
+ expr="(cond \
++        ((string-match \"GNU Emacs 28\" (emacs-version)) (kill-emacs 28)) \
+         ((string-match \"GNU Emacs 27\" (emacs-version)) (kill-emacs 27)) \
+         ((string-match \"GNU Emacs 26\" (emacs-version)) (kill-emacs 26)) \
+         ((string-match \"GNU Emacs 25\" (emacs-version)) (kill-emacs 25)) \
+@@ -74,6 +75,10 @@ else
+               else
+                 if [ "$version" = "27" ]; then
+                     echo "emacs27"
++                else
++                  if [ "$version" = "28" ]; then
++                    echo "emacs28"
++                  fi
+                 fi
+               fi
+             fi    
+--- bmacs/Makefile.orig	2022-01-04 00:38:56.000000000 -0700
++++ bmacs/Makefile	2022-07-18 16:28:00.717964114 -0600
+@@ -116,7 +116,7 @@ POPULATION	= Makefile README $(EMACS_SOU
+ #*---------------------------------------------------------------------*/
+ all: $(EMACSBRAND)
+ 
+-emacs22 emacs23 emacs24 emacs25 emacs26 emacs27:
++emacs22 emacs23 emacs24 emacs25 emacs26 emacs27 emacs28:
+ 	(expr=load-path; \
+           for p in . $(LOADPATH); do \
+              expr="(cons \"../$$p\" (cons \"$$p\" $$expr))"; \
+@@ -183,6 +183,7 @@ install.emacs24: doinstall
+ install.emacs25: doinstall
+ install.emacs26: doinstall
+ install.emacs27: doinstall
++install.emacs28: doinstall
+ install.xemacs: doinstall
+ 
+ install.generic:
diff --git a/bigloo.spec b/bigloo.spec
index b6479c2..44dcdf5 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -64,6 +64,8 @@ Patch7:         %{name}-javac.patch
 Patch8:         %{name}-return.patch
 # Fix signal numbers in the Java code
 Patch9:         %{name}-java-signum.patch
+# Allow building with Emacs 28
+Patch10:        %{name}-emacs28.patch
 
 BuildRequires:  emacs
 BuildRequires:  gcc
@@ -182,7 +184,7 @@ ulimit -s unlimited
 
 # Enable UTF-8 filename support
 export LOCALE="C.utf8"
-export CFLAGS="%{optflags} -fwrapv -Wno-unused"
+export CFLAGS="%{build_cflags} -fwrapv -Wno-unused"
 %if 0%{?__isa_bits} == 32
 CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
 %endif
@@ -246,7 +248,7 @@ rmdir %{buildroot}%{_libdir}/pkgconfig
 
 # fix permissions
 chmod 755 %{buildroot}%{_bindir}/*
-find %{buildroot}%{_libdir} -name \*.so -exec chmod 755 {} \+
+find %{buildroot}%{_libdir} -name \*.so -exec chmod 755 {} +
 
 %ifarch %{java_arches}
 # move jigloo to the proper place
@@ -316,6 +318,9 @@ make test
 
 
 %changelog
+* Mon Jul 18 2022 Jerry James <loganjerry@gmail.com> - 4.4c-5.4
+- Fix build with Emacs 28
+
 * Tue Jul  5 2022 Jerry James <loganjerry@gmail.com> - 4.4c-5.4
 - Remove Java support on i686 (rhbz#2104022)