From 19ebd639fc7411f3536ce607e11fa1c99dafda7f Mon Sep 17 00:00:00 2001
From: Michael Young <m.a.young@durham.ac.uk>
Date: Jun 27 2023 19:32:48 +0000
Subject: work around a build problem with python 3.12


---

diff --git a/xen.python3.12.patch b/xen.python3.12.patch
new file mode 100644
index 0000000..a6539c2
--- /dev/null
+++ b/xen.python3.12.patch
@@ -0,0 +1,22 @@
+--- xen-4.17.1/tools/python/Makefile.orig	2023-04-27 13:53:19.000000000 +0100
++++ xen-4.17.1/tools/python/Makefile	2023-06-22 22:21:25.287486906 +0100
+@@ -4,7 +4,7 @@
+ .PHONY: all
+ all: build
+ 
+-PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS)
++PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS) -Wno-error=declaration-after-statement
+ PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS)
+ INSTALL_LOG = build/installed_files.txt
+ 
+--- xen-4.17.1/tools/pygrub/Makefile.orig	2023-04-27 13:53:19.000000000 +0100
++++ xen-4.17.1/tools/pygrub/Makefile	2023-06-22 22:52:52.803047401 +0100
+@@ -2,7 +2,7 @@
+ XEN_ROOT = $(CURDIR)/../..
+ include $(XEN_ROOT)/tools/Rules.mk
+ 
+-PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS)
++PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS) -Wno-error=declaration-after-statement
+ PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS)
+ INSTALL_LOG = build/installed_files.txt
+ 
diff --git a/xen.spec b/xen.spec
index 527486d..fe57b65 100644
--- a/xen.spec
+++ b/xen.spec
@@ -55,7 +55,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.17.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
 Source0: https://downloads.xenproject.org/release/xen/%{version}/xen-%{version}.tar.gz
@@ -111,6 +111,7 @@ Patch45: xen.gcc12.fixes.patch
 Patch46: xen.efi.build.patch
 Patch47: xen.gcc13.fixes.patch
 Patch48: xsa431.patch
+Patch49: xen.python3.12.patch
 
 
 %if %build_qemutrad
@@ -324,6 +325,7 @@ manage Xen virtual machines.
 %patch 46 -p1
 %patch 47 -p1
 %patch 48 -p1
+%patch 49 -p1
 
 # qemu-xen-traditional patches
 pushd tools/qemu-xen-traditional
@@ -931,6 +933,9 @@ fi
 %endif
 
 %changelog
+* Tue Jun 27 2023 Michael Young <m.a.young@durham.ac.uk> - 4.17.1-4
+- work around a build problem with python 3.12
+
 * Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 4.17.1-3
 - Rebuilt for Python 3.12