From 5486c6e8eb57dddaf156abeca86d7c70355d6def Mon Sep 17 00:00:00 2001
From: John Marino <marino@FreeBSD.org>
Date: Wed, 11 Mar 2015 18:27:17 +0000
Subject: [PATCH] www/webkit-gtk(2,3): Fix build on gcc5 and isolate clang-only
 flag

PR:		197669
PR:		197671
Submitted by:	marino
Approved by:	maintainer timeout
---
 www/webkit-gtk2/Makefile              |  4 +---
 www/webkit-gtk2/files/patch-configure | 20 ++++++++++++++++++++
 www/webkit-gtk3/Makefile              |  4 +---
 www/webkit-gtk3/files/patch-configure | 20 ++++++++++++++++++++
 4 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 www/webkit-gtk2/files/patch-configure
 create mode 100644 www/webkit-gtk3/files/patch-configure

diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index aee880495d28..423009f0084e 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -77,9 +77,6 @@ DEBUG_CONFIGURE_OFF=	--disable-debug-symbols
 
 .include <bsd.port.options.mk>
 
-# Shutup warning spam
-CXXFLAGS+=	-Wno-c++11-extensions
-
 .if ${ARCH} == powerpc64
 CFLAGS+=	-mminimal-toc
 .endif
@@ -96,6 +93,7 @@ CONFIGURE_ENV+=	FLEX="${LOCALBASE}/bin/flex"
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
+CXXFLAGS+=	-Wno-c++11-extensions # Shutup warning spam
 CXXFLAGS+=	-Qunused-arguments
 .endif
 
diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure
new file mode 100644
index 000000000000..283784542671
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2015-01-07 09:47:51 UTC
++++ configure
+@@ -4890,7 +4890,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
++#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
+ #error Not a supported GCC compiler
+ #endif
+ 
+@@ -4948,7 +4948,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
++#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
+ #error Not a supported G++ compiler
+ #endif
+ 
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 973cfe3e1d55..cb97655fbbc2 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -80,9 +80,6 @@ DEBUG_CONFIGURE_OFF=	--disable-debug-symbols
 
 .include <bsd.port.options.mk>
 
-# Shutup warning spam
-CXXFLAGS+=	-Wno-c++11-extensions
-
 .if ${ARCH} == powerpc64
 CFLAGS+=	-mminimal-toc
 .endif
@@ -104,6 +101,7 @@ CFLAGS+=	-march=i586
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
+CXXFLAGS+=	-Wno-c++11-extensions	# Shutup warning spam
 CXXFLAGS+=	-Qunused-arguments
 .endif
 
diff --git a/www/webkit-gtk3/files/patch-configure b/www/webkit-gtk3/files/patch-configure
new file mode 100644
index 000000000000..283784542671
--- /dev/null
+++ b/www/webkit-gtk3/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2015-01-07 09:47:51 UTC
++++ configure
+@@ -4890,7 +4890,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
++#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
+ #error Not a supported GCC compiler
+ #endif
+ 
+@@ -4948,7 +4948,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
++#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
+ #error Not a supported G++ compiler
+ #endif
+