- rediff patch, fix building with gcc 11, rel 3

diff --git a/gcc11.patch b/gcc11.patch
new file mode 100644 (file)
index 0000000..571f20a
--- /dev/null
+++ b/gcc11.patch
@@ -0,0 +1,10 @@
+--- gtatool-2.4.0/src/base/dbg.cpp~    2018-06-13 12:02:10.000000000 +0200
++++ gtatool-2.4.0/src/base/dbg.cpp     2021-08-29 22:22:22.440264892 +0200
+@@ -21,6 +21,7 @@
+ #include <cstdlib>
+ #include <cerrno>
+ #include <cstring>
++#include <exception>
+ #include <new>
+ #if HAVE_BACKTRACE
+ # include <cstdio>

diff --git a/gtatool-getopt.patch b/gtatool-getopt.patch
index d80b14138d7d7eb111baac7d37e1874d72a4a973..6cfb3c0854ab699d35ca2b36718f83ef15a1e10d 100644 (file)
--- a/gtatool-getopt.patch
+++ b/gtatool-getopt.patch
@@ -1,9 +1,10 @@
---- gtatool-2.0.1/src/base/opt.h~      2014-11-11 10:32:38.000000000 +0100
-+++ gtatool-2.0.1/src/base/opt.h       2014-11-11 10:36:22.137550614 +0100
-@@ -26,6 +26,9 @@
- #include <cstdio>
+diff -urNp -x '*.orig' gtatool-2.4.0.org/src/base/opt.h gtatool-2.4.0/src/base/opt.h
+--- gtatool-2.4.0.org/src/base/opt.h   2018-06-13 12:02:10.627492735 +0200
++++ gtatool-2.4.0/src/base/opt.h       2021-08-29 22:14:53.654929659 +0200
+@@ -27,6 +27,9 @@
  #include <stdint.h>
  
+ 
 +#undef no_argument
 +#undef required_argument
 +#undef optional_argument

diff --git a/gtatool.spec b/gtatool.spec
index 793b0c1192ccc745d728e73e0b172733c369e7d4..227233fd973845677c1196e19d949e2787ab00fa 100644 (file)
--- a/gtatool.spec
+++ b/gtatool.spec
@@ -23,7 +23,7 @@ Summary:      Tools to manipulate Generic Tagged Array (GTA) files
 Summary(pl.UTF-8):     Narzędzia do obróbki plików GTA (ogólnych tablic etykietowanych)
 Name:          gtatool
 Version:       2.4.0
-Release:       2
+Release:       3
 License:       GPL v3+
 Group:         Applications/File
 Source0:       https://marlam.de/gta/releases/%{name}-%{version}.tar.xz
@@ -32,6 +32,7 @@ Patch0:               %{name}-getopt.patch
 Patch1:                %{name}-bashcomp.patch
 Patch2:                imagemagick7.patch
 Patch3:                pcl-1.11.patch
+Patch4:                gcc11.patch
 URL:           https://marlam.de/gta/
 %{?with_magick:BuildRequires:  ImageMagick-c++-devel}
 %{?with_openexr:BuildRequires: OpenEXR-devel}
@@ -299,6 +300,7 @@ Bashowe uzupełnianie parametrów programu gtatool.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}