diff options
-rw-r--r-- | www/webkit-gtk/Makefile | 6 | ||||
-rw-r--r-- | www/webkit-gtk/distinfo | 3 | ||||
-rw-r--r-- | www/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h | 32 |
3 files changed, 38 insertions, 3 deletions
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile index fbe7b100d32..bdf0b569041 100644 --- a/www/webkit-gtk/Makefile +++ b/www/webkit-gtk/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.113 2016/05/30 19:11:31 leot Exp $ +# $NetBSD: Makefile,v 1.114 2016/06/16 20:42:35 leot Exp $ DISTNAME= webkitgtk-2.12.3 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.webkitgtk.org/releases/ EXTRACT_SUFX= .tar.xz @@ -23,7 +24,8 @@ USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt # 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 diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo index 36f5f0ac4ec..b65e33ed428 100644 --- a/www/webkit-gtk/distinfo +++ b/www/webkit-gtk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.90 2016/05/30 19:11:31 leot Exp $ +$NetBSD: distinfo,v 1.91 2016/06/16 20:42:35 leot Exp $ SHA1 (webkitgtk-2.12.3.tar.xz) = d6a0d598c09d2d56ba0862f8d9206e89d75317cb RMD160 (webkitgtk-2.12.3.tar.xz) = e8313c34f57e2dd933f9197c7dd091167e47cbe1 @@ -9,6 +9,7 @@ SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba 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 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..34146eba0a3 --- /dev/null +++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h @@ -0,0 +1,32 @@ +$NetBSD: patch-Source_WTF_wtf_Compiler.h,v 1.3 2016/06/16 20:42:36 leot Exp $ + +Revert upstream changeset 188912, requested in: + + <https://bugs.webkit.org/show_bug.cgi?id=148430> + +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) */ + |