From 38d63bbe534b61d8cd13f8d5c7a43b2d78c906f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=BCnd=C3=BCz?= Date: Thu, 19 Mar 2015 19:07:57 +0200 Subject: [PATCH] Update patch to fix another GCC 5 issue. Per help from mapserver-dev list. --- mapserver-gcc5.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 mapserver-gcc5.patch diff --git a/mapserver-gcc5.patch b/mapserver-gcc5.patch new file mode 100644 index 0000000..dfac136 --- /dev/null +++ b/mapserver-gcc5.patch @@ -0,0 +1,40 @@ +--- configure.old 2015-03-14 10:56:34.129000000 +0200 ++++ configure 2015-03-14 10:56:42.996000000 +0200 +@@ -3055,7 +3055,7 @@ + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-for ac_option in --version -v -V -qversion; do ++for ac_option in --version -v -V ; do + { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +@@ -11503,7 +11503,7 @@ + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-for ac_option in --version -v -V -qversion; do ++for ac_option in --version -v -V ; do + { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +@@ -11851,7 +11851,7 @@ + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-for ac_option in --version -v -V -qversion; do ++for ac_option in --version -v -V ; do + { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +--- mapcairo.c.old 2015-03-19 19:01:56.220000000 +0200 ++++ mapcairo.c 2015-03-19 19:02:05.592000000 +0200 +@@ -1270,7 +1270,7 @@ + #endif + } + +-inline int populateRendererVTableCairoVector( rendererVTableObj *renderer ) ++int populateRendererVTableCairoVector( rendererVTableObj *renderer ) + { + #ifdef USE_CAIRO + renderer->use_imagecache=0;