Hello community, here is the log from the commit of package gdal for openSUSE:Factory checked in at 2017-11-09 14:06:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdal (Old) and /work/SRC/openSUSE:Factory/.gdal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdal" Thu Nov 9 14:06:25 2017 rev:21 rq:539990 version:2.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gdal/gdal.changes 2017-09-25 13:59:49.803342946 +0200 +++ /work/SRC/openSUSE:Factory/.gdal.new/gdal.changes 2017-11-09 14:06:31.320042526 +0100 @@ -1,0 +2,8 @@ +Wed Nov 8 13:02:10 UTC 2017 - [email protected] + +- 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) + +------------------------------------------------------------------- New: ---- gdal-2.2.2-mariadb_102_build_fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdal.spec ++++++ --- /var/tmp/diff_new_pack.TFWLL3/_old 2017-11-09 14:06:32.683992823 +0100 +++ /var/tmp/diff_new_pack.TFWLL3/_new 2017-11-09 14:06:32.687992678 +0100 @@ -36,6 +36,8 @@ # Fix hard coded name of libproj library # But libproj.so is valid if libproj-devel is installed ? Patch2: gdal-libproj.patch +# PATCH-FIX-UPSTREAM [email protected] -- 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 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Fix mandir sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure ++++++ gdal-2.2.2-mariadb_102_build_fix.patch ++++++ >From d63c1a90f81fc3c1f58a8742fb68baf81340ea03 Mon Sep 17 00:00:00 2001 From: Even Rouault <[email protected]> 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"
