diff options
| -rw-r--r-- | net-libs/webkit-gtk/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/Manifest | 16 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.0.0.ebuild | 244 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.0.1.ebuild | 6 |
4 files changed, 12 insertions, 261 deletions
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog index 35adeaf81eba..839b9acd012d 100644 --- a/net-libs/webkit-gtk/ChangeLog +++ b/net-libs/webkit-gtk/ChangeLog @@ -1,6 +1,11 @@ # 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.202 2013/05/01 03:40:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.203 2013/05/01 09:31:28 pacho Exp $ + + 01 May 2013; Pacho Ramos <pacho@gentoo.org> -webkit-gtk-2.0.0.ebuild, + webkit-gtk-2.0.1.ebuild: + Workaround to paludis behavior is no longer needed (#406117#c26 by Ulm and + mgorny), drop old. 01 May 2013; Alexandre Rostovtsev <tetromino@gentoo.org> webkit-gtk-1.8.3-r200.ebuild, webkit-gtk-1.8.3-r201.ebuild, diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 296184d50aef..41c7f976a158 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -31,24 +31,18 @@ AUX webkit-gtk-1.8.3-spellchecker.patch 792 SHA256 5c68f2c4052f660ab34476006f5fd AUX webkit-gtk-1.9.91-libdl.patch 691 SHA256 a4da8aaea1a14ab9e67bcec01c666c074cbdc0785af2d2655a6cf6b1ff67072c SHA512 a7d3ab2a2065d18b16d5758c29d63543da1902f71dfb641e5b7d5db0a50c90b443026368b24b9f601d2f63f9eaaea67d3f686492d49068c2b013ad1cf6cf76a9 WHIRLPOOL 7808838f8d5389adb703dce234fa28e2da8266b57576fc70c37d11ea22af3b21a68f0e8600d237fbfc645a2796a7694e75c176035d57df75402f2adef690c4f8 DIST webkit-1.8.3.tar.xz 7814028 SHA256 ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7 SHA512 4d400cb0dfbde7eadcce52e7a37d2095ec382b65c6c0d4ea4795410dabad771fac0def50875092634075dc0a80043058d2d2913767e59db3e32cf3e13361803f WHIRLPOOL 25b8ce9a26f2c475a5e061bedf75d835ae5a907a92628e11cd9ae5962fcacbdfa6a0181ae7730fb39e4544615d2d78741025b17fa202f3d42d0f3956fcb7c3f0 DIST webkitgtk-1.10.2.tar.xz 8633640 SHA256 19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c SHA512 0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f WHIRLPOOL f733244ce7601f7906f7aa26e750f770cc1472737f62d64c706e7c8c32cc31db22a38824e32c347bf70166f7c5104bac049a80eb08dc040733aee4988542e954 -DIST webkitgtk-2.0.0.tar.xz 9821336 SHA256 454cdc4beffc2010f83661059178e33b6d9a07bcd60d09eabdf5d7cda17b88e4 SHA512 bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5 WHIRLPOOL 02a83908f56c6b99ccb10049cbeaf5a5c4d05ca2f3e849a9a7fde9048a03f34db0feed00efcba8b30dfbc429873ec2f020b558c9e4eb29ce6e59d50d75225cf4 DIST webkitgtk-2.0.1.tar.xz 9841872 SHA256 6303552a39d7912725d75bc55f530cdb99171fb873e299798d0bb932d6ea76cb SHA512 9924397cb35a73ed43831117fb47017af1b05220c09760a2d323fc788cd0f24625d48f7e638ddd574264e2af0ace0cf1041713629d24256a5fb25c04993b045a WHIRLPOOL 6b6e2dc91a55eeba4e2c61085af45a1e77a3a5145ab2aadbe1d42552c0bc25013e9f623ed942f940de42dc81e2e520cd60248a87e653a64095788c27a58c328e EBUILD webkit-gtk-1.10.2-r300.ebuild 8195 SHA256 53ae0bfb09222dde1f9e70f8caa73304350699329dc62886daa90b28fb2d975f SHA512 45be769437a1d466a78d26603b234d605ef770ce76cc6aa38ce0bb483c12715c1ed54849ff2712091a8997dcb426920e2a17d9cfc2fc61b37131cb18691ea9ac WHIRLPOOL 72158a5f63580e1f7b7db1cbb46d98eeafeb191022e3820160e43f78d910fcc16269c7099bb103db6dae299161f4637cb029d7bac57364ec3e13153f913ae0a3 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.0.ebuild 7989 SHA256 48444792b15f7d5aa3c0394a42e5e9f8672ee4f468fc6e5835ecfedf4e7aa6a9 SHA512 5adb0920208f79de84d258af29574b45d1a82d2b2682c075ab1f886cc00d2cb843b8aa60ecd31fe994958c72f0e6579a31e5d4e5abcbffbefea6e43d6210f451 WHIRLPOOL 9fcdc024d53c5f7071474fe37e63270212ff201d3a86e23e7b8bd507ad5e9da4d71bd92e3d5a611691280ee2f114095af2f676dbcf1af4986ce46f181a4264be -EBUILD webkit-gtk-2.0.1.ebuild 8160 SHA256 dbcbd691c51a4b7a499990c252ee9b890b55fce67ed03907b53b7ddf9a33df71 SHA512 f92c8b2d705ff2aee545444376df53c8c10368ba27f34d6640edaa139b53105fbd9e99e824612c25a2739e9cf27171c11894deab37b242274953b209229145e4 WHIRLPOOL 882c1b71c785f029a202243e495d13e7df4532d0f3535108a3e0a2de059a0265137f63d0bd893e4741e6c5c7ef07ea9f8897c32c8baf7f6057f8c3b8d68ae823 -MISC ChangeLog 41158 SHA256 31980869d2e17456b5c6c92773fe321b2f329fd8b6f59ff55063e1dbc7e31b4b SHA512 bfc804f37140a50537fc142913f4e93a6379929d5383d1a4b22cbf0a2b7260107fe38ff4c01a160d09a5261ce32545ffc277bf771627fd4093a18a0df1d13476 WHIRLPOOL 11263395ded7b428e0b6219e82e37e33b27ae6ebe8de02b4f79c84ad95d4b83c0f7694ed280d2d34b05aa553ccb13ee8171631c4d6f3fb76e932f759bc97e663 +EBUILD webkit-gtk-2.0.1.ebuild 7963 SHA256 8a42647018f2c963b98e3bda22f24c618c628e130aa7b885e18166bef2440dd3 SHA512 7d2b68514d7b8640d0d5220e7361390575c57ef35760525f32125e8db87c728e2c6d85d861412c0373732ed44243b3dd9993b6cebc44421da2115bdf12997bc0 WHIRLPOOL d899dc43fbad5b11c1c59bbc1fcd863d21be4c03e4de4879484eb6eb12a76caf939383e7df8976bac399f4512626289d3ba358cf28fd1cf44eea0722d497af89 +MISC ChangeLog 41352 SHA256 ce12ce57bfa2b3d64df38f57432153c80a1e0dd031e9e3a06f493c922039b7dd SHA512 f6d2834c460fd0f0703e74fd565c6bbb6591da2930282d93180eb1d36853af63273950f0bc3d15809ff90c3a1dd27ae61f1694e904345f9e5fadc1e8a5356ea0 WHIRLPOOL d4fb60d040f2fa55ccf92ae52972f25b891dad6053f5da3b092a03efb17ad2ba215bf86e9928f049331e95b36b28e14bc1fc563c36fe429c8b63ee5b38786cb5 MISC metadata.xml 569 SHA256 7680bd9bb6771ea8bc643d5969b074a024b40548f23aa24dae05ecebe3d01983 SHA512 168d9cba348426bdaa2f8d1686bb88fe0e645ae2812de308dc8e186ef735f75c016538d2feefd6f2efe854eb63ea995a9ce39ffcda7c8ca104f7550f921dd8af WHIRLPOOL 2f803a29c30ebc0b202ce619c4d894e2a17ad6ca1002372d8e366eae2e5448fdab592bbc9edb1fcfd02ac8be95de38e0af8e0354559e53fc3b572387033e7591 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRgI7NAAoJEJ0WA1zPCt1hrzAIAIPDKugvczN7OxOJ8i1avS6B -VD8DRqnvPqAe3TalfBWwOA13wdUBQE9SpxTwAUTI6hH8GGfKGTOGMwDZuP/QflRi -6yPb2OVa8I1/tL8gG7q2VN6vZRVI8iXGVqQ/iLd0KJxFV3YgMDACkJLqRnMA92CE -BQQolDBTRK0tmdGWFW18wQrXqbN85ee0mF1O6BzUv6R+5dCpvRuy8nFCb1TCzsCP -cDakcEApq+x6GxGqjlgkT8aDasQPzEhmjiWJ4yWa38xaxjItUvy2mcjFh1zV3mIB -RtVuXlMdGbAfd7Rj1yj/aoBqH0PMhgsVc6xhrUUBDi1Vaw5M+Ky0vKQVGrMzdbc= -=thGl +iEYEAREIAAYFAlGA4PEACgkQCaWpQKGI+9TGcgCggDPyFZ+FscfXOfMBQeJbfmfK +bYkAn24HWTcmg1LxXjuxfaJ4jqZ9YjUm +=Jt1l -----END PGP SIGNATURE----- diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.0.ebuild deleted file mode 100644 index ff5ff06c8193..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.0.0.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# 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-2.0.0.ebuild,v 1.5 2013/05/01 03:40:59 tetromino Exp $ - -EAPI="5" - -inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils 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 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" -IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl" -# bugs 372493, 416331 -REQUIRED_USE="introspection? ( geoloc gstreamer )" - -# use sqlite, svg by default -# Aqua support in gtk3 is untested -# gtk2 is needed for plugin process support -# TODO: There's 3 acceleration backends: opengl, egl and gles2 -RDEPEND=" - app-crypt/libsecret - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/harfbuzz - media-libs/libwebp - virtual/jpeg:= - >=media-libs/libpng-1.4:0= - >=x11-libs/cairo-1.10:= - >=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.32.0 - x11-libs/libXrender - >=x11-libs/gtk+-2.24.10:2 - - geoloc? ( app-misc/geoclue ) - gstreamer? ( - >=media-libs/gstreamer-1.0.3:1.0 - >=media-libs/gst-plugins-base-1.0.3:1.0 ) - introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) - spell? ( >=app-text/enchant-0.22:= ) - webgl? ( - virtual/opengl - x11-libs/libXcomposite - x11-libs/libXdamage ) -" -# paxctl needed for bug #407085 -DEPEND="${RDEPEND} - dev-lang/perl - =dev-lang/python-2* - || ( virtual/rubygems[ruby_targets_ruby19] - virtual/rubygems[ruby_targets_ruby18] ) - >=app-accessibility/at-spi2-core-2.5.3 - >=dev-util/gtk-doc-am-1.10 - dev-util/gperf - sys-devel/bison - >=sys-devel/flex-2.5.33 - || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 ) - sys-devel/gettext - >=sys-devel/make-3.82-r4 - virtual/pkgconfig - - introspection? ( jit? ( sys-apps/paxctl ) ) - test? ( - x11-themes/hicolor-icon-theme - jit? ( sys-apps/paxctl ) ) -" -# Need real bison, not yacc - -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.0 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 -} - -src_prepare() { - DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install - - # 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 - - # Don't force -O2 - sed -i 's/-O2//g' "${S}"/Source/autotools/SetupCompilerFlags.m4 || die - - # Build-time segfaults under PaX with USE="introspection jit", bug #404215 - if use introspection && use jit; then - epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch" - cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die - fi - - # We need to reset some variables to prevent permissions problems and failures - # like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669 - gnome2_environment_reset - - # XXX: failing tests - # https://bugs.webkit.org/show_bug.cgi?id=50744 - # testkeyevents is interactive - # mimehandling test sometimes fails under Xvfb (works fine manually) - # datasource test needs a network connection and intermittently fails with icedtea-web - # webplugindatabase intermittently fails with icedtea-web - sed -e '/Programs\/unittests\/testwebinspector/ d' \ - -e '/Programs\/unittests\/testkeyevents/ d' \ - -e '/Programs\/unittests\/testmimehandling/ d' \ - -e '/Programs\/unittests\/testwebdatasource/ d' \ - -e '/Programs\/unittests\/testwebplugindatabase/ d' \ - -i Source/WebKit/gtk/GNUmakefile.am || die - - if ! use gstreamer; then - # webkit2's TestWebKitWebView requires <video> support - sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \ - -i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die - fi - # garbage collection test fails intermittently if icedtea-web is installed - epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch" - - # occasional test failure due to additional Xvfb process spawned - # TODO epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch" - - # Respect CC, otherwise fails on prefix #395875 - tc-export CC - - epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch" - - # Prevent maintainer mode from being triggered during make - AT_M4DIR=Source/autotools eautoreconf - - # Ugly hack of a workaround for bizarre paludis behavior, bug #406117 - # http://paludis.exherbo.org/trac/ticket/1230 - sed -e '/ --\(en\|dis\)able-dependency-tracking/ d' -i configure || die -} - -src_configure() { - # It doesn't compile on alpha without this in LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - # Sigbuses on SPARC with mcpu and co. - use sparc && filter-flags "-mvis" - - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - local myconf - - # XXX: Check Web Audio support - # XXX: dependency-tracking is required so parallel builds won't fail - # XXX: There's 3 acceleration backends: opengl, egl and gles2 - # should somehow let user select between them? - myconf=" - $(use_enable coverage) - $(use_enable debug) - $(use_enable geoloc geolocation) - $(use_enable spell spellcheck) - $(use_enable introspection) - $(use_enable gstreamer video) - $(use_enable jit) - $(use_enable webgl) - --disable-egl - --disable-gles2 - --with-gtk=3.0 - --enable-accelerated-compositing - --enable-dependency-tracking - --disable-gtk-doc - PYTHON=$(type -P python2) - "$(usex aqua "--with-font-backend=pango --with-target=quartz" "") - # Aqua support in gtk3 is untested - - if has_version "virtual/rubygems[ruby_targets_ruby19]"; then - myconf="${myconf} RUBY=$(type -P ruby19)" - else - myconf="${myconf} RUBY=$(type -P ruby18)" - fi - - econf ${myconf} -} - -src_compile() { - # Avoid parallel make failure with -j9 - emake DerivedSources/WebCore/JSNode.h - default -} - -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() { - default - - newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk - newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore - newdoc Source/WebCore/ChangeLog ChangeLog.WebCore - - prune_libtool_files - - # 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.0.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.1.ebuild index 7e0431d5ec3f..b5f149120af5 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.0.1.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.0.1.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-2.0.1.ebuild,v 1.2 2013/05/01 03:40:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.1.ebuild,v 1.3 2013/05/01 09:31:28 pacho Exp $ EAPI="5" inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs versionator virtualx @@ -158,10 +158,6 @@ src_prepare() { # Prevent maintainer mode from being triggered during make AT_M4DIR=Source/autotools eautoreconf - - # Ugly hack of a workaround for bizarre paludis behavior, bug #406117 - # http://paludis.exherbo.org/trac/ticket/1230 - sed -e '/ --\(en\|dis\)able-dependency-tracking/ d' -i configure || die } src_configure() { |