From cd14aa3fe59824a27be6e66bf7256367ee2ad6bd002ac0631cadf224a0b70dc8 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 17 Jul 2018 13:05:37 +0000
Subject: [PATCH] Accepting request 623395 from home:Le_Docteur

- Add patch to fix ECW5 detection in configure:
  * gdal-fix_ecw5_detection.patch

OBS-URL: https://build.opensuse.org/request/show/623395
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=71
---
 gdal-fix_ecw5_detection.patch | 12 ++++++++++++
 gdal.changes                  |  6 ++++++
 gdal.spec                     |  3 +++
 3 files changed, 21 insertions(+)
 create mode 100644 gdal-fix_ecw5_detection.patch

diff --git a/gdal-fix_ecw5_detection.patch b/gdal-fix_ecw5_detection.patch
new file mode 100644
index 0000000..49884d4
--- /dev/null
+++ b/gdal-fix_ecw5_detection.patch
@@ -0,0 +1,12 @@
+diff -purN gdal-2.3.1.orig/configure.ac gdal-2.3.1/configure.ac
+--- gdal-2.3.1.orig/configure.ac	2018-07-17 14:10:15.236559853 +0200
++++ gdal-2.3.1/configure.ac	2018-07-17 14:21:49.213424507 +0200
+@@ -2879,7 +2879,7 @@ else
+             echo "#include <string>" > testnewabi.cpp
+             echo "namespace NCS { class CString { public: static std::wstring Utf8Decode (const std::string &sUtf8); }; }" >> testnewabi.cpp
+             echo "int main() { return static_cast<int>(NCS::CString::Utf8Decode(std::string()).size()); }" >> testnewabi.cpp
+-            if test -z "`$${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
++            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
+                 ECW_LIBDIR=$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF
+                 ECW_LIBS="-L$ECW_LIBDIR -lNCSEcw $ECW_FRAMEWORK_COCOA"
+                 with_ecw=$with_ecw/$ecw_license_type
diff --git a/gdal.changes b/gdal.changes
index 85044cb..7e6ad9a 100644
--- a/gdal.changes
+++ b/gdal.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 17 12:12:35 UTC 2018 - guillaume.gardet@opensuse.org
+
+- Add patch to fix ECW5 detection in configure:
+  * gdal-fix_ecw5_detection.patch
+
 -------------------------------------------------------------------
 Tue Jul 10 07:52:21 UTC 2018 - guillaume@opensuse.org
 
diff --git a/gdal.spec b/gdal.spec
index 6009b91..63bacdf 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -37,6 +37,8 @@ Patch1:         GDALmake.opt.in.patch
 # Fix hard coded name of libproj library
 # But libproj.so is valid if libproj-devel is installed ?
 Patch2:         gdal-libproj.patch
+# PATCH-FIX-UPSTREAM - gdal-fix_ecw5_detection.patch: fix ECW5 detection in configure
+Patch3:         gdal-fix_ecw5_detection.patch
 BuildRequires:  blas-devel
 BuildRequires:  chrpath
 BuildRequires:  curl-devel
@@ -172,6 +174,7 @@ The GDAL python modules provide support to handle multiple GIS file formats.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Fix mandir
 sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure