Accepting request 539986 from home:kstreitova:branches:Application:Geo

- add gdal-2.2.2-mariadb_102_build_fix.patch to fix build with
  MariaDB 10.2 (in our case the build with libmariadb library
  from the mariadb-connector-c package)
  * upstream commit d63c1a90f81fc3c1f58a8742fb68baf81340ea03)

OBS-URL: https://build.opensuse.org/request/show/539986
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=50

gdal-2.2.2-mariadb_102_build_fix.patch

@@ -0,0 +1,58 @@
+From d63c1a90f81fc3c1f58a8742fb68baf81340ea03 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@mines-paris.org>
+Date: Sun, 8 Oct 2017 16:40:23 +0000
+Subject: [PATCH] MySQL: fix build with MariaDB 10.2 (fixes #7079)
+
+git-svn-id: https://svn.osgeo.org/gdal/trunk@40361 f0d54148-0727-0410-94bb-9a71ac55c965
+---
+ gdal/ogr/ogrsf_frmts/mysql/ogr_mysql.h            |  1 -
+ gdal/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp | 25 -----------------------
+ 2 files changed, 26 deletions(-)
+
+Index: b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
+===================================================================
+--- a/ogr/ogrsf_frmts/mysql/ogr_mysql.h
++++ b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
+@@ -43,7 +43,6 @@
+ #pragma warning( disable : 4211 ) /* nonstandard extension used : redefined extern to static */
+ #endif
+ 
+-#include <my_global.h>
+ #include <mysql.h>
+ 
+ #ifdef _MSC_VER
+Index: b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
+===================================================================
+--- a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
++++ b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
+@@ -31,30 +31,6 @@
+ #include <string>
+ #include "ogr_mysql.h"
+ 
+-#ifdef _MSC_VER
+-#pragma warning( push )
+-#pragma warning( disable : 4201 ) /* nonstandard extension used : nameless struct/union */
+-#endif
+-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+-#endif
+-#ifdef __clang__
+-#pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Wunknown-pragmas"
+-#pragma clang diagnostic ignored "-Wdocumentation"
+-#endif
+-#include <my_sys.h>
+-#ifdef __clang__
+-#pragma clang diagnostic pop
+-#endif
+-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
+-#pragma GCC diagnostic pop
+-#endif
+-#ifdef _MSC_VER
+-#pragma warning( pop )
+-#endif
+-
+ #include "cpl_conv.h"
+ #include "cpl_string.h"
+ 

gdal.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Nov  8 13:02:10 UTC 2017 - kstreitova@suse.com
+
+- add gdal-2.2.2-mariadb_102_build_fix.patch to fix build with
+  MariaDB 10.2 (in our case the build with libmariadb library
+  from the mariadb-connector-c package)
+  * upstream commit d63c1a90f81fc3c1f58a8742fb68baf81340ea03)
+
 -------------------------------------------------------------------
 Sat Sep 23 13:30:27 UTC 2017 - bruno@ioda-net.ch
 

gdal.spec

@@ -36,6 +36,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 kstreitova@suse.com -- fix build with MariaDB 10.2
+Patch3:         gdal-2.2.2-mariadb_102_build_fix.patch
 BuildRequires:  blas-devel
 BuildRequires:  chrpath
 BuildRequires:  curl-devel
@@ -158,6 +160,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