tartina pushed to rpms/guitarix (rawhide). "Fix FTBFS with python 3.11 and gcc 13"

Notification time stamped 2023-01-31 21:36:58 UTC

From 223fc9b48722c88bcbb78fa2cf2f4faf67e8aeca Mon Sep 17 00:00:00 2001
From: Guido Aulisi <guido.aulisi(a)gmail.com&gt;
Date: Jan 31 2023 21:36:46 +0000
Subject: Fix FTBFS with python 3.11 and gcc 13


---

diff --git a/guitarix-cstdint-include.patch b/guitarix-cstdint-include.patch
new file mode 100644
index 0000000..d6d87d0
--- /dev/null
+++ b/guitarix-cstdint-include.patch
@@ -0,0 +1,13 @@
+diff --git a/src/LV2/DSP/gx_common.h b/trunk/src/LV2/DSP/gx_common.h
+index 71108442..132a6839 100644
+--- a/src/LV2/DSP/gx_common.h
++++ b/src/LV2/DSP/gx_common.h
+@@ -22,7 +22,7 @@
+ #ifndef SRC_HEADERS_GX_COMMON_H_
+ #define SRC_HEADERS_GX_COMMON_H_
+ 
+-
++#include <cstdint>
+ #include <cstdlib>
+ #include <cmath>
+ #include <iostream>
diff --git a/guitarix-python-3.11-ftbfs.patch b/guitarix-python-3.11-ftbfs.patch
new file mode 100644
index 0000000..407914c
--- /dev/null
+++ b/guitarix-python-3.11-ftbfs.patch
@@ -0,0 +1,13 @@
+diff --git a/wscript b/trunk/wscript
+index b915199a..f3e4d129 100644
+--- a/wscript
++++ b/wscript
+@@ -534,7 +534,7 @@ def sub_file(task):
+     dst_fname = task.outputs[0].abspath()
+     lst = task.generator.sub_list
+ 
+-    with open(src_fname, 'rU') as f:
++    with open(src_fname, 'r') as f:
+         txt = f.read()
+     for (key, val) in lst:
+         re_pat = re.compile(key, re.M)
diff --git a/guitarix.spec b/guitarix.spec
index c365110..ecc88bb 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -5,12 +5,14 @@
 
 Name:           guitarix
 Version:        0.44.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A virtual guitar amplifier
 License:        GPLv2+
 URL:            http://guitarix.sourceforge.net/
 Source0:       
http://sourceforge.net/projects/%{name}/files/%{name}/%{altname2}-%{versi...
 Patch0:         %{name}-mismatched-delete.patch
+Patch1:         %{name}-python-3.11-ftbfs.patch
+Patch2:         %{name}-cstdint-include.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  python3
@@ -209,6 +211,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/org.%{name}.%{
 %{_libdir}/lv2/*
 
 %changelog
+* Tue Jan 31 2023 Guido Aulisi <guido.aulisi(a)gmail.com&gt; - 0.44.1-4
+- Fix FTBFS with python 3.11 and gcc 13
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org&gt; - 0.44.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 


	https://src.fedoraproject.org/rpms/guitarix/c/223fc9b48722c88bcbb78fa2cf2...