[packages/gtatool] - fix building with pcl 1.11 - rel 6

[baggins]

commit 9e8a02978aa9986d4d69d4ff1259e959f5c8902d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Aug 11 00:54:19 2020 +0200

    - fix building with pcl 1.11
    - rel 6

 gtatool.spec   |  6 ++++--
 pcl-1.11.patch | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/gtatool.spec b/gtatool.spec
index 512cb4b..98545a3 100644
--- a/gtatool.spec
+++ b/gtatool.spec
@@ -25,7 +25,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.2.3
-Release:	5
+Release:	6
 License:	GPL v3+
 Group:		Applications/File
 Source0:	https://marlam.de/gta/releases/%{name}-%{version}.tar.xz
@@ -34,6 +34,7 @@ Patch0:		%{name}-getopt.patch
 Patch1:		%{name}-bashcomp.patch
 Patch2:		imagemagick7.patch
 Patch3:		pcl-1.9.patch
+Patch4:		pcl-1.11.patch
 URL:		http://gta.nongnu.org/gtatool.html
 %{?with_magick:BuildRequires:	ImageMagick-c++-devel}
 %{?with_openexr:BuildRequires:	OpenEXR-devel}
@@ -301,6 +302,7 @@ Bashowe uzupełnianie parametrów programu gtatool.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -310,7 +312,7 @@ Bashowe uzupełnianie parametrów programu gtatool.
 %{__automake}
 %if %{with netpbm}
 export CFLAGS="%{rpmcflags} -I/usr/include/netpbm"
-export CXXFLAGS="%{rpmcxxflags} -I/usr/include/netpbm"
+export CXXFLAGS="%{rpmcxxflags} -I/usr/include/netpbm -std=gnu++14"
 %endif
 %configure \
 	MOC=%{_libdir}/qt5/bin/moc \
diff --git a/pcl-1.11.patch b/pcl-1.11.patch
new file mode 100644
index 0000000..94bea95
--- /dev/null
+++ b/pcl-1.11.patch
@@ -0,0 +1,15 @@
+--- gtatool-2.2.3/configure.ac.orig	2020-08-10 23:42:38.000000000 +0200
++++ gtatool-2.2.3/configure.ac	2020-08-10 23:49:06.935269223 +0200
+@@ -461,10 +461,11 @@
+         [PKG_CHECK_MODULES([libpcl_io], [pcl_io-1.7 >= 1.7], [],
+             [PKG_CHECK_MODULES([libpcl_io], [pcl_io-1.8 >= 1.8], [],
+               [PKG_CHECK_MODULES([libpcl_io], [pcl_io-1.9 >= 1.9], [],
++              [PKG_CHECK_MODULES([libpcl_io], [pcl_io-1.11 >= 1.11], [],
+                 [pcd="no "
+                 AC_MSG_WARN([PCL io library not found:])
+                 AC_MSG_WARN([$libpcl_io_PKG_ERRORS])
+-                AC_MSG_WARN([Disabled the from-pcd and to-pcd commands.])])])])])
++                AC_MSG_WARN([Disabled the from-pcd and to-pcd commands.])])])])])])
+ fi
+ AC_DEFINE_UNQUOTED([WITH_PCD], [`if test "$pcd" = "yes"; then echo "1"; else echo "0"; fi`], [Use pcd?])
+ AM_CONDITIONAL([WITH_PCD], [test "$pcd" = "yes"])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtatool.git/commitdiff/9e8a02978aa9986d4d69d4ff1259e959f5c8902d