diff options
| -rw-r--r-- | net-libs/webkit-gtk/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/Manifest | 29 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.4.3-r200.ebuild | 275 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.4.3.ebuild | 277 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild | 23 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild | 23 |
6 files changed, 54 insertions, 581 deletions
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog index 67dd30e00235..a1f42419bffc 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-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.270 2014/07/23 15:24:00 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.271 2014/07/23 16:41:19 pacho Exp $ + + 23 Jul 2014; Pacho Ramos <pacho@gentoo.org> -webkit-gtk-2.4.3-r200.ebuild, + -webkit-gtk-2.4.3.ebuild, webkit-gtk-2.4.4-r200.ebuild, + webkit-gtk-2.4.4.ebuild: + Reintroduce the ugly hack for nvidia setups as it keeps hanging in some. Drop + old. 23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> webkit-gtk-2.4.4-r200.ebuild, webkit-gtk-2.4.4.ebuild: diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 8e56e489be69..c4ed288b7e96 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX gir-paxctl-lt-wrapper 1015 SHA256 cb11d91ed69c0fcce2ca6502b715d0f846dd6b062ce98441a70a5b2d2f1e042a SHA512 8a0e5ae51ab38f1e27e18cc7a7166267bdb8d9ea814874ddbfc97c5022c555d23cffce496219f0827f9eac32a55d5d95ac353eb56b4439f915a8c34683a1989d WHIRLPOOL 937e28e599f50535f6c8461acc10982719856c5b760d5d592d86819601bca5c032b405f215ff525c0278ce6563704c385cb942e3e21093112dce33d0b280a72c AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818 AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1 @@ -12,30 +9,10 @@ AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2 AUX webkit-gtk-2.2.5-sparc64-build.patch 1169 SHA256 fe6c7c345eb46a0f6856b5f1c547a65185b36c314d6f55a7980c640da0a53b56 SHA512 c59c6aed45ce237d68e58e5b03f46dc66ae4b73cd8a78f7eab9429ef3fe13882d0985da33f30fb425e0b5945298502ac35f9888e666c177fe2467f3f1ed35892 WHIRLPOOL f5a55fcaafc203352583e9ded39e79edca8e9d13cb1cf6e6574e905729fc8e9f92ccd75cd9309b66734f91830847164ebe9011c149e17c85af5549bd40b04f90 AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925 DIST webkitgtk-2.2.6.tar.xz 9400300 SHA256 157ee7377ae97a27bb3b9bd2733d9353979632543c3d078b6578aeeb1319bf06 SHA512 9a90109ee8f591ae34ac2282e21aeee872292d82d1f66ebc69fb506c89a8ec952e373b35d1db7cc68307ea6ee90949c5c447ed206f14ec77374f8d68ab56021d WHIRLPOOL 47e5ffa17b53238f6282b17e2eb3e988dac7f295dd6757c097ea81d826770b1929d04d79f8a0e03abe5e30bfeb8626c42ad06c6a13aa0e9626120f590b55a931 -DIST webkitgtk-2.4.3.tar.xz 9841564 SHA256 9862c3eac1d12cc6e52cc39060a1284163950b304d534529a0dbcc5958a8ceac SHA512 fc4b36a3e11075325c79ced9f0d70a4b3daec43c5d3fff63ec843c513f04fd6cbe1b6472ea83e77f250f334f962a636a2423d8dbea4db0c767e823e2bd63f8d4 WHIRLPOOL dc9eb5211bbbea899379e688816ec978aa0f813ece777d0d9da08309eb2d647c662be66599a945bf743ff2946646e9e7d0554e0e9333fd10be425f05c7c8ffb6 DIST webkitgtk-2.4.4.tar.xz 9844048 SHA256 58cbfc7e352ae1e1f5e383f9f766795794d88483e9a52377a295f56eedf53ab9 SHA512 ae3160ec7962d452606966afd258961432db5f0da0e0fc0e249ce1927abf2151adc858b7f12d5d36d7c7d91e16c6ebed1694f88185c678ba1cf8d3d08b55f1ce WHIRLPOOL 065cbf961537d67b49a9273622606705685faad0ab8fd4ec1f845f69ce31ff8466e26032f6853b7a89854a7ed7f6432443f6d3f0ec6ff7074393ceef0c07749d EBUILD webkit-gtk-2.2.6-r200.ebuild 8839 SHA256 51b4d2814a33794d3d17c9bfd68ac6889b2c664effb95e4af3f93555ea4e64da SHA512 017955f7ba0dc75d601349b142ed39d5f126e3beac5933c973c0a2273bfabbfe63402a026396d28ab967956aca1d703afe31f5ee0274abd6ba2084145dd519dd WHIRLPOOL 5544ec7cbf8f218966927e887ed95b4fd549e4a705d2b32cbaa45fd3f6d17dd34739c97d45c627cd7b74281039690dc60f85d723e40d5619ab4fe54ce6b1d694 EBUILD webkit-gtk-2.2.6.ebuild 8934 SHA256 94e709b74f78b67b2ff1d0a4abe7b67d7a95b550bd6fc7a9904df44984319f1c SHA512 2f37e59f8fe373593f3771771644e64facac02bf2549bfd1ce008a30e19eba7746114e562b257108b1cf6d1955211cd32660a798b5fbf1a194e4d0b5557a90a7 WHIRLPOOL 5ce8581796cf5505f1ffb8f8237397d01861e4b64c3c4ec9ea5ec6311abade60a9cac3051c8a9beedcc5f9840d2314f2b335392e1c2e9a5048bbcfb2771c50d0 -EBUILD webkit-gtk-2.4.3-r200.ebuild 8951 SHA256 88ba07aa505326072e6d17101350d6c47fafa23730fc2a64bb8e7633300a9a76 SHA512 99f495a81effca76948f2bb3329ebc8a57d936037d18bfaa280124dcfc0657251f7f2fcb41bb3a6706540aaa32168cf5a796a0b71bdfc3f2cc497251c80f8ed4 WHIRLPOOL 2a909b43a829d2ee9b491a7f0e3ee1e6c1a9c4c8fab874ac9b6216365c635f446b20aca2ea4b09db71b722d894713f80357e6d76fa6051371048dc0e04fbf5ff -EBUILD webkit-gtk-2.4.3.ebuild 9150 SHA256 140fa264fb715c9e1b01d34157f04f012dc7e83eb54228d89ae0b5920c5a8ecd SHA512 c010eebea3381087f47ffc1e2d247ceaee2edcf6dcfc8b59595b4aeccc08d8a12c01f370b27ebdfe3ad59e1f86a46c86ccff5a9e9a222ea6952a15465e0be11a WHIRLPOOL c65e10a0015d5e5214703175caa46de765d116d5bb3db481eb45ef881ddc5ac1f71ffddf47c6e9b751d0fb2200f4e21f3b364e40cde6f535e6e298d13294698c -EBUILD webkit-gtk-2.4.4-r200.ebuild 9044 SHA256 35ae7801ce17c37ba73066a40336f92f261f95db1e35a6b9a3f03c38617a7c1f SHA512 db3d5424ecd54b5695d9137565160412c66a6fa45c6bb8bc6bbea79fefd421bb4eb995f85b48d90967cc052a9d821285e68d4837df4fc0530ba93aefc4a84030 WHIRLPOOL 8de1825f09719e208a7e0470d3200de22e75bafa34c550393237f903e2d50f483350b37ae2c023960b0669ee0fdc5ad3f5c10e5fe56afa3488e400d47ee7dc85 -EBUILD webkit-gtk-2.4.4.ebuild 9244 SHA256 cb58f3610b1181e2ef7157ae6533e753ee6de01de7f4c2146b5ceb55b7ec45e7 SHA512 e8034525542c23a13b4ce07b0e7c58cad1b86ec7b7ea18c0a0d0f06ace5c5549761a0c75eed48b6a5a6f743ef82758c9e73afbbca512bd8ff4bec9dabff77ea0 WHIRLPOOL edd762e88871e5b6457690a42fbaa4303469b1333da5eb7cf188281c324b814574f39bbcfbe32fe2e28d710366f36cfe2d1eda2f80b0752ef7424d9ac867107d -MISC ChangeLog 56114 SHA256 514777450a20f256f2f252d8412d71071e9e902105dcc48ea6a5138443ccb967 SHA512 9112fc1536d9828e61653be95c7ae80b6c68ead1bf4c1266b499613a879b0eede6c1af083184cb3689cb2979f3542852b44dfb249853bfec1d5d66a7ce12f2ef WHIRLPOOL 81a78b15c2044ca319699a000c07803d9ab75711730aa1b9b8d3292edea08fdb5566aa22f8c0eca433a35a32122f036a3166eef841272a40d89e5e5b54533615 +EBUILD webkit-gtk-2.4.4-r200.ebuild 9692 SHA256 c600b779be6cc6f8491eb636af39ef115aeaac88eb87c469f1891d2217a0ca79 SHA512 ed5f1366956cec8deb5e2c8737a5069d803a13a7aa08f32baac18bf0ddab90103e80cb61ae2a0826d56c02b440c70f28d4131d485f764c4cce20f1eaa3b27f4f WHIRLPOOL 1379b582f3f782a15c7487681eb6e942cc04bcccec69a71bbe59b6922cf476bebc999e5c8d5e59ecced44e11a47383f5b28ac2aaf727a234fe73d478b294b556 +EBUILD webkit-gtk-2.4.4.ebuild 9891 SHA256 777cc4748206bc2652fbae887d4569422399775409ae4b3947ce08bb16f0a80b SHA512 c50ab481f34615d06e4f3cf8703d710f268aad9f523ec1653385ea90690f0183c22f02f8dc3af59ffa9067305e354b4eb6b9043b3d0ce54afe7158ceee5e5436 WHIRLPOOL 8439ad2a6392185b25a4ab80924a46f1cf90e8eca5976bf6bb4f4839b77dc6f5b3cce49a9ac486000c2dbb15c13f8e58e47d8ae24507b83b7c114569a372c5d1 +MISC ChangeLog 56366 SHA256 ef092cd28e6cbbf5f1f057abebec48664eddefb65dfa0b9da58ddaf9bdc57146 SHA512 bd9f0bcf2e0f96df14e265d4111a79999106532ebc56c8d2e70afb5e2798e4c92cad8fe7483bdf7e35fd7c56da45431f4cc817ddd178d16e6647083e1656b509 WHIRLPOOL 46c5b975197b0170e22ed0ce7cefe382d78d71fd7f89d927ba5f64392e57205819943a90e581422b10b86d041b5852844cf6fc6534213f8ba859ee778118a266 MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJTz9OSAAoJELp701BxlEWf5bwP/0W9boAjSiYyrzQxZTOx1/Up -TGxaVxn1hMBnlPsRtpSVy+vidpatvo0//WtoN9NsdcC7ihMKvt3l6fvcwZxNVAtl -nHeTAmZFv4NxGkHmyLkBFpiNBgn2xDoORUyEFI6JYCCivWigELn5A5DTemiy6h0D -kKyvjBkdgtfUQksnhEDAne0LdhnzHaOEYRuGNCeGaRECDtGq/ikPkGO2kYvqN1z2 -O1Dy+sbH+R6ulmEfDmLWSRcl2e7vlOrA2YvIo5USR5j9uFj4qrPV3jDe7b6eM/nj -hFYoHe7Xv5UleGfsXPcr2htowCoNDgj7TpS6s7XDD+EQ0K9MzjMzbGOBy6+HMx+2 -tfhAowTnnF7wd7XQ8l53AbNBQxBZgVfxT1kw/1ldD5FsGVq2o1eG7l6PeVYzwrHY -gw7h8NP3ii5Rftje/EmlAzyQT9aiszZ+lP7gc7F74JuwkXiayK/sOhx1z4zyMw3b -fQWNnZwlUck9WGj/qYO92eSqouo5sIE/f/LIPiMQtVzneV7YlnumveoGgUjsgpOl -WtGcoj6bV4XQZmQdJxJpxtJyvhpiAt3PBw8NHoqgQ+t0xF/EMAvD8OdskhlptcRr -/40h0bV8y4VYgvEbsLS8RhqHC0mZyi4mdz/dHN+mMGw9XagstZ5kRr2F/LthFJuc -9BcFTfcNTrTbR9KHD5Rw -=NY/7 ------END PGP SIGNATURE----- diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.3-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.3-r200.ebuild deleted file mode 100644 index 4790940a9a58..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.3-r200.ebuild +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.3-r200.ebuild,v 1.2 2014/06/21 20:00:28 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 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="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" -IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl +X" -# bugs 372493, 416331 -REQUIRED_USE=" - geoloc? ( introspection ) - introspection? ( gstreamer ) - gles2? ( egl ) - webgl? ( ^^ ( gles2 opengl ) ) - !webgl? ( ?? ( gles2 opengl ) ) - || ( aqua X ) -" - -# use sqlite, svg by default -RDEPEND=" - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/harfbuzz:=[icu(+)] - media-libs/libwebp:= - virtual/jpeg:0= - >=media-libs/libpng-1.4:0= - >=x11-libs/cairo-1.10:=[X] - >=dev-libs/glib-2.36.0:2 - >=dev-libs/icu-3.8.1-r1:= - >=net-libs/libsoup-2.42.0:2.4[introspection?] - dev-db/sqlite:3= - >=x11-libs/pango-1.30.0.0 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/gtk+-2.24.10:2 - - egl? ( media-libs/mesa[egl] ) - geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) - gles2? ( media-libs/mesa[gles2] ) - gstreamer? ( - >=media-libs/gstreamer-1.2:1.0 - >=media-libs/gst-plugins-base-1.2:1.0 ) - introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) - libsecret? ( app-crypt/libsecret ) - opengl? ( virtual/opengl ) - spell? ( >=app-text/enchant-0.22:= ) - webgl? ( - x11-libs/cairo[opengl] - x11-libs/libXcomposite - x11-libs/libXdamage ) -" - -# paxctl needed for bug #407085 -# Need real bison, not yacc -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/perl - || ( - virtual/rubygems[ruby_targets_ruby20] - virtual/rubygems[ruby_targets_ruby21] - virtual/rubygems[ruby_targets_ruby19] - ) - >=dev-libs/atk-2.8.0 - >=dev-util/gtk-doc-am-1.10 - dev-util/gperf - >=sys-devel/bison-2.4.3 - >=sys-devel/flex-2.5.33 - || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) - sys-devel/gettext - >=sys-devel/make-3.82-r4 - virtual/pkgconfig - - 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" ]] && 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.7.x or Clang >= 3.3 for C++11-specific compiler flags" - fi -} - -pkg_setup() { - # Check whether any of the debugging flags is enabled - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then - replace-flags -ggdb -g - ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS." - ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too" - ewarn "large for current binutils releases (bug #432784) and has very" - ewarn "high temporary build space and memory requirements." - ewarn "If you really want to build ${PN} with \"-ggdb\", add" - ewarn "WEBKIT_GTK_GGDB=yes" - ewarn "to your make.conf file." - fi - einfo "You need to have at least 18GB of temporary build space available" - einfo "to build ${PN} with debugging CFLAGS. Note that it might still" - einfo "not be enough, as the total space requirements depend on the flags" - einfo "(-ggdb vs -g1) and enabled features." - check-reqs_pkg_setup - fi - - [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_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 - - # Leave optimization level to user CFLAGS - # FORTIFY_SOURCE is enabled by default in Gentoo - sed -e 's/-O[012]//g' \ - -e 's/-D_FORTIFY_SOURCE=2//g' \ - -i Source/autotools/SetupCompilerFlags.m4 || die - - # Failing tests - # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744 - # * keyevents is interactive - # * mimehandling test sometimes fails under Xvfb (works fine manually), bug #??? - # * webdatasource test needs a network connection and intermittently fails with icedtea-web - # * webplugindatabase intermittently fails with icedtea-web, bug #???? - sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \ - -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \ - -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \ - -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \ - -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \ - -i Tools/TestWebKitAPI/GNUmakefile.am || die - - # bug #459978, upstream bug #113397 - epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch" - - # Do not build unittests unless requested, upstream bug #128163 - epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch - - # Deadlock causing infinite compilations with nvidia-drivers: - # https://bugs.gentoo.org/show_bug.cgi?id=463960 - # http://osdyson.org/issues/161 - # https://bugs.webkit.org/show_bug.cgi?id=125651 - epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.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 - # https://bugs.webkit.org/show_bug.cgi?id=129542 - epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch - - AT_M4DIR=Source/autotools eautoreconf - - 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 doesn't compile on alpha without this in LDFLAGS, bug #??? - use alpha && append-ldflags "-Wl,--no-relax" - - # 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-getLD) --version | grep -q "GNU gold"; then - append-ldflags "-Wl,--reduce-memory-overheads" - fi - - local myconf="" - - if has_version "virtual/rubygems[ruby_targets_ruby21]"; then - myconf="${myconf} RUBY=$(type -P ruby21)" - elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then - myconf="${myconf} RUBY=$(type -P ruby20)" - else - myconf="${myconf} RUBY=$(type -P ruby19)" - fi - - # TODO: Check Web Audio support - # should somehow let user select between them? - # - # * dependency-tracking is required so parallel builds won't fail - gnome2_src_configure \ - $(use_enable aqua quartz-target) \ - $(use_enable coverage) \ - $(use_enable debug) \ - $(use_enable egl) \ - $(use_enable geoloc geolocation) \ - $(use_enable gles2) \ - $(use_enable gstreamer video) \ - $(use_enable gstreamer web-audio) \ - $(use_enable introspection) \ - $(use_enable jit) \ - $(use_enable libsecret credential_storage) \ - $(use_enable opengl glx) \ - $(use_enable spell spellcheck) \ - $(use_enable webgl) \ - $(use_enable webgl accelerated-compositing) \ - $(use_enable X x11-target) \ - --with-gtk=2.0 \ - --disable-webkit2 \ - --enable-dependency-tracking \ - --disable-gtk-doc \ - ${myconf} -} - -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" - - # 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 -} - -src_install() { - DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install - - # https://bugs.webkit.org/show_bug.cgi?id=129242 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install - - newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk - newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore - newdoc Source/WebCore/ChangeLog ChangeLog.WebCore - - # Prevents crashes on PaX systems - use jit && pax-mark m "${ED}usr/bin/jsc-1" - - # File collisions with slot 3 - # bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134 - rm -rf "${ED}usr/share/gtk-doc" || die -} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.3.ebuild deleted file mode 100644 index af7f23c0cc52..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.3.ebuild +++ /dev/null @@ -1,277 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.3.ebuild,v 1.2 2014/06/21 20:00:28 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 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="3/25" # soname version of libwebkit2gtk-3.0 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" -IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X" -# bugs 372493, 416331 -REQUIRED_USE=" - geoloc? ( introspection ) - introspection? ( gstreamer ) - gles2? ( egl ) - webgl? ( ^^ ( gles2 opengl ) ) - !webgl? ( ?? ( gles2 opengl ) ) - || ( aqua wayland X ) -" - -# use sqlite, svg by default -# Aqua support in gtk3 is untested -# gtk2 is needed for plugin process support -# gtk3-3.10 required for wayland -RDEPEND=" - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/harfbuzz:=[icu(+)] - media-libs/libwebp:= - virtual/jpeg:0= - >=media-libs/libpng-1.4:0= - >=x11-libs/cairo-1.10:=[X] - >=dev-libs/glib-2.36.0:2 - >=x11-libs/gtk+-3.6.0:3[aqua=,introspection?] - >=dev-libs/icu-3.8.1-r1:= - >=net-libs/libsoup-2.42.0:2.4[introspection?] - dev-db/sqlite:3= - >=x11-libs/pango-1.30.0.0 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/gtk+-2.24.10:2 - - egl? ( media-libs/mesa[egl] ) - geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) - gles2? ( media-libs/mesa[gles2] ) - gstreamer? ( - >=media-libs/gstreamer-1.2:1.0 - >=media-libs/gst-plugins-base-1.2:1.0 ) - introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) - libsecret? ( app-crypt/libsecret ) - opengl? ( virtual/opengl ) - spell? ( >=app-text/enchant-0.22:= ) - wayland? ( >=x11-libs/gtk+-3.10:3[wayland] ) - webgl? ( - x11-libs/cairo[opengl] - x11-libs/libXcomposite - x11-libs/libXdamage ) -" - -# paxctl needed for bug #407085 -# Need real bison, not yacc -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/perl - || ( - virtual/rubygems[ruby_targets_ruby20] - virtual/rubygems[ruby_targets_ruby21] - virtual/rubygems[ruby_targets_ruby19] - ) - >=app-accessibility/at-spi2-core-2.5.3 - >=dev-libs/atk-2.8.0 - >=dev-util/gtk-doc-am-1.10 - dev-util/gperf - >=sys-devel/bison-2.4.3 - >=sys-devel/flex-2.5.33 - || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) - sys-devel/gettext - >=sys-devel/make-3.82-r4 - virtual/pkgconfig - - 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" ]] && 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.7.x or Clang >= 3.3 for C++11-specific compiler flags" - fi -} - -pkg_setup() { - # Check whether any of the debugging flags is enabled - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then - replace-flags -ggdb -g - ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS." - ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too" - ewarn "large for current binutils releases (bug #432784) and has very" - ewarn "high temporary build space and memory requirements." - ewarn "If you really want to build ${PN} with \"-ggdb\", add" - ewarn "WEBKIT_GTK_GGDB=yes" - ewarn "to your make.conf file." - fi - einfo "You need to have at least 18GB of temporary build space available" - einfo "to build ${PN} with debugging CFLAGS. Note that it might still" - einfo "not be enough, as the total space requirements depend on the flags" - einfo "(-ggdb vs -g1) and enabled features." - check-reqs_pkg_setup - fi - - [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_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 - - # Leave optimization level to user CFLAGS - # FORTIFY_SOURCE is enabled by default in Gentoo - sed -e 's/-O[012]//g' \ - -e 's/-D_FORTIFY_SOURCE=2//g' \ - -i Source/autotools/SetupCompilerFlags.m4 || die - - # Failing tests - # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744 - # * keyevents is interactive - # * mimehandling test sometimes fails under Xvfb (works fine manually), bug #??? - # * webdatasource test needs a network connection and intermittently fails with icedtea-web - # * webplugindatabase intermittently fails with icedtea-web, bug #???? - sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \ - -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \ - -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \ - -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \ - -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \ - -i Tools/TestWebKitAPI/GNUmakefile.am || die - - # bug #459978, upstream bug #113397 - epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch" - - # Do not build unittests unless requested, upstream bug #128163 - epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch - - # Deadlock causing infinite compilations with nvidia-drivers: - # https://bugs.gentoo.org/show_bug.cgi?id=463960 - # http://osdyson.org/issues/161 - # https://bugs.webkit.org/show_bug.cgi?id=125651 - epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.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 - # https://bugs.webkit.org/show_bug.cgi?id=129542 - epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch - - AT_M4DIR=Source/autotools eautoreconf - - 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 doesn't compile on alpha without this in LDFLAGS, bug #??? - use alpha && append-ldflags "-Wl,--no-relax" - - # 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-getLD) --version | grep -q "GNU gold"; then - append-ldflags "-Wl,--reduce-memory-overheads" - fi - - local myconf="" - - if has_version "virtual/rubygems[ruby_targets_ruby21]"; then - myconf="${myconf} RUBY=$(type -P ruby21)" - elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then - myconf="${myconf} RUBY=$(type -P ruby20)" - else - myconf="${myconf} RUBY=$(type -P ruby19)" - fi - - # TODO: Check Web Audio support - # should somehow let user select between them? - # - # * Aqua support in gtk3 is untested - # * dependency-tracking is required so parallel builds won't fail - gnome2_src_configure \ - $(use_enable aqua quartz-target) \ - $(use_enable coverage) \ - $(use_enable debug) \ - $(use_enable egl) \ - $(use_enable geoloc geolocation) \ - $(use_enable gles2) \ - $(use_enable gstreamer video) \ - $(use_enable gstreamer web-audio) \ - $(use_enable introspection) \ - $(use_enable jit) \ - $(use_enable libsecret credential_storage) \ - $(use_enable opengl glx) \ - $(use_enable spell spellcheck) \ - $(use_enable webgl) \ - $(use_enable webgl accelerated-compositing) \ - $(use_enable wayland wayland-target) \ - $(use_enable X x11-target) \ - --with-gtk=3.0 \ - --enable-dependency-tracking \ - --disable-gtk-doc \ - ${myconf} -} - -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" - - # 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 -} - -src_install() { - DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install - - # https://bugs.webkit.org/show_bug.cgi?id=129242 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install - - newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk - newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore - newdoc Source/WebCore/ChangeLog ChangeLog.WebCore - - # Prevents crashes on PaX systems - use jit && pax-mark m "${ED}usr/bin/jsc-3" -} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild index 7c66a982e796..25e7c5f7e533 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild,v 1.3 2014/07/23 15:24:00 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild,v 1.4 2014/07/23 16:41:19 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -94,6 +94,8 @@ S="${WORKDIR}/${MY_P}" CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 pkg_pretend() { + nvidia_check || die #463960 + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" check-reqs_pkg_pretend @@ -105,6 +107,8 @@ pkg_pretend() { } pkg_setup() { + nvidia_check || die #463960 + # Check whether any of the debugging flags is enabled if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then @@ -275,3 +279,20 @@ src_install() { # bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134 rm -rf "${ED}usr/share/gtk-doc" || die } + +nvidia_check() { + if [[ ${MERGE_TYPE} != "binary" ]] && + use introspection && + has_version '=x11-drivers/nvidia-drivers-325*' && + [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]] + then + eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is" + eerror "used as the system OpenGL library." + eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select" + eerror "Mesa as the system OpenGL library:" + eerror " # eselect opengl set xorg-x11" + eerror "See https://bugs.gentoo.org/463960 for more details." + eerror + return 1 + fi +} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild index 57e9f2602ae2..a42090a4e2e9 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild,v 1.3 2014/07/23 15:24:00 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild,v 1.4 2014/07/23 16:41:19 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -100,6 +100,8 @@ S="${WORKDIR}/${MY_P}" CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 pkg_pretend() { + nvidia_check || die #463960 + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" check-reqs_pkg_pretend @@ -111,6 +113,8 @@ pkg_pretend() { } pkg_setup() { + nvidia_check || die #463960 + # Check whether any of the debugging flags is enabled if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then @@ -277,3 +281,20 @@ src_install() { # Prevents crashes on PaX systems use jit && pax-mark m "${ED}usr/bin/jsc-3" } + +nvidia_check() { + if [[ ${MERGE_TYPE} != "binary" ]] && + use introspection && + has_version '=x11-drivers/nvidia-drivers-325*' && + [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]] + then + eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is" + eerror "used as the system OpenGL library." + eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select" + eerror "Mesa as the system OpenGL library:" + eerror " # eselect opengl set xorg-x11" + eerror "See https://bugs.gentoo.org/463960 for more details." + eerror + return 1 + fi +}
\ No newline at end of file |