Reenable parallel builds in devel/webkitÃ_gtk with latest patchset for gmake

Update GNUMakefile patch for 1.10.2 and suppress undefined _cplusplus warnings.

5 files changed, 24 insertions, 12 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 78d867dfd01..6d10299a4f5 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.68 2013/05/09 07:39:21 adam Exp $
+# $NetBSD: Makefile,v 1.69 2013/05/12 06:11:17 richard Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT=	GTK2 port of the WebKit browser engine
 
diff --git a/www/webkit-gtk/Makefile.common b/www/webkit-gtk/Makefile.common
index b4b70dc09cc..f3bcfe7efdb 100644
--- a/www/webkit-gtk/Makefile.common
+++ b/www/webkit-gtk/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2013/05/09 14:04:42 joerg Exp $
+# $NetBSD: Makefile.common,v 1.25 2013/05/12 06:11:17 richard Exp $
 # used by www/webkit-gtk/Makefile
 # used by www/webkit-gtk3/Makefile
 
@@ -17,8 +17,6 @@ USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	bison gmake perl:build pkg-config msgfmt
 
-MAKE_JOBS_SAFE=		no
-
 PKGCONFIG_OVERRIDE=	Source/WebKit/gtk/webkit.pc.in
 
 MAKE_FILE=	GNUmakefile
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index a9a1d5bc8f9..164eb45fdf9 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2013/05/09 14:04:42 joerg Exp $
+$NetBSD: distinfo,v 1.63 2013/05/12 06:11:17 richard Exp $
 
 SHA1 (webkitgtk-1.10.2.tar.xz) = 733ca23157eb8dd072d57becf325799c00bde630
 RMD160 (webkitgtk-1.10.2.tar.xz) = 91e6b8bcd4bb8234271dd6c6ebdba63dd1c0840e
@@ -7,6 +7,7 @@ SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = c5e1efdac5f6e2a
 SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) = f166335d829aba9051c1aaf1b950ec655deef372
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = ce9766427bebd4aac0b8c7fc2c12cc0ed75150d5
 SHA1 (patch-Source_WTF_wtf_Atomics.h) = 3cc890798e7e956b75c2a181eca4a4d05cb545fc
+SHA1 (patch-Source_WTF_wtf_Compiler.h) = 9e80acdbb57be1844103fe647a017ad7e46cc513
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = f922736410d49e7d7d1a459bffd3dffd0364e85a
 SHA1 (patch-Source_WTF_wtf_RefCountedLeakCounter.h) = 3cdf53f9735675bff83b48a81db59c3512f306e3
 SHA1 (patch-Source_WTF_wtf_ThreadSafeRefCounted.h) = c068f8b248b8864eeaa582fa096eca279f06890e
@@ -23,6 +24,6 @@ SHA1 (patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp) = 36013247ccbc2df274762acb49
 SHA1 (patch-ai) = 8df303ffde5c4398e56601c524e9ab4aff52096c
 SHA1 (patch-aj) = 930d1b5d73028b2f2e5abb33c15f72befadc64ce
 SHA1 (patch-ak) = 64ad843164f1c12968e933080e0966a9019abfdf
-SHA1 (patch-al) = dd7201d0a5dcc0f173a156f3bb42e1417bef6b06
+SHA1 (patch-al) = e2041fda38ad0a4d8d5e4c31f184a812f5332b6b
 SHA1 (patch-am) = 9516994b630b43c7c234f61debf8d762cf7aee97
 SHA1 (patch-configure) = 448caea068344fe987e566f73b3f567dad7b93ed
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h
new file mode 100644
index 00000000000..94e3216fc4d
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-Source_WTF_wtf_Compiler.h,v 1.1 2013/05/12 06:11:17 richard Exp $
+
+--- Source/WTF/wtf/Compiler.h.orig	2012-11-23 20:12:16.000000000 +0000
++++ Source/WTF/wtf/Compiler.h
+@@ -122,7 +122,7 @@
+ 
+ /* Specific compiler features */
+ #if COMPILER(GCC) && !COMPILER(CLANG)
+-#if GCC_VERSION_AT_LEAST(4, 7, 0) && __cplusplus >= 201103L
++#if GCC_VERSION_AT_LEAST(4, 7, 0) && defined(__cplusplus) && __cplusplus >= 201103L
+ #define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1
+ #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
+ #define WTF_COMPILER_SUPPORTS_CXX_NULLPTR 1
diff --git a/www/webkit-gtk/patches/patch-al b/www/webkit-gtk/patches/patch-al
index b2facf79dba..7468c1e4e8d 100644
--- a/www/webkit-gtk/patches/patch-al
+++ b/www/webkit-gtk/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2012/11/07 15:29:13 joerg Exp $
+$NetBSD: patch-al,v 1.4 2013/05/12 06:11:17 richard Exp $
 
---- GNUmakefile.in.orig	2012-04-24 05:17:27.000000000 +0000
+--- GNUmakefile.in.orig	2012-12-09 18:20:20.000000000 +0000
 +++ GNUmakefile.in
-@@ -21828,7 +21828,6 @@ Programs_minidom_CPPFLAGS = \
+@@ -21156,7 +21156,6 @@ Programs_minidom_CPPFLAGS = \
  	$(javascriptcore_cppflags)
  
  Programs_minidom_CFLAGS = \
@@ -10,7 +10,7 @@ $NetBSD: patch-al,v 1.3 2012/11/07 15:29:13 joerg Exp $
  	-fno-strict-aliasing \
  	$(global_cflags) \
  	$(GLOBALDEPS_CFLAGS)
-@@ -80247,6 +80246,8 @@ doc-maintainer-clean-local: clean
+@@ -79732,6 +79731,8 @@ doc-maintainer-clean-local: clean
  	-@rmdir Documentation
  
  install-data-local:
@@ -19,7 +19,7 @@ $NetBSD: patch-al,v 1.3 2012/11/07 15:29:13 joerg Exp $
  	@installfiles=`echo ./Documentation/webkitgtk/html/*`; \
  	if test "$$installfiles" = './Documentation/webkitgtk/html/*'; \
  	then echo 1>&2 'No documentation to install' ; \
-@@ -80287,7 +80288,7 @@ install-data-local:
+@@ -79772,7 +79773,7 @@ install-data-local:
  @ENABLE_WEBKIT2_TRUE@	      $${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \
  @ENABLE_WEBKIT2_TRUE@	  fi; \
  @ENABLE_WEBKIT2_TRUE@	fi