From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 82A15139085 for ; Fri, 3 Feb 2017 00:44:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9D9DE0DBD; Fri, 3 Feb 2017 00:44:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 71073E0DBD for ; Fri, 3 Feb 2017 00:44:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A3FB340C9D for ; Fri, 3 Feb 2017 00:44:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E7F83B8E for ; Fri, 3 Feb 2017 00:44:48 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1486082631.96435086ec227e2d4920d288d8a6c8e20f6c6a5f.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/ X-VCS-Repository: proj/musl X-VCS-Files: net-libs/webkit-gtk/Manifest net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch net-libs/webkit-gtk/metadata.xml net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: 96435086ec227e2d4920d288d8a6c8e20f6c6a5f X-VCS-Branch: master Date: Fri, 3 Feb 2017 00:44:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4312b5de-97fa-4e5c-b695-cee7815cc1fb X-Archives-Hash: eea00f466794504babb978412302c3a5 commit: 96435086ec227e2d4920d288d8a6c8e20f6c6a5f Author: Aric Belsito gmail com> AuthorDate: Fri Feb 3 00:43:51 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Fri Feb 3 00:43:51 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=96435086 net-libs/webkit-gtk: Bump 2.4.10-* to 2.4.11 Drop 2.10.9 which is woefully out of date. net-libs/webkit-gtk/Manifest | 22 +- .../files/webkit-gtk-1.11.90-gtk-docize-fix.patch | 4 +- .../webkit-gtk-2.10.9-remove-execinfo_h.patch | 34 --- .../files/webkit-gtk-2.4.11-video-web-audio.patch | 11 + .../files/webkit-gtk-2.4.4-atomic-ppc.patch | 8 +- .../files/webkit-gtk-2.4.4-jpeg-9a.patch | 4 +- .../webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch | 29 +++ .../files/webkit-gtk-2.8.5-fix-alpha-build.patch | 22 -- .../files/webkit-gtk-2.8.5-fix-ia64-build.patch | 21 -- ...kit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch | 22 -- net-libs/webkit-gtk/metadata.xml | 1 - net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild | 280 --------------------- ...k-2.4.10.ebuild => webkit-gtk-2.4.11-r1.ebuild} | 56 ++--- ...0-r200.ebuild => webkit-gtk-2.4.11-r200.ebuild} | 40 ++- 14 files changed, 104 insertions(+), 450 deletions(-) diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 68b9afd..989b7e1 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,20 +1,16 @@ -AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818 +AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256 20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32 WHIRLPOOL a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43 AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1 -AUX webkit-gtk-2.10.9-remove-execinfo_h.patch 1239 SHA256 71ce90e34c6ebfd4836e1f7a3307204fd0432c18e592ce6ec1ead7ece12afbee SHA512 1496cbc7b111f720f852d2dfee77214d43b7e3fca804dbbd7704a335a6f5e09d2fd38724d212a4aa7987ba9bf0d35b838b9473e69a890802be862fd003c8e9ca WHIRLPOOL 17a19a4bec478ddb9558918c58c39d023e59196b6bc286e638aec7f7bc80d6ac1a249dd94547361d8ad821a8338ec8e0ea64b8bd3ae1fb9deff3f055701a0d6e AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92 AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072 AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925 -AUX webkit-gtk-2.4.4-atomic-ppc.patch 1286 SHA256 458942430a4ee4c7f4efe0524b3b2c7d5213609136d1bc6c2a58fff92b247a33 SHA512 2aabf77fc69a26fde006cf16eabe7339bd5839bf205f50258978cad089f368cc5ce51f965ca3684c7958cfe217e50db1f09f47f5ee0b5057f4a108b2cfe23f6b WHIRLPOOL 7d346765d531d4c52423d963da3082398112ac4e82d2f5d6f973237a53917d4b3498d5c5f2398ed53337b7abc2774354496494f01de4dd592a512daff3cfbed9 -AUX webkit-gtk-2.4.4-jpeg-9a.patch 1258 SHA256 bd626ff2df4a44b98b0a82fa3f555a0a2cca8d1233f56104d78ff6959f5b2f2b SHA512 27be24cb4d592b5a8e1378751563baae6862ee64b69a4fe24f9f8da7b31020860adad784ecf6be6959c857566e0893526242ae03268679e3a590d673bf8717b8 WHIRLPOOL d768198c603a85afc56be1aa35506781e2bc7d561c7eda9ee64f6a504f6d77edda1537aa7d652b99350dfdd8213dd701b4d7fc8133946b67a4648ef8d5b7dac0 +AUX webkit-gtk-2.4.11-video-web-audio.patch 520 SHA256 103db2178fb3bc6db9706dc2874c1a68d748133082330a6f6cca909d26fa0dac SHA512 df7b54fed95d0132bbed22fa90f3523b94a70940ac33acefc46aa0c59b604ee36d3350035fe8bca78ba9a7ab45527d0c1afde8160e4d408eb8a7ee07048bd8d1 WHIRLPOOL af4cad5c7da3fca085e588dadf093ae3155351b81dbf2cfe8201c93515b4e23af08e62049f836dec960fe25297a786e379cd51c386ca9c605a8812cc9e5a6506 +AUX webkit-gtk-2.4.4-atomic-ppc.patch 1294 SHA256 64fc5b9e019fb759cfcf2dc65d7bf0dfcd2cff6469049098d84e180bcf4fbfcc SHA512 80c5c158eba950e56e6a3c046cc3325efcdeab0ad1add140bae1b08a9620553e2166f5df7b0a586814cd49add430dfd15b6675f1467532f294120bdd8852d067 WHIRLPOOL 310ac0d0d04156f681e9039634c2f3ca02c358f70dec091f4c1c221653eef97dcea8c454ac64d3c3b326c47687c3b4e7d168d2fba6813b28ae6c450891849723 +AUX webkit-gtk-2.4.4-jpeg-9a.patch 1262 SHA256 b442a8021ec5bfc751708fe6409baff6ae8576d7fb49da95245b6ba2c1557536 SHA512 8bfc1255f083b7d4cdbe5e03d7a006efae976988847f36c27758589a2410cf6b84e0c81a3c9673ec9b552e34af92e6d833a8db5413c03d0c85c3d82f4628c583 WHIRLPOOL 25e62e4c95b99bad82a45a82091c6ac7a7cbe02391b4873d383649413fa6eea236130a62aef7ba1f0a24f172554e9b6d650f7bfeb41abb96b8387ef85f807932 AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e623a2fd67e80111d624a2b3c01fde2fbbcd64e SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 WHIRLPOOL ba3f9b9dbee12f6dae05db9f343a46fd7d182d377e1a951e1785a5aff9a046d057bbf85821642e948c15a084e69d01054fe5632d7460892b196334adea582e72 +AUX webkit-gtk-2.4.9-gcc-6.patch 1890 SHA256 d0d82c1a1e955e03dd7667e351d99da485d7297acf378e715820202e48d4088e SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c WHIRLPOOL 1ebbeb9564978b3ddf4488c9fe72113da0ff10a0ba8c3bcd418b913a936ebe09da907e86714b7419f2746af1648ab786850559c4a5c6a0f1b51ed98e9aab0334 AUX webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch 733 SHA256 d447d71943cacdec166f0a65f34258494f70719ba9cd951d5b512902e20200d0 SHA512 580531428c0498e996de358a20a499f36edaaa98a108088c5dde428a997a61e5a55293cf855d652655c193cd5cda8e25723cac360d3983fcd1fbce35aa9b41a0 WHIRLPOOL b68bc94045ef46f5959146b6d14e2e39c9a1e3c7a39a9e7164ece4db1d1fc9f3c846b26af5e7b2b81db5ee82913b4018097367c6843a8b41758316cd27371bcc AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d4f29417e3d4ebd619e183535368175c473485c2dd SHA512 f4a0647530f29bed5fdbf0fcec5d52c6064a13c00715fb6fb490490dee29dac87bb2b1d9ab35ce2bf7b9eb2da262cf5bb07b7c84f82f84cfab784a61f163811e WHIRLPOOL f18be67ef26051ebe271481c3444761c604a40fcda9679f3778cccbc3513f8501a6c3ea9b43fa1b3c3eaa04ca08585e62d8b3a27185358dc69c612ef8eab8364 -AUX webkit-gtk-2.8.5-fix-alpha-build.patch 910 SHA256 2e3ea0b6288ff3471349243edd75d1a97fbacdc6a426874f4c9be8a64d2c2b7f SHA512 748ef4b431c02b3b4ba8908b8bdf28f5b11b90a798ac21484d99a3941e0306102b9d8a298f177da63cd86579b64def31e6f2abe66044b5c211bb4382c5a57f86 WHIRLPOOL 4a8ee812d543c016a02321e5e6db83580c6f0301dd57b5cd5bf4e22b7a6f214ac6b41229160d60db42982fd37a11c5f654ef81a8c1b178a6d78e54ed6076ea11 -AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82 -AUX webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch 876 SHA256 50052d2a82d6c0d19af0bfb476824059e4448652c6533275084e24dfb5ef19c3 SHA512 ad0925070277d97fce3713f66ffcbfa193fdb3231d63717dfd8b217b420bf6f8665694eef2fcf9d2eef2abefe0fe5406759287395117497de34a00dba1b9c144 WHIRLPOOL d4da619b5bf1000d5dee409b07bcce6ba8da25f0e726e22433e2a3a610773ee4394becd55ccf7efaddebb86e74f1f97868e98240fa9bb80c0ab7a320f03c666e -DIST webkitgtk-2.10.9.tar.xz 10992980 SHA256 bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 SHA512 a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228 WHIRLPOOL c6f36d4195bbd9f97358700ac446ad65d5a426ba7f0913d69163b2f37c1aedc623bdea3650f2ad7da009f1d234c9d54a163e9155794d8218342332b82ead76df -DIST webkitgtk-2.4.10.tar.xz 9867504 SHA256 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614 SHA512 09cff437dadfa6ba1b90674ef4d9db558710247559bb8c2894b54a43504428b99465aa5d35bf3323c22827b67711e8dc031d4b63361eb9906c96e2bfd8ee11a8 WHIRLPOOL af08ef45249313915003a150a56228b1edc25f870c149d4ece5783da302d307b40046a05bf3c157807465f248d083ebe549c48d13eefdf820eb51c2efe0f5f98 -EBUILD webkit-gtk-2.10.9.ebuild 8215 SHA256 bbed605d7e11fe85643355306d44c4ef269038e74c1fe1613fe0a2da740e0f95 SHA512 fc4affe4c157aa5c119d2b33f6a0436fa9fd41ced3020cc31eafdbe4181c27c5d51f2a5a8395ee7586d4820223af719ada02941bee8087d910e7c7fe87ed1962 WHIRLPOOL eb092102c34cf5770649bf5af05f227b67fe31d20820a9db2ce0b43a68754c7ec5e565f0c730c6a84f369437b77a814cbb79d6ba593d6f8225f8db41095a4c71 -EBUILD webkit-gtk-2.4.10-r200.ebuild 8475 SHA256 145d3cf546353f92325f3d98752903231867a56a6ef59ff8e0191c6e3b959afe SHA512 b1cdaf32976ee41a4acd0f877cf19ef133d979ec618d2d22f1d9d1170f3573fd3f553845a03c4f7b054657aa7f92d959974a6f8d35d150f5545903ecabcfa92f WHIRLPOOL 584c3f2b8942ddfffdff321544c253f698c002d51d0383fb837477f70c8d7196798a6bf9a909dc64bc0bf481875f998fa348e7ed40af8254ded52ec5741570a8 -EBUILD webkit-gtk-2.4.10.ebuild 8845 SHA256 9cdea807cc1dbe3b4c4f62b47de9b19f683fb5826546f892009aa26bb848cb9b SHA512 c615b9b07ec37a9aca81e6a4cb82cba52c24fb26cc22e5ee4f016cc951e922541d1a102e278ef6e69a56e1d62c50d72dca2ec221729a7ea58d677d2cb960930c WHIRLPOOL d099dc2555147efa2145bcad5eff2b61ade60d16b8ce3652ffaf116ad95ca12d939091b679d0b1f58600a0295b3d3deb095b6a5ab9f40fa44725778e5e6ba347 -MISC metadata.xml 717 SHA256 0b14a37b119705ad7c50e3857d51674eaade8148fed94caf07ca2afd5282fa58 SHA512 996dbd54e6670cde58d6fca941fd6d1a11a054e42791e1b451005c2c6b5b46d14454869cbc9e4911e5b7c0119b8a04096c95ac7c20f8389ab9cd866c9947b365 WHIRLPOOL 531accd99228e552b04a9644b470db00f9c633021a438bc1895e517e848ea73ce807ddb5225df5fd3f74af19b80e86ab83ae83c8254de4a6b246dea3f7cc1803 +DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3 +EBUILD webkit-gtk-2.4.11-r1.ebuild 9123 SHA256 6fc62f471fe028d8e0a2fe0a130dc53833f62c49ab7136dbc446dd290b4b71ce SHA512 5e12f7febbd297859e6d9fa709efbdfe440b5d7900d70ee1e81479313bfabd5583b6c1a68d912748df02af2d1f430fac63382ecb92a9986cbb9841602294b5c8 WHIRLPOOL f9d46ac0776142733ee7d2fe5907acaa265198f6bc1334e74c8c6f7fecece8545de9f620d15d00b7f8aa3225e0d325ace4af58360145d3f9f8bd20a4ed74a067 +EBUILD webkit-gtk-2.4.11-r200.ebuild 8530 SHA256 e579be98b8fba274c974019ac867e2a2fdefba5d4b7e4419c324f1eae74b7a5d SHA512 dbf7e7e1dffc157be18602e0e1bda57297f30c5a1f00862736067d6fee8573c1711f027bab07a698a1cd382a6f6d825327deed7274930a098f416e77c8d05371 WHIRLPOOL ec612bb5db541cdd866227f09281f63dbf9e157eb485c8ce8e87f9664ef3213750958f0ba13f3a87cfe641b3c6f1972ea15a9955d2293e101cf8b466dea10aad +MISC metadata.xml 634 SHA256 48f0a29437afb03701f60011476eb2ad74683d918b69c6963e16f92b763bb0de SHA512 36bcb7965d4bf4b61d9399c794d4f4a438152bf6338ef68cfd6a04f8c94351b35f1cb09172fb4eee4db9b072e0984420ee976031e2c27963fe0390e079494ba8 WHIRLPOOL e14b1f0070ff39f026b1c406718d68f2ccffe4c4db7bf5afe16c658cc1837cb3b29820868b2e9617beb37442eab7ac2f9d8340f55a763bc5ee8ebe1a2065c694 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch index 8f56ab2..c94f545 100644 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch @@ -1,5 +1,5 @@ ---- configure.ac.old 2013-03-02 09:22:53.791750644 +0200 -+++ configure.ac 2013-03-02 09:24:56.725213764 +0200 +--- a/configure.ac.old 2013-03-02 09:22:53.791750644 +0200 ++++ b/configure.ac 2013-03-02 09:24:56.725213764 +0200 @@ -24,6 +24,7 @@ m4_include([Source/autotools/SetupLibtool.m4]) m4_include([Source/autotools/ReadCommandLineArguments.m4]) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch deleted file mode 100644 index 5e661d9..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur webkitgtk-2.10.9.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.10.9/Source/WTF/wtf/Assertions.cpp ---- webkitgtk-2.10.9.orig/Source/WTF/wtf/Assertions.cpp 2016-03-17 02:48:18.000000000 -0400 -+++ webkitgtk-2.10.9/Source/WTF/wtf/Assertions.cpp 2016-06-01 09:31:42.345411637 -0400 -@@ -71,7 +71,7 @@ - #if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) - #include - #include --#include -+//#include - #endif - - extern "C" { -@@ -226,7 +226,7 @@ - void WTFGetBacktrace(void** stack, int* size) - { - #if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) -- *size = backtrace(stack, *size); -+// *size = backtrace(stack, *size); - #elif OS(WINDOWS) - // The CaptureStackBackTrace function is available in XP, but it is not defined - // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function -@@ -272,9 +272,9 @@ - void WTFPrintBacktrace(void** stack, int size) - { - #if USE(BACKTRACE_SYMBOLS) -- char** symbols = backtrace_symbols(stack, size); -- if (!symbols) -- return; -+// char** symbols = backtrace_symbols(stack, size); -+// if (!symbols) -+// return; - #endif - - for (int i = 0; i < size; ++i) { diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch new file mode 100644 index 0000000..ead696c --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch @@ -0,0 +1,11 @@ +diff -purN a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp +--- a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-03-14 08:09:01.000000000 +0100 ++++ b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-04-10 19:43:00.215345381 +0200 +@@ -40,6 +40,7 @@ + #include "PaintInfo.h" + #include "PlatformContextCairo.h" + #include "RenderElement.h" ++#include "RenderBox.h" + #include "TextDirection.h" + #include "UserAgentStyleSheets.h" + #include "WidgetRenderingContext.h" diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch index 3c0ea88..c160376 100644 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch @@ -1,7 +1,7 @@ $OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $ https://bugs.webkit.org/show_bug.cgi?id=130837 ---- Source/WebKit2/Platform/IPC/Connection.h.orig Fri Jul 4 11:06:55 2014 -+++ Source/WebKit2/Platform/IPC/Connection.h Mon Jul 14 19:31:35 2014 +--- a/Source/WebKit2/Platform/IPC/Connection.h.orig Fri Jul 4 11:06:55 2014 ++++ b/Source/WebKit2/Platform/IPC/Connection.h Mon Jul 14 19:31:35 2014 @@ -216,7 +216,11 @@ class Connection : public ThreadSafeRefCountedtype == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) +- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) +- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) ++ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) ++ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) + && (eventTime - m_previousClickTime < static_cast(doubleClickTime)) + && (buttonEvent->button == m_previousClickButton))) + m_currentClickCount++; +diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp +--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600 ++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700 +@@ -659,7 +659,7 @@ + if (!std::isfinite(time)) + return String::fromUTF8(_("indefinite time")); + +- int seconds = static_cast(abs(time)); ++ int seconds = static_cast(fabs(time)); + int days = seconds / (60 * 60 * 24); + int hours = seconds / (60 * 60); + int minutes = (seconds / 60) % 60; diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch deleted file mode 100644 index cafceb5..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300 -+++ ./Source/JavaScriptCore/CMakeLists.txt 2015-10-29 17:47:10.535712494 +0300 -@@ -1146,6 +1146,7 @@ - list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj) - endif () - elseif (WTF_CPU_ARM64) -+elseif (WTF_CPU_ALPHA) - elseif (WTF_CPU_HPPA) - elseif (WTF_CPU_IA64) - elseif (WTF_CPU_PPC) - elseif (WTF_CPU_PPC64) ---- CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300 -+++ CMakeLists.txt 2015-10-29 01:23:37.416886279 +0300 -@@ -82,6 +82,8 @@ - set(WTF_CPU_ARM 1) - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") - set(WTF_CPU_ARM64 1) -+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha") -+ set(WTF_CPU_ALPHA 1) - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") - set(WTF_CPU_MIPS 1) - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4") diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch deleted file mode 100644 index 6c88c49..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -98,6 +98,8 @@ - set(WTF_CPU_PPC64LE 1) - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "parisc*") - set(WTF_CPU_HPPA 1) -+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ia64") -+ set(WTF_CPU_IA64 1) - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390") - set(WTF_CPU_S390 1) - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") ---- a/Source/JavaScriptCore/CMakeLists.txt -+++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1147,6 +1147,7 @@ - endif () - elseif (WTF_CPU_ARM64) - elseif (WTF_CPU_HPPA) -+elseif (WTF_CPU_IA64) - elseif (WTF_CPU_PPC) - elseif (WTF_CPU_PPC64) - elseif (WTF_CPU_PPC64LE) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch deleted file mode 100644 index 79b57ae..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch +++ /dev/null @@ -1,22 +0,0 @@ -2015-08-24 Alexandre Rostovtsev - - webkit2gtkinjectedbundle requires forwarding headers - https://bugs.webkit.org/show_bug.cgi?id=148379 - - Fixes GTK build with -j1 - - * PlatformGTK.cmake: - -Index: Source/WebKit2/PlatformGTK.cmake -=================================================================== ---- Source/WebKit2/PlatformGTK.cmake (revision 188859) -+++ Source/WebKit2/PlatformGTK.cmake (working copy) -@@ -860,7 +860,7 @@ include_directories( - ) - - add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp") --add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings) -+add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings WebKit2-forwarding-headers) - add_webkit2_prefix_header(webkit2gtkinjectedbundle) - - # Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml index 3d3909c..6e822e5 100644 --- a/net-libs/webkit-gtk/metadata.xml +++ b/net-libs/webkit-gtk/metadata.xml @@ -10,7 +10,6 @@ Enable EGL support. Enable geolocation support through app-misc/geoclue Enable GLESv2 support. - Enable libsecret support to store login credentials Build support for the WebGL HTML API using virtual/opengl diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild deleted file mode 100644 index 57248e3..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -CMAKE_MAKEFILE_GENERATOR="ninja" -GCONF_DEBUG="no" -PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby20 ruby21 ruby22 ruby23" - -inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx - -MY_P="webkitgtk-${PV}" -DESCRIPTION="Open source web browser engine" -HOMEPAGE="http://www.webkitgtk.org/" -SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" - -LICENSE="LGPL-2+ BSD" -SLOT="4/37" # soname version of libwebkit2gtk-4.0 -KEYWORDS="amd64 ~arm ~mips ~ppc x86" - -IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X" -# seccomp - -# webgl needs gstreamer, bug #560612 -REQUIRED_USE=" - geoloc? ( introspection ) - gles2? ( egl ) - introspection? ( gstreamer ) - nsplugin? ( X ) - webgl? ( ^^ ( gles2 opengl ) ) - !webgl? ( ?? ( gles2 opengl ) ) - webgl? ( gstreamer ) - || ( aqua wayland X ) -" - -# Tests fail to link for inexplicable reasons -# https://bugs.webkit.org/show_bug.cgi?id=148210 -RESTRICT="test" - -# use sqlite, svg by default -# Aqua support in gtk3 is untested -# Dependencies found at Source/cmake/OptionsGTK.cmake -RDEPEND=" - dev-db/sqlite:3= - >=dev-libs/glib-2.36:2 - >=dev-libs/icu-3.8.1-r1:= - >=dev-libs/libxml2-2.8:2 - >=dev-libs/libxslt-1.1.7 - >=media-libs/fontconfig-2.8:1.0 - >=media-libs/freetype-2.4.2:2 - >=media-libs/harfbuzz-0.9.18:=[icu(+)] - >=media-libs/libpng-1.4:0= - media-libs/libwebp:= - >=net-libs/gnutls-3 - >=net-libs/libsoup-2.42:2.4[introspection?] - virtual/jpeg:0= - >=x11-libs/cairo-1.10.2:= - >=x11-libs/gtk+-3.14:3[introspection?] - x11-libs/libnotify - >=x11-libs/pango-1.30.0 - - aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) - egl? ( media-libs/mesa[egl] ) - geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) - gles2? ( media-libs/mesa[gles2] ) - gnome-keyring? ( app-crypt/libsecret ) - gstreamer? ( - >=media-libs/gstreamer-1.2:1.0 - >=media-libs/gst-plugins-base-1.2:1.0 - >=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] ) - introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) - nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) - opengl? ( virtual/opengl - x11-libs/cairo[opengl] ) - spell? ( >=app-text/enchant-0.22:= ) - wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) - webgl? ( - x11-libs/cairo[opengl] - x11-libs/libXcomposite - x11-libs/libXdamage ) - X? ( - x11-libs/cairo[X] - >=x11-libs/gtk+-3.14:3[X] - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - x11-libs/libXt ) -" -# Control knob is private and set to off -# seccomp? ( sys-libs/libseccomp ) - -# paxctl needed for bug #407085 -# Need real bison, not yacc -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - ${RUBY_DEPS} - >=dev-lang/perl-5.10 - >=app-accessibility/at-spi2-core-2.5.3 - >=dev-libs/atk-2.8.0 - dev-libs/hyphen - >=dev-util/gtk-doc-am-1.10 - >=dev-util/gperf-3.0.1 - >=sys-devel/bison-2.4.3 - >=sys-devel/flex-2.5.34 - || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) - sys-devel/gettext - virtual/pkgconfig - - doc? ( >=dev-util/gtk-doc-1.10 ) - geoloc? ( dev-util/gdbus-codegen ) - introspection? ( jit? ( sys-apps/paxctl ) ) - test? ( - dev-lang/python:2.7 - dev-python/pygobject:3[python_targets_python2_7] - x11-themes/hicolor-icon-theme - jit? ( sys-apps/paxctl ) ) -" - -S="${WORKDIR}/${MY_P}" - -CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] ; then - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" - check-reqs_pkg_pretend - fi - - if ! test-flag-CXX -std=c++11 ; then - die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags" - fi - - if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then - die 'The active compiler needs to be gcc 4.9 (or newer)' - fi - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - check-reqs_pkg_setup - fi - - [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup -} - -src_prepare() { - # https://bugs.gentoo.org/show_bug.cgi?id=555504 - epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch - - # musl patches - epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch - epatch "${FILESDIR}"/${PN}-2.10.9-remove-execinfo_h.patch - - # https://bugs.gentoo.org/show_bug.cgi?id=564352 - epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch - - # https://bugs.webkit.org/show_bug.cgi?id=148379 - epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch - - gnome2_src_prepare -} - -src_configure() { - # Respect CC, otherwise fails on prefix #395875 - tc-export CC - - # Arches without JIT support also need this to really disable it in all places - use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0 - - # It does not compile on alpha without this in LDFLAGS - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 - use alpha && append-ldflags "-Wl,--no-relax" - - # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 - use ia64 && append-ldflags "-Wl,--no-as-needed" - - # Sigbuses on SPARC with mcpu and co., bug #??? - use sparc && filter-flags "-mvis" - - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - # Try to use less memory, bug #469942 (see Fedora .spec for reference) - # --no-keep-memory doesn't work on ia64, bug #502492 - if ! use ia64; then - append-ldflags "-Wl,--no-keep-memory" - fi - if ! tc-ld-is-gold ; then - append-ldflags "-Wl,--reduce-memory-overheads" - fi - - # older glibc needs this for INTPTR_MAX, bug #533976 - if has_version "=net-libs/libsoup-2.42:2.4[introspection?] virtual/jpeg:0= >=x11-libs/cairo-1.10:=[X?] - >=x11-libs/gtk+-3.6.0:3[X?,aqua?,introspection?] + >=x11-libs/gtk+-3.20.0:3[X?,aqua?,introspection?] >=x11-libs/pango-1.30.0 >=x11-libs/gtk+-2.24.10:2 egl? ( media-libs/mesa[egl] ) - geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) + geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( @@ -90,7 +91,7 @@ DEPEND="${RDEPEND} >=sys-devel/make-3.82-r4 virtual/pkgconfig - geoloc? ( dev-util/gdbus-codegen ) + geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 @@ -140,7 +141,7 @@ pkg_setup() { src_prepare() { # intermediate MacPorts hack while upstream bug is not fixed properly # https://bugs.webkit.org/show_bug.cgi?id=28727 - use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch + use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch # Leave optimization level to user CFLAGS # FORTIFY_SOURCE is enabled by default in Gentoo @@ -149,29 +150,35 @@ src_prepare() { -i Source/autotools/SetupCompilerFlags.m4 || die # bug #459978, upstream bug #113397 - epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch + eapply "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch # Debian patches to fix support for some arches # https://bugs.webkit.org/show_bug.cgi?id=129540 - epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch + eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch # https://bugs.webkit.org/show_bug.cgi?id=129542 - epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch + eapply "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch # Fix building on ppc (from OpenBSD, only needed on slot 3) # https://bugs.webkit.org/show_bug.cgi?id=130837 - epatch "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch + eapply "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch # Fix build with recent libjpeg, bug #481688 # https://bugs.webkit.org/show_bug.cgi?id=122412 - epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch + eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch # Fix building with --disable-webgl, bug #500966 # https://bugs.webkit.org/show_bug.cgi?id=131267 - epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch + eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch + + # https://bugs.webkit.org/show_bug.cgi?id=156510 + eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch + + # https://bugs.webkit.org/show_bug.cgi?id=159124#c1 + eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch # musl patches - epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch - epatch "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.patch + eapply "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch + eapply "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.patch AT_M4DIR=Source/autotools eautoreconf @@ -226,7 +233,7 @@ src_configure() { $(use_enable coverage) \ $(use_enable debug) \ $(use_enable egl) \ - $(use_enable geoloc geolocation) \ + $(use_enable geolocation) \ $(use_enable gles2) \ $(use_enable gnome-keyring credential_storage) \ $(use_enable gstreamer video) \ @@ -245,12 +252,6 @@ src_configure() { ${ruby_interpreter} } -src_compile() { - # Try to avoid issues like bug #463960 - unset DISPLAY - gnome2_src_compile -} - src_test() { # Tests expect an out-of-source build in WebKitBuild ln -s . WebKitBuild || die "ln failed" @@ -258,10 +259,9 @@ src_test() { # Prevents test failures on PaX systems use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* - unset DISPLAY # Tests need virtualx, bug #294691, bug #310695 # Parallel tests sometimes fail - Xemake -j1 check + virtx emake -j1 check } src_install() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild similarity index 89% rename from net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild rename to net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild index 32ad6ed..abb40d8 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" -GCONF_DEBUG="no" +EAPI="6" PYTHON_COMPAT=( python2_7 ) USE_RUBY="ruby20 ruby21 ruby22 ruby23" -inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx +inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx MY_P="webkitgtk-${PV}" DESCRIPTION="Open source web browser engine" @@ -16,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" LICENSE="LGPL-2+ BSD" SLOT="2" # no usable subslot -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X" # bugs 372493, 416331 @@ -131,7 +130,7 @@ pkg_setup() { src_prepare() { # intermediate MacPorts hack while upstream bug is not fixed properly # https://bugs.webkit.org/show_bug.cgi?id=28727 - use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch + use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch # Leave optimization level to user CFLAGS # FORTIFY_SOURCE is enabled by default in Gentoo @@ -140,25 +139,31 @@ src_prepare() { -i Source/autotools/SetupCompilerFlags.m4 || die # bug #459978, upstream bug #113397 - epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch + eapply "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch # Debian patches to fix support for some arches # https://bugs.webkit.org/show_bug.cgi?id=129540 - epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch + eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch # https://bugs.webkit.org/show_bug.cgi?id=129542 - epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch + eapply "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch # Fix build with recent libjpeg, bug #481688 # https://bugs.webkit.org/show_bug.cgi?id=122412 - epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch + eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch # Fix building with --disable-webgl, bug #500966 # https://bugs.webkit.org/show_bug.cgi?id=131267 - epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch + eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch + + # https://bugs.webkit.org/show_bug.cgi?id=156510 + eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch + + # https://bugs.webkit.org/show_bug.cgi?id=159124#c1 + eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch # musl patches - epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch - epatch "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.patch + eapply "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch + eapply "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.patch AT_M4DIR=Source/autotools eautoreconf @@ -231,12 +236,6 @@ src_configure() { ${ruby_interpreter} } -src_compile() { - # Try to avoid issues like bug #463960 - unset DISPLAY - gnome2_src_compile -} - src_test() { # Tests expect an out-of-source build in WebKitBuild ln -s . WebKitBuild || die "ln failed" @@ -244,10 +243,9 @@ src_test() { # Prevents test failures on PaX systems use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* - unset DISPLAY # Tests need virtualx, bug #294691, bug #310695 # Parallel tests sometimes fail - Xemake -j1 check + virtx emake -j1 check } src_install() {