From 0bc24d2ae54473b39b2021917103e52d221c907b Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Fri, 28 Jan 2022 12:08:03 +0100 Subject: [PATCH] Add fix for GCC-12 --- pstoedit-fix-gcc12.patch | 10 ++++++++++ pstoedit.spec | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pstoedit-fix-gcc12.patch diff --git a/pstoedit-fix-gcc12.patch b/pstoedit-fix-gcc12.patch new file mode 100644 index 0000000..a1696a9 --- /dev/null +++ b/pstoedit-fix-gcc12.patch @@ -0,0 +1,10 @@ +--- a/src/drvpptx.orig.cpp 2021-08-29 16:25:45.000000000 +0200 ++++ b/src/drvpptx.cpp 2022-01-28 11:57:44.765756339 +0100 +@@ -65,6 +65,7 @@ + #define ZIP_EXTERN extern + + #include ++#include + + #ifdef _MSC_VER + // MS VC++ Windows diff --git a/pstoedit.spec b/pstoedit.spec index 3866f82..e215ef5 100644 --- a/pstoedit.spec +++ b/pstoedit.spec @@ -13,6 +13,9 @@ Source0: https://sourceforge.net/projects/pstoedit/files/pstoedit/%{versi # Fix cflags of the pkg-config file Patch0: pstoedit-pkglibdir.patch +# drvpptx.cpp:68:1: note: 'std::unique_ptr' is defined in header ''; did you forget to '#include '? +Patch1: pstoedit-fix-gcc12.patch + BuildRequires: make BuildRequires: gd-devel BuildRequires: dos2unix @@ -45,7 +48,12 @@ applications %prep -%autosetup -p1 +%autosetup -N + +%patch0 -p1 +%if 0%{?fedora} > 35 +%patch1 -p1 +%endif dos2unix doc/*.htm doc/readme.txt @@ -92,6 +100,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/pstoedit %changelog * Fri Jan 21 2022 Fedora Release Engineering - 3.78-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +- Add fix for GCC-12 * Tue Nov 23 2021 Antonio Trande - 3.78-1 - Release 3.78