| 1 |
tetromino 13/05/28 05:23:26 |
| 2 |
|
| 3 |
Added: webkit-gtk-1.10.2-librt.patch |
| 4 |
webkit-gtk-1.10.2-gcc-4.8.patch |
| 5 |
Log: |
| 6 |
Fix build failure due to underlinking and silence excessive warnings with gcc-4.8 (bug #458164, thanks to Ted Tanberry and Mike Frysinger). |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-libs/webkit-gtk/files/webkit-gtk-1.10.2-librt.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-librt.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-librt.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: webkit-gtk-1.10.2-librt.patch |
| 17 |
=================================================================== |
| 18 |
From 3c499aa2a70b06b40a64fb5699622ff458e4ee0f Mon Sep 17 00:00:00 2001 |
| 19 |
From: Kalev Lember <kalevlember@×××××.com> |
| 20 |
Date: Sun, 25 Nov 2012 03:26:42 +0100 |
| 21 |
Subject: [PATCH] [GTK] Explicitly link against librt |
| 22 |
|
| 23 |
Fixes broken build with undefined references to shm_open / shm_unlink |
| 24 |
symbols. SharedMemoryUnix.cpp uses these so we need to link with -lrt. |
| 25 |
|
| 26 |
https://bugs.webkit.org/show_bug.cgi?id=103194 |
| 27 |
--- |
| 28 |
ChangeLog | 12 ++++++++++++ |
| 29 |
Source/WebKit2/ChangeLog | 12 ++++++++++++ |
| 30 |
Source/WebKit2/GNUmakefile.am | 1 + |
| 31 |
configure.ac | 7 +++++++ |
| 32 |
4 files changed, 32 insertions(+) |
| 33 |
|
| 34 |
diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am |
| 35 |
index 9a02bbd..c775990 100644 |
| 36 |
--- a/Source/WebKit2/GNUmakefile.am |
| 37 |
+++ b/Source/WebKit2/GNUmakefile.am |
| 38 |
@@ -572,6 +572,7 @@ Programs_WebKitPluginProcess_LDADD += \ |
| 39 |
$(PANGO_LIBS) \ |
| 40 |
$(PNG_LIBS) \ |
| 41 |
$(SHLWAPI_LIBS) \ |
| 42 |
+ $(SHM_LIBS) \ |
| 43 |
$(SQLITE3_LIBS) \ |
| 44 |
$(UNICODE_LIBS) \ |
| 45 |
$(XRENDER_LIBS) \ |
| 46 |
diff --git a/configure.ac b/configure.ac |
| 47 |
index 4e1f0e8..97980e4 100644 |
| 48 |
--- a/configure.ac |
| 49 |
+++ b/configure.ac |
| 50 |
@@ -1118,6 +1118,13 @@ if test "$enable_webkit2" = "yes"; then |
| 51 |
if test "$have_gtk_unix_printing" = "yes"; then |
| 52 |
AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available]) |
| 53 |
fi |
| 54 |
+ |
| 55 |
+ # On some Linux/Unix platforms, shm_* may only be available if linking |
| 56 |
+ # against librt |
| 57 |
+ if test "$os_win32" = "no"; then |
| 58 |
+ AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"]) |
| 59 |
+ AC_SUBST(SHM_LIBS) |
| 60 |
+ fi |
| 61 |
fi |
| 62 |
|
| 63 |
# Plugin Process |
| 64 |
-- |
| 65 |
1.8.0 |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.1 net-libs/webkit-gtk/files/webkit-gtk-1.10.2-gcc-4.8.patch |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-gcc-4.8.patch?rev=1.1&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-gcc-4.8.patch?rev=1.1&content-type=text/plain |
| 74 |
|
| 75 |
Index: webkit-gtk-1.10.2-gcc-4.8.patch |
| 76 |
=================================================================== |
| 77 |
2013-04-04 Andras Becsi <andras.becsi@×××××.com> |
| 78 |
|
| 79 |
Fix the build with GCC 4.8 |
| 80 |
https://bugs.webkit.org/show_bug.cgi?id=113147 |
| 81 |
|
| 82 |
Initialize JSObject* exception to suppress warnings that make |
| 83 |
the build fail because of -Werror=maybe-uninitialized. |
| 84 |
|
| 85 |
* runtime/Executable.cpp: |
| 86 |
(JSC::FunctionExecutable::compileForCallInternal): |
| 87 |
(JSC::FunctionExecutable::compileForConstructInternal): |
| 88 |
|
| 89 |
Fix the build with GCC 4.8 |
| 90 |
https://bugs.webkit.org/show_bug.cgi?id=113147 |
| 91 |
|
| 92 |
Disable diagnostic warning -Wunused-local-typedefs for GCC 4.8 |
| 93 |
since dummy typedefs are commonly used in the codebase. |
| 94 |
|
| 95 |
* wtf/Compiler.h: |
| 96 |
|
| 97 |
diff --git a/Source/JavaScriptCore/runtime/Executable.cpp b/Source/JavaScriptCore/runtime/Executable.cpp |
| 98 |
index 8b58b62aa3e39a347fae92961af69484de795a07..057bb43c6777bc4b63b23c0cabf32d106ca0243c 100644 |
| 99 |
--- a/Source/JavaScriptCore/runtime/Executable.cpp |
| 100 |
@@ -515,7 +515,7 @@ |
| 101 |
UNUSED_PARAM(bytecodeIndex); |
| 102 |
#endif |
| 103 |
ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForCall); |
| 104 |
- JSObject* exception; |
| 105 |
+ JSObject* exception = 0; |
| 106 |
OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(scopeChainNode, !!m_codeBlockForCall ? OptimizingCompilation : FirstCompilation, CodeForCall, exception); |
| 107 |
if (!newCodeBlock) |
| 108 |
return exception; |
| 109 |
@@ -558,7 +558,7 @@ |
| 110 |
#endif |
| 111 |
|
| 112 |
ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForConstruct); |
| 113 |
- JSObject* exception; |
| 114 |
+ JSObject* exception = 0; |
| 115 |
OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(scopeChainNode, !!m_codeBlockForConstruct ? OptimizingCompilation : FirstCompilation, CodeForConstruct, exception); |
| 116 |
if (!newCodeBlock) |
| 117 |
return exception; |
| 118 |
diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h |
| 119 |
index e11747fb6519fe59560b47aabbe5480e98a9f155..b886f37151292851f311306b90fa5b9bc2880e06 100644 |
| 120 |
--- a/Source/WTF/wtf/Compiler.h |
| 121 |
+++ b/Source/WTF/wtf/Compiler.h |
| 122 |
@@ -122,6 +122,9 @@ |
| 123 |
|
| 124 |
/* Specific compiler features */ |
| 125 |
#if COMPILER(GCC) && !COMPILER(CLANG) |
| 126 |
+#if GCC_VERSION_AT_LEAST(4, 8, 0) |
| 127 |
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs" |
| 128 |
+#endif |
| 129 |
#if GCC_VERSION_AT_LEAST(4, 7, 0) && __cplusplus >= 201103L |
| 130 |
#define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1 |
| 131 |
#define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1 |
Archives