Fix build failure due to underlinking and silence excessive warnings with gcc-4.8 (bug #458164, thanks to Ted Tanberry and Mike Frysinger).

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 131 insertions, 8 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 9878e7a2ef0f..5abb04d7f74a 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.204 2013/05/15 11:53:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.205 2013/05/28 05:23:26 tetromino Exp $
+
+  28 May 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  webkit-gtk-1.10.2-r300.ebuild, +files/webkit-gtk-1.10.2-gcc-4.8.patch,
+  +files/webkit-gtk-1.10.2-librt.patch:
+  Fix build failure due to underlinking and silence excessive warnings with
+  gcc-4.8 (bug #458164, thanks to Ted Tanberry and Mike Frysinger).
 
 *webkit-gtk-2.0.2 (15 May 2013)
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d33391cd413b..4a0a0b6f7e1a 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -3,6 +3,8 @@ Hash: SHA256
 
 AUX gir-paxctl-lt-wrapper 1015 SHA256 cb11d91ed69c0fcce2ca6502b715d0f846dd6b062ce98441a70a5b2d2f1e042a SHA512 8a0e5ae51ab38f1e27e18cc7a7166267bdb8d9ea814874ddbfc97c5022c555d23cffce496219f0827f9eac32a55d5d95ac353eb56b4439f915a8c34683a1989d WHIRLPOOL 937e28e599f50535f6c8461acc10982719856c5b760d5d592d86819601bca5c032b405f215ff525c0278ce6563704c385cb942e3e21093112dce33d0b280a72c
 AUX webkit-gtk-1.10.1-disable-backtrace-uclibc.patch 1056 SHA256 3d899d5d93e4d5c96c7fe1f82ab96038b8a3add8cec001f023badb1a21eebfb2 SHA512 09c9d3f5dc64d1389279d8fba9027772c9d718ea86ec9649deb01841d5b45930ee5fe9bbc61829cb7b2df0e4a05b8acfdaba0dc08b2786eb9c5e39626fe54b98 WHIRLPOOL d7dc3b235465bc4c96eed6d2b79ceb579b7ed6958b95faeab5e8421a286e03bef48bcfb963fa3cd5ef1375a75749b458227d1b4516dddfdb49e15eee1508bb32
+AUX webkit-gtk-1.10.2-gcc-4.8.patch 2354 SHA256 9336af033a43f166a67e5e9bdd23b4181225c7695c4011c04783ba7d9becdc81 SHA512 da92230ebbb45c14ed3557bf716f49e2e89c1a7f6fb1e7033f24d6dee407cd4936437eb416724a34d46caf4e83c258e736f0e9c8c7919cbae459ac093bf6ff3b WHIRLPOOL a65c0189ee853ca388aa912ec97d41e4f37280132764519357e5af73653d10207a4ab2ab42dea5a07912f2455082b39f11cf724e1110e0735d6f12287750b072
+AUX webkit-gtk-1.10.2-librt.patch 1570 SHA256 27b9cbb716e3a78bfd83351c0ab91ab4caff0d2e52bc5b9002cc281f37c783a4 SHA512 464ea019eab06ef38263fd7c05fb87f92c743eb09fcaf8524ac917d479169f281cfa28f6d1e08fca5dc1100898ddb90690cb057786550a935783cd857e7011d3 WHIRLPOOL 12d1572a14e62b5411e9019e09835a315db57801bc8c5d819cf3a9c276e06ab257aaf694a4337e2b7ff37d5211d5143a33606de68c768f28be5644aa384849e9
 AUX webkit-gtk-1.10.2-wifexited.patch 1045 SHA256 c710aa913e86896365920e3eadab28c3efdbb41906b5b1818bdc40023abd0fee SHA512 078a9b5ed0b5c2b0d13d63b871d837d6dace5a9830ff5a25abe2aca12669ea1941b963c0772659975073cd604757655f0ef972dfeb5a64cd817824cad48f7465 WHIRLPOOL d7b35fccef866bc4eabc18dc0bd21bdf8f392c313cfdf5612153cae0fa4d90c8f628de5aa18c13fe812f1c19dee6bc300559229c94c9a7c2c729acc283495442
 AUX webkit-gtk-1.11.1-libdl.patch 621 SHA256 e99823ba03b99e6490b53b881f67090112d9b8c2ff30b92666e3c9bb39a5cef0 SHA512 46ebcb3ed83a0d2c5d30627c18013a6d1a481be78672e36fea7fbfaa4459a26700446c1a03054e03e87a7d84ab8990467c23187f62a11349d7ccda42c6a14ccc WHIRLPOOL 2ab17276050dac09dd3e78f9b0761d7484e06b5d288ebe75d798f5fe97714e3a7d8b081d356eee279dd2ddfb42d4838474fe48010f1629f27e1c6ff787c14c53
 AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818
@@ -33,18 +35,22 @@ DIST webkit-1.8.3.tar.xz 7814028 SHA256 ada02d636af61aed38f142d3cded662d141ce712
 DIST webkitgtk-1.10.2.tar.xz 8633640 SHA256 19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c SHA512 0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f WHIRLPOOL f733244ce7601f7906f7aa26e750f770cc1472737f62d64c706e7c8c32cc31db22a38824e32c347bf70166f7c5104bac049a80eb08dc040733aee4988542e954
 DIST webkitgtk-2.0.1.tar.xz 9841872 SHA256 6303552a39d7912725d75bc55f530cdb99171fb873e299798d0bb932d6ea76cb SHA512 9924397cb35a73ed43831117fb47017af1b05220c09760a2d323fc788cd0f24625d48f7e638ddd574264e2af0ace0cf1041713629d24256a5fb25c04993b045a WHIRLPOOL 6b6e2dc91a55eeba4e2c61085af45a1e77a3a5145ab2aadbe1d42552c0bc25013e9f623ed942f940de42dc81e2e520cd60248a87e653a64095788c27a58c328e
 DIST webkitgtk-2.0.2.tar.xz 9845276 SHA256 c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2 SHA512 fd9b333fb35b10ad577d85e4f9aa8e1c7b74fa2c8c3199df6c479095b8f3e6cb7146dc37af373cadcb4a90fb168a30977aea42b9fad4169a017c78d99e380ad6 WHIRLPOOL 36ee6c2336f026651bdd122ee86b6026bbc34863c5405d44adce5c9369617f7d913994f0d4cea8bf47df6dbeefa75d41c284fb82cfba41aef79556ec81b7ec1e
-EBUILD webkit-gtk-1.10.2-r300.ebuild 8195 SHA256 53ae0bfb09222dde1f9e70f8caa73304350699329dc62886daa90b28fb2d975f SHA512 45be769437a1d466a78d26603b234d605ef770ce76cc6aa38ce0bb483c12715c1ed54849ff2712091a8997dcb426920e2a17d9cfc2fc61b37131cb18691ea9ac WHIRLPOOL 72158a5f63580e1f7b7db1cbb46d98eeafeb191022e3820160e43f78d910fcc16269c7099bb103db6dae299161f4637cb029d7bac57364ec3e13153f913ae0a3
+EBUILD webkit-gtk-1.10.2-r300.ebuild 8466 SHA256 da9799204c216c4c52255387d1863cc6cd2a13947665df5b1a3c53f22bf808b4 SHA512 5ac324259babd2bb1d8c4524a78f0733732c7f0a5ccdb3dafff88148d074a8024d94e020f8111055528dd81a36d0cfa01f444f5f5c1726364161aa4eb7ea3d01 WHIRLPOOL 0d77d0dcef1e22338fb616bb772d62e720ab41b94cd50b50847b95389c31616f03ba644e18826403372102dbc1b3bbaff6c9233065851c3943aceaaf8b6aea97
 EBUILD webkit-gtk-1.8.3-r200.ebuild 8607 SHA256 7624f6e7fd1ec7312e663165ddb2d1ef559a84de384948547240fc99f1d900ec SHA512 7785ace0b34a623e54b9b10715d8f860bd41fd6a36b68ec69221cf1ae6739286840e05a5712f0f3b0fd7a3cb6b2df9d30dc5fe4d14fb172fd44dc5751087c410 WHIRLPOOL 18f6fe225528c34aa8fdbbc4fc8f9a2efb8a4e9f04b8d4ce7d397fb51f30037a5c1b9d39184156ac8e5434f719df5a0141b0069437dcddf67bdd54734b24b958
 EBUILD webkit-gtk-1.8.3-r201.ebuild 8878 SHA256 e68ca325067edb331d71a44b6c097fc9a701e201919b110ba2875a730646cfc2 SHA512 6303953e539133a52942d819103203886931232cc509861f595e6a8cd6f48c4e96a8a227b6bbdae34b4a40d6d0b14bc870b3c61d7fafb69c7bacc98ff69617c0 WHIRLPOOL 6da40a95521dcf189e8a1d2bc27fee2e2634f9689fa8a87f6b033ce121795b5a5086f4468557b0645d76ef1b0bf1f9e708d5617495fbf9518741d2b3747968e3
 EBUILD webkit-gtk-1.8.3-r300.ebuild 9023 SHA256 25a16bd35a80572608e1bc28b31937f54ff2b764f5843701bb95461a75ef7a35 SHA512 cb89ebfd6487df70e4e478cc1e60d250efb257745e4f176fe2192e0acd0e3c8cef3cd779ab54c0183fbf928475614bde2afa5475de36f9c07cbda5db16e8731e WHIRLPOOL fd18d56cc6f11f8c8cf475c84f7b23cba0fb31e0adafbd0f2f7cfa267a01e6cfe7b46458f18e76aefd550dfaea08f103b677ba3fee82db0819ce7e4f28530a57
 EBUILD webkit-gtk-2.0.1.ebuild 7963 SHA256 8a42647018f2c963b98e3bda22f24c618c628e130aa7b885e18166bef2440dd3 SHA512 7d2b68514d7b8640d0d5220e7361390575c57ef35760525f32125e8db87c728e2c6d85d861412c0373732ed44243b3dd9993b6cebc44421da2115bdf12997bc0 WHIRLPOOL d899dc43fbad5b11c1c59bbc1fcd863d21be4c03e4de4879484eb6eb12a76caf939383e7df8976bac399f4512626289d3ba358cf28fd1cf44eea0722d497af89
 EBUILD webkit-gtk-2.0.2.ebuild 7963 SHA256 a80c276caa362e39fa3375802686631a9b2de7875ea26a0d92338764d9ed3a95 SHA512 86e58b42e2f0ffe176bf3977234dcb1b5fa57204fd82a488dc7b99f9fd6511bb3d8b0d2f5222ab5eb38fb9f926ea046321a3ff569ceeb549a16a7017e97b3193 WHIRLPOOL 641dc46e59c15d34c6c4039fbec7925100b3bec6975958fcf82f6a166b45bbb8dd2aa236c53dde842f9fd1ab7020858d7242f37e5f5a7f2d27d06839e7d21e89
-MISC ChangeLog 41473 SHA256 a58d7c4ecfed2989a2932197c53b8ab76e6048dcaf95f71ba28498c5197ff6c5 SHA512 619783bac9744922ef699592febdf13a2d68230b74b9f0537fff32e012a755a1ef1b11c098cc5721c6db38da76e86874144ed8fb7eec2d11dfbd62824c44b56d WHIRLPOOL e14d266d82aaf38efa1a1df593112aeebdf50833b5d927fa24b1efae041d620557a5c295d64d51eed75a007372e70f8c8d612ba1ba44787ba1a31a7bcb1d8063
+MISC ChangeLog 41794 SHA256 35ef012b089db23c3ae1694a17ac5330ae2151f99fcae7beeb6ee4324309a86e SHA512 9d3fb526d38e22ea2e999eb4a8746ef3c8647f93934ba824aa939189c461b5136ac78f59cc2886bdf3546e855da29c641b71b43eae371626555fabc2983a561d WHIRLPOOL 1af82215da1da9af4d25c67ec2fcc66c226b735612b41dc42f0fed504be421ff19f4e4b71a404be9785734cf93e54fc68726d351511d9f36649a0a0a683efaeb
 MISC metadata.xml 569 SHA256 7680bd9bb6771ea8bc643d5969b074a024b40548f23aa24dae05ecebe3d01983 SHA512 168d9cba348426bdaa2f8d1686bb88fe0e645ae2812de308dc8e186ef735f75c016538d2feefd6f2efe854eb63ea995a9ce39ffcda7c8ca104f7550f921dd8af WHIRLPOOL 2f803a29c30ebc0b202ce619c4d894e2a17ad6ca1002372d8e366eae2e5448fdab592bbc9edb1fcfd02ac8be95de38e0af8e0354559e53fc3b572387033e7591
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGTd0AACgkQCaWpQKGI+9Q2owCdGvJLmhWmykwPwHk2DfPu8o2I
-cTYAnizLL5l3cRf8iqo/807ZH9GmQf/6
-=tALH
+iQEcBAEBCAAGBQJRpD9PAAoJEJ0WA1zPCt1hSmQIAKIyPr6e4q0zcC+0JsRH/iGY
+fffWiFL13ioNG/CFjNWlwJY/1/cgHYS5HCxG9TR9f/b4gmNBPZyFDxLbwTq/0nUv
+VJbTG3gXX3+4PWAWa+UjTp68DIVOS9JLlRuT9GobF+buNGm1rxepV1yJhoIU/S5a
+lSCQTp/pTaKY4qUgGUmyB0/bH2j8ZDobuQBw2YQgIoKNPv4OQL6tSN+vwaewCRlT
+eQMb7sVZPQ2DPLgCnGTLsyBdYLuqHIykW+WjnbCM1hUK5b7YXbjyrNb578rQfGgK
+ic9tI5i0S1reCLW4XK2la6M9Ndlh85w0FAo0IKkjxYppt8LmZAJ++Zwb7dmjRUo=
+=k3e3
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-gcc-4.8.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-gcc-4.8.patch
new file mode 100644
index 000000000000..656a7b18c012
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-gcc-4.8.patch
@@ -0,0 +1,55 @@
+2013-04-04  Andras Becsi  <andras.becsi@digia.com>
+
+        Fix the build with GCC 4.8
+        https://bugs.webkit.org/show_bug.cgi?id=113147
+
+        Initialize JSObject* exception to suppress warnings that make
+        the build fail because of -Werror=maybe-uninitialized.
+
+        * runtime/Executable.cpp:
+        (JSC::FunctionExecutable::compileForCallInternal):
+        (JSC::FunctionExecutable::compileForConstructInternal):
+
+        Fix the build with GCC 4.8
+        https://bugs.webkit.org/show_bug.cgi?id=113147
+
+        Disable diagnostic warning -Wunused-local-typedefs for GCC 4.8
+        since dummy typedefs are commonly used in the codebase.
+
+        * wtf/Compiler.h:
+
+diff --git a/Source/JavaScriptCore/runtime/Executable.cpp b/Source/JavaScriptCore/runtime/Executable.cpp
+index 8b58b62aa3e39a347fae92961af69484de795a07..057bb43c6777bc4b63b23c0cabf32d106ca0243c 100644
+--- a/Source/JavaScriptCore/runtime/Executable.cpp
+@@ -515,7 +515,7 @@
+     UNUSED_PARAM(bytecodeIndex);
+ #endif
+     ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForCall);
+-    JSObject* exception;
++    JSObject* exception = 0;
+     OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(scopeChainNode, !!m_codeBlockForCall ? OptimizingCompilation : FirstCompilation, CodeForCall, exception);
+     if (!newCodeBlock)
+         return exception;
+@@ -558,7 +558,7 @@
+ #endif
+     
+     ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForConstruct);
+-    JSObject* exception;
++    JSObject* exception = 0;
+     OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(scopeChainNode, !!m_codeBlockForConstruct ? OptimizingCompilation : FirstCompilation, CodeForConstruct, exception);
+     if (!newCodeBlock)
+         return exception;
+diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
+index e11747fb6519fe59560b47aabbe5480e98a9f155..b886f37151292851f311306b90fa5b9bc2880e06 100644
+--- a/Source/WTF/wtf/Compiler.h
++++ b/Source/WTF/wtf/Compiler.h
+@@ -122,6 +122,9 @@
+ 
+ /* Specific compiler features */
+ #if COMPILER(GCC) && !COMPILER(CLANG)
++#if GCC_VERSION_AT_LEAST(4, 8, 0)
++#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
++#endif
+ #if GCC_VERSION_AT_LEAST(4, 7, 0) && __cplusplus >= 201103L
+ #define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1
+ #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-librt.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-librt.patch
new file mode 100644
index 000000000000..2e0ae62b8673
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-librt.patch
@@ -0,0 +1,49 @@
+From 3c499aa2a70b06b40a64fb5699622ff458e4ee0f Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Sun, 25 Nov 2012 03:26:42 +0100
+Subject: [PATCH] [GTK] Explicitly link against librt
+
+Fixes broken build with undefined references to shm_open / shm_unlink
+symbols. SharedMemoryUnix.cpp uses these so we need to link with -lrt.
+
+https://bugs.webkit.org/show_bug.cgi?id=103194
+---
+ ChangeLog                     | 12 ++++++++++++
+ Source/WebKit2/ChangeLog      | 12 ++++++++++++
+ Source/WebKit2/GNUmakefile.am |  1 +
+ configure.ac                  |  7 +++++++
+ 4 files changed, 32 insertions(+)
+
+diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am
+index 9a02bbd..c775990 100644
+--- a/Source/WebKit2/GNUmakefile.am
++++ b/Source/WebKit2/GNUmakefile.am
+@@ -572,6 +572,7 @@ Programs_WebKitPluginProcess_LDADD += \
+ 	$(PANGO_LIBS) \
+ 	$(PNG_LIBS) \
+ 	$(SHLWAPI_LIBS) \
++	$(SHM_LIBS) \
+ 	$(SQLITE3_LIBS) \
+ 	$(UNICODE_LIBS) \
+ 	$(XRENDER_LIBS) \
+diff --git a/configure.ac b/configure.ac
+index 4e1f0e8..97980e4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1118,6 +1118,13 @@ if test "$enable_webkit2" = "yes"; then
+    if test "$have_gtk_unix_printing" = "yes"; then
+        AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])
+    fi
++
++   # On some Linux/Unix platforms, shm_* may only be available if linking
++   # against librt
++   if test "$os_win32" = "no"; then
++       AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
++       AC_SUBST(SHM_LIBS)
++   fi
+ fi
+ 
+ # Plugin Process
+-- 
+1.8.0
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
index 9be721d2ef55..6e00f38dac08 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.7 2013/05/01 03:40:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.8 2013/05/28 05:23:26 tetromino Exp $
 
 EAPI="5"
 
@@ -159,6 +159,13 @@ src_prepare() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=449220#c17
 	epatch "${FILESDIR}/${PN}-1.10.2-wifexited.patch"
 
+	# patch for gcc 4.8, to disable COMPILE_ASSERT warnings; fixed in 2.0.x
+	# https://bugs.webkit.org/show_bug.cgi?id=113147
+	epatch "${FILESDIR}/${P}-gcc-4.8.patch"
+
+	# patch for -lrt underlinking issue, bug #458164; fixed in 2.0.x
+	epatch "${FILESDIR}/${P}-librt.patch"
+
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC