Patches that should fix the build with gcc<=4.9.0 (observed on joerg's bulk builds on NetBSD 7.0) Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/Makefile,v retrieving revision 1.113 diff -u -p -r1.113 Makefile --- Makefile 30 May 2016 19:11:31 -0000 1.113 +++ Makefile 13 Jun 2016 15:28:31 -0000 @@ -23,7 +23,8 @@ USE_TOOLS+= automake bison gmake perl:bu # GCC >= 4.7 or Clang >= 3.3 # XXX: Kludge, upstream needs GCC 4.9.0 for IndexedDB support. -# XXX: patches/patch-Source_cmake_OptionsGTK.cmake disables that to +# XXX: patches/patch-Source_cmake_OptionsGTK.cmake and +# XXX: patches/patch-Source_WTF_wtf_Compiler.h disables that to # XXX: avoid requiring GCC 4.9.0. GCC_REQD+= 4.7 Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/distinfo,v retrieving revision 1.90 diff -u -p -r1.90 distinfo --- distinfo 30 May 2016 19:11:31 -0000 1.90 +++ distinfo 13 Jun 2016 15:28:31 -0000 @@ -9,6 +9,7 @@ SHA1 (patch-Source_JavaScriptCore_assemb SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 0d82552c6cc1f4885a2bcc539963c966216c977c SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 +SHA1 (patch-Source_WTF_wtf_Compiler.h) = f4f7771e4b421dddf9f73c7131e671d0c34b906c SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 01195978abe07154fbc28de9efc47b3f3105fd89 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 09a837ee65cdc79cc22220ce713e346fe8752c50 SHA1 (patch-Source_cmake_OptionsGTK.cmake) = ac5c5b51000684abfe60894dea36cc4a60f4d263 Index: patches/patch-Source_WTF_wtf_Compiler.h =================================================================== RCS file: patches/patch-Source_WTF_wtf_Compiler.h diff -N patches/patch-Source_WTF_wtf_Compiler.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Source_WTF_wtf_Compiler.h 13 Jun 2016 15:28:31 -0000 @@ -0,0 +1,32 @@ +$NetBSD$ + +Revert upstream changeset 188912, requested in: + + + +XXX: Actually in pkgsrc we are using a kludge in order to avoid a pretty new gcc +XXX: version, that in reality is needed only for IndexedDB support (disabled in +XXX: the pkgsrc case). + +--- Source/WTF/wtf/Compiler.h.orig 2016-04-11 06:18:43.000000000 +0000 ++++ Source/WTF/wtf/Compiler.h +@@ -70,15 +70,17 @@ + #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) + #define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch)) + +-#if !GCC_VERSION_AT_LEAST(4, 9, 0) +-#error "Please use a newer version of GCC. WebKit requires GCC 4.9.0 or newer to compile." ++#if !GCC_VERSION_AT_LEAST(4, 7, 0) ++#error "Please use a newer version of GCC. WebKit requires GCC 4.7.0 or newer to compile." + #endif + + #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L + #define WTF_COMPILER_SUPPORTS_C_STATIC_ASSERT 1 + #endif + ++#if GCC_VERSION_AT_LEAST(4, 8, 0) + #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" ++#endif + + #endif /* COMPILER(GCC) */ +