commit: 629994a022ee6d308e97b8b0630614e52d59cdaa
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 18:23:00 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 18:23:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=629994a0
net-libs/webkit-gtk: in tree version works.
Package-Manager: portage-2.2.18
Manifest-Sign-Key: 0xF52D4BBA
net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper | 33 ---
.../files/webkit-gtk-1.11.90-gtk-docize-fix.patch | 10 -
.../files/webkit-gtk-1.6.1-darwin-quartz.patch | 67 -----
.../webkit-gtk-1.6.3-paxctl-introspection.patch | 21 --
...webkit-gtk-1.7.90-test_garbage_collection.patch | 18 --
...webkit-gtk-2.0.4-remove-nonstandard-isnan.patch | 12 -
net-libs/webkit-gtk/metadata.xml | 11 -
net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild | 278 ---------------------
8 files changed, 450 deletions(-)
diff --git a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
deleted file mode 100755
index d4f270c..0000000
--- a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary
-# generated by g-ir-scanner.
-# PaX marking code stolen from pax-utils.eclass
-
-flags=${1//-}; shift
-
-echo ${LIBTOOL} "$@"
-${LIBTOOL} "$@"
-
-retval=$?
-
-files=$(find . -path "*tmp-introspect*/.libs/*")
-
-if type -p paxctl > /dev/null; then
- echo "PT PaX marking -${flags} ${files}"
- for f in ${files}; do
- # First, try modifying the existing PAX_FLAGS header
- paxctl -q${flags} "${f}" && continue
- # Second, try stealing the (unused under PaX) PT_GNU_STACK
header
- paxctl -qc${flags} "${f}" && continue
- # Third, try pulling the base down a page, to create space and
- # insert a PT_GNU_STACK header (works on ET_EXEC)
- paxctl -qC${flags} "${f}" && continue
- done
-elif type -p scanelf > /dev/null; then
- # Try scanelf, the Gentoo swiss-army knife ELF utility
- # Currently this sets PT if it can, no option to control what it does.
- echo "Fallback PaX marking -${flags} ${files}"
- scanelf -Xxz ${flags} ${files}
-fi
-
-exit ${retval}
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
deleted file mode 100644
index 8f56ab2..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.old 2013-03-02 09:22:53.791750644 +0200
-+++ 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])
- m4_include([Source/autotools/FindDependencies.m4])
-+GTK_DOC_CHECK([1.10])
- m4_include([Source/autotools/SetupCompilerFlags.m4])
- m4_include([Source/autotools/SetupAutoconfHeader.m4])
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
deleted file mode 100644
index 5ad357e..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Original from:
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
-
-Adapted for 1.6.1
-
---- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-@@ -70,6 +70,8 @@
- #endif
- #include <gtk/gtk.h>
-
-+#undef XP_UNIX
-+
- #if defined(XP_UNIX)
- #include "RefPtrCairo.h"
- #include "gtk2xtbin.h"
-@@ -439,9 +441,9 @@
- event->setDefaultHandled();
- }
-
--#if defined(XP_UNIX)
- void PluginView::handleFocusInEvent()
- {
-+#if defined(XP_UNIX)
- if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
- return;
-
-@@ -454,10 +456,12 @@
- event.detail = NotifyDetailNone;
-
- dispatchNPEvent(npEvent);
-+#endif
- }
-
- void PluginView::handleFocusOutEvent()
- {
-+#if defined(XP_UNIX)
- if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
- return;
-
-@@ -470,8 +474,8 @@
- event.detail = NotifyDetailNone;
-
- dispatchNPEvent(npEvent);
--}
- #endif
-+}
-
- void PluginView::setParent(ScrollView* parent)
- {
---- Source/WebCore/plugins/gtk/gtk2xtbin.c
-+++ Source/WebCore/plugins/gtk/gtk2xtbin.c
-@@ -41,7 +41,7 @@
- * The GtkXtBin widget allows for Xt toolkit code to be used
- * inside a GTK application.
- */
--
-+#if 0
- #include "GtkVersioning.h"
- #include "xembed.h"
- #include "gtk2xtbin.h"
-@@ -966,3 +966,4 @@
-
- return;
- }
-+#endif
diff --git
a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
b/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
deleted file mode 100644
index c34cc40..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
---- a/Source/WebKit/gtk/GNUmakefile.am
-+++ b/Source/WebKit/gtk/GNUmakefile.am
-@@ -269,7 +269,7 @@
- WEBKIT_GIRSOURCES += WebKit-@[email protected]
-
- $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES)
libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
-- $(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
-+ $(AM_V_GEN)LIBTOOL="$(LIBTOOL)" $(G_IR_SCANNER) -v --warn-all \
- --symbol-prefix=webkit \
- --identifier-prefix=WebKit \
- --namespace=WebKit \
-@@ -280,7 +280,7 @@
- --include=Soup-2.4 \
- --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
- --library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
-- --libtool="$(LIBTOOL)" \
-+ --libtool="bash $(top_srcdir)/gir-paxctl-lt-wrapper m" \
- --pkg=gobject-2.0 \
- --pkg=gtk+-@GTK_API_VERSION@ \
- --pkg=libsoup-2.4 \
diff --git
a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
deleted file mode 100644
index 577c249..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Garbage collection test fails intermittently if icedtea browser plugin is
-installed.
-
---- a/Source/WebKit/gtk/tests/testdomdocument.c
-+++ b/Source/WebKit/gtk/tests/testdomdocument.c
-@@ -353,12 +353,6 @@
- test_dom_document_get_links,
- dom_document_fixture_teardown);
-
-- g_test_add("/webkit/domdocument/test_garbage_collection",
-- DomDocumentFixture, HTML_DOCUMENT_LINKS,
-- dom_document_fixture_setup,
-- test_dom_document_garbage_collection,
-- dom_document_fixture_teardown);
--
- return g_test_run();
- }
-
diff --git
a/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch
b/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch
deleted file mode 100644
index 0973216..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur webkitgtk-2.0.4.orig/Source/JavaScriptCore/offlineasm/cloop.rb
webkitgtk-2.0.4/Source/JavaScriptCore/offlineasm/cloop.rb
---- webkitgtk-2.0.4.orig/Source/JavaScriptCore/offlineasm/cloop.rb
2013-07-19 07:03:48.000000000 +0000
-+++ webkitgtk-2.0.4/Source/JavaScriptCore/offlineasm/cloop.rb 2013-12-18
22:45:01.710757198 +0000
-@@ -398,7 +398,7 @@
- end
-
- def cloopEmitCompareDoubleWithNaNCheckAndBranch(operands, condition)
-- $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) ||
isnan(#{operands[1].clValue(:double)})"
-+ $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) "
- $asm.putc " || (#{operands[0].clValue(:double)} #{condition}
#{operands[1].clValue(:double)}))"
- $asm.putc " goto #{operands[2].cLabel};"
- end
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
deleted file mode 100644
index de08c6e..0000000
--- a/net-libs/webkit-gtk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>gnome</herd>
- <use>
- <flag name="coverage">Enable code coverage support</flag>
- <flag name="geoloc">Enable geolocation support through
<pkg>app-misc/geoclue</pkg></flag>
- <flag name="libsecret">Enable libsecret support to store login
credentials</flag>
- <flag name="webgl">Build support for the WebGL HTML API using
<pkg>virtual/opengl</pkg></flag>
- </use>
-</pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild
deleted file mode 100644
index ec3021b..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild
+++ /dev/null
@@ -1,278 +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.4.ebuild,v 1.8
2013/12/08 19:28:27 pacho Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils 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
-KEYWORDS="amd64"
-IUSE="aqua coverage debug +geoloc +gstreamer libsecret +introspection +jit
spell uclibc +webgl"
-# bugs 372493, 416331
-REQUIRED_USE="
- geoloc? ( introspection )
- introspection? ( 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="
- 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/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 )
- libsecret? ( app-crypt/libsecret )
- spell? ( >=app-text/enchant-0.22:= )
- webgl? (
- virtual/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_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? (
- 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() {
- 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
- 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() {
- 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
- 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() {
- DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
- use uclibc && epatch "${FILESDIR}"/${P}-remove-nonstandard-isnan.patch
-
- # 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
-
- # 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\/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, bug
#????
- 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, bug #????
- epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
-
- # Respect CC, otherwise fails on prefix #395875
- tc-export CC
-
- # bug #459978, upstream bug #113397
- epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
-
- # Prevent maintainer mode from being triggered during make
- AT_M4DIR=Source/autotools eautoreconf
-}
-
-src_configure() {
- # 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
- append-ldflags "-Wl,--no-keep-memory"
-
- local myconf
- # TODO: Check Web Audio support
- # TODO: There's 3 acceleration backends: opengl, egl and gles2
- # should somehow let user select between them?
- #
- # * dependency-tracking is required so parallel builds won't fail
- 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 libsecret credential_storage)
- $(use_enable webgl)
- --disable-egl
- --disable-gles2
- --with-gtk=3.0
- --enable-accelerated-compositing
- --enable-dependency-tracking
- --disable-gtk-doc
- "$(usex aqua "--with-font-backend=pango --with-target=quartz"
"")
- # Aqua support in gtk3 is untested
-
- if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
- myconf="${myconf} RUBY=$(type -P ruby20)"
- elif 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, bug #????
-# 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"
-}
-
-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
-}
