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 024911382DE for ; Sun, 3 Jul 2016 15:38:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 584D5E09D2; Sun, 3 Jul 2016 15:38:34 +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 A5DEDE09A9 for ; Sun, 3 Jul 2016 15:38:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 19233340D19 for ; Sun, 3 Jul 2016 15:38:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A14842432 for ; Sun, 3 Jul 2016 15:38:30 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1467560298.5f29d90dae3078e63497c2f661c7c99f12a9df50.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/webkit-gtk/Manifest net-libs/webkit-gtk/metadata.xml 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.8.5.ebuild X-VCS-Directories: net-libs/webkit-gtk/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 5f29d90dae3078e63497c2f661c7c99f12a9df50 X-VCS-Branch: master Date: Sun, 3 Jul 2016 15:38:30 +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: 5a0bfac4-9641-4be7-9e6b-f5c1c99a5f71 X-Archives-Hash: 21e9f1d154ab804c2f7dce37e6ea9d4b commit: 5f29d90dae3078e63497c2f661c7c99f12a9df50 Author: Pacho Ramos gentoo org> AuthorDate: Sun Jul 3 15:35:34 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Jul 3 15:38:18 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f29d90d net-libs/webkit-gtk: Drop old Package-Manager: portage-2.3.0_rc1 net-libs/webkit-gtk/Manifest | 2 - net-libs/webkit-gtk/metadata.xml | 1 - net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild | 265 --------------------- net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild | 276 ---------------------- net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild | 251 -------------------- 5 files changed, 795 deletions(-) diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 460811e..6a7dbb5 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,4 +1,2 @@ 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 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3 -DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead 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.4.10-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild deleted file mode 100644 index 6203b0f..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -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 - -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 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X" -# bugs 372493, 416331 -REQUIRED_USE=" - geoloc? ( introspection ) - gles2? ( egl ) - introspection? ( gstreamer ) - webgl? ( ^^ ( gles2 opengl ) ) - !webgl? ( ?? ( gles2 opengl ) ) - || ( aqua X ) -" - -# use sqlite, svg by default -RDEPEND=" - dev-db/sqlite:3= - >=dev-libs/glib-2.36:2 - >=dev-libs/icu-3.8.1-r1:= - >=dev-libs/libxml2-2.6:2 - >=dev-libs/libxslt-1.1.7 - >=media-libs/fontconfig-2.5:1.0 - >=media-libs/freetype-2.4.2:2 - >=media-libs/harfbuzz-0.9.7:=[icu(+)] - >=media-libs/libpng-1.4:0= - media-libs/libwebp:= - >=net-libs/libsoup-2.42:2.4[introspection?] - virtual/jpeg:0= - >=x11-libs/cairo-1.10:=[X] - >=x11-libs/gtk+-2.24.10:2[aqua?,introspection?] - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/pango-1.30.0 - - 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 ) - introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) - 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} - ${RUBY_DEPS} - >=dev-lang/perl-5.10 - >=dev-libs/atk-2.8.0 - >=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.7 >=sys-devel/clang-3.3 ) - sys-devel/gettext - >=sys-devel/make-3.82-r4 - virtual/pkgconfig - - 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" ]] && 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 [[ ${MERGE_TYPE} != "binary" ]] && ! 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 - - # bug #459978, upstream bug #113397 - epatch "${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 - # https://bugs.webkit.org/show_bug.cgi?id=129542 - epatch "${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 - - # 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 - - 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 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" - - # 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 ruby_interpreter="" - - if has_version "virtual/rubygems[ruby_targets_ruby23]"; then - ruby_interpreter="RUBY=$(type -P ruby23)" - elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then - ruby_interpreter="RUBY=$(type -P ruby22)" - elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then - ruby_interpreter="RUBY=$(type -P ruby21)" - else - ruby_interpreter="RUBY=$(type -P ruby20)" - 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 gnome-keyring credential_storage) \ - $(use_enable gstreamer video) \ - $(use_enable gstreamer web-audio) \ - $(use_enable introspection) \ - $(use_enable jit) \ - $(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 \ - ${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" - - # 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.10.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild deleted file mode 100644 index 88dd378..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild +++ /dev/null @@ -1,276 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -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 - -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 ~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 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X" -# bugs 372493, 416331 -REQUIRED_USE=" - geoloc? ( introspection ) - gles2? ( egl ) - introspection? ( gstreamer ) - 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-db/sqlite:3= - >=dev-libs/glib-2.36:2 - >=dev-libs/icu-3.8.1-r1:= - >=dev-libs/libxml2-2.6:2 - >=dev-libs/libxslt-1.1.7 - >=media-libs/fontconfig-2.5:1.0 - >=media-libs/freetype-2.4.2:2 - >=media-libs/harfbuzz-0.9.7:=[icu(+)] - >=media-libs/libpng-1.4:0= - media-libs/libwebp:= - >=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/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 ) - 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 ) - introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) - 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 ) - X? ( - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt ) -" - -# 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-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.7 >=sys-devel/clang-3.3 ) - sys-devel/gettext - >=sys-devel/make-3.82-r4 - virtual/pkgconfig - - 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" ]] && 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 [[ ${MERGE_TYPE} != "binary" ]] && ! 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 - - # bug #459978, upstream bug #113397 - epatch "${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 - # https://bugs.webkit.org/show_bug.cgi?id=129542 - epatch "${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 - - # 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 - - # 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 - - 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 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" - - # 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 ruby_interpreter="" - - if has_version "virtual/rubygems[ruby_targets_ruby23]"; then - ruby_interpreter="RUBY=$(type -P ruby23)" - elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then - ruby_interpreter="RUBY=$(type -P ruby22)" - elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then - ruby_interpreter="RUBY=$(type -P ruby21)" - else - ruby_interpreter="RUBY=$(type -P ruby20)" - 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 gnome-keyring credential_storage) \ - $(use_enable gstreamer video) \ - $(use_enable gstreamer web-audio) \ - $(use_enable introspection) \ - $(use_enable jit) \ - $(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 \ - ${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" - - # 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, bug #522808 - use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess" - pax-mark m "${ED}usr/libexec/WebKitPluginProcess" -} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild deleted file mode 100644 index 94f032a..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild +++ /dev/null @@ -1,251 +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 ) - -inherit check-reqs cmake-utils 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="4/37" # soname version of libwebkit2gtk-4.0 -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" - -IUSE="coverage doc +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl X" -REQUIRED_USE=" - geoloc? ( introspection ) - gles2? ( egl ) - introspection? ( gstreamer ) - webgl? ( ^^ ( gles2 opengl ) ) - !webgl? ( ?? ( gles2 opengl ) ) - || ( 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 -# gtk2 is needed for plugin process support, should we add a USE flag to configure this? -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 - - >=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 - 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/libXrender - x11-libs/libXt ) -" - -# paxctl needed for bug #407085 -# Need real bison, not yacc -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - >=dev-lang/perl-5.10 - || ( - virtual/rubygems[ruby_targets_ruby20] - virtual/rubygems[ruby_targets_ruby21] - virtual/rubygems[ruby_targets_ruby22] - 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-3.0.1 - >=sys-devel/bison-2.4.3 - >=sys-devel/flex-2.5.34 - || ( >=sys-devel/gcc-4.7 >=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" ]] && 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 [[ ${MERGE_TYPE} != "binary" ]] && ! 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() { - 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 - - # 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-getLD) --version | grep -q "GNU gold"; then - append-ldflags "-Wl,--reduce-memory-overheads" - fi - - # older glibc needs this for INTPTR_MAX, bug #533976 - if has_version "