commit: 6b63044f12f41934600e316a793344ca97810e9b Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Nov 15 20:55:03 2015 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Nov 15 21:03:00 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b63044f
net-libs/webkit-gtk: Drop old Package-Manager: portage-2.2.24 net-libs/webkit-gtk/Manifest | 1 - .../files/webkit-gtk-2.6.0-hppa-platform.patch | 34 --- .../files/webkit-gtk-2.6.0-ia64-malloc.patch | 31 --- .../files/webkit-gtk-2.6.0-ia64-platform.patch | 26 --- .../files/webkit-gtk-2.8.1-ia64-malloc.patch | 31 --- net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild | 231 --------------------- 6 files changed, 354 deletions(-) diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 7dc6c25..66b4911 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,4 +1,3 @@ DIST webkitgtk-2.10.4.tar.xz 11015164 SHA256 dbf8260da5cac0c74de2d3cce1fe7c519da3cd816a2c769cb6c6d56addd2f055 SHA512 1d1c79fb863be192639304c5616fb875ccfe541617fdc5c973e79d8159131080ba734199959a01760b9d06accaae7e2e87bec3bcc42dcd2e6b0d19a5b82ed039 WHIRLPOOL 60c789cd2802827dfa90a46debe7506c03ee0203ebbe81db53eba87994ea56ec93b1e9b61253e6411e27faca813ebb27d0ca460e980ddf983afc4e53fcb72744 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c -DIST webkitgtk-2.6.6.tar.xz 10000888 SHA256 541e114a203b0f649e89b3ad6b6fdeea1726739320a6b6a52b464cb66ea38eb9 SHA512 faac38cbd64daf180f2e2f9e7df9e1162ccd0b4f5c76b0133ef6d2b95b413b699923fda3a5026ba3c76562de59e4913c45a97cd654797867490633dd3099f5b4 WHIRLPOOL 20be78255c917ecd930e034e38053af054a4271445eaa43319f45db6fde6b369f002f2be5269a696c53200b2bf56b74959e7970932fd62f6c89e3ea1236ce72b DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch deleted file mode 100644 index 0623582..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8ba68225e9ad35958197aacc03a7a1716741b14c Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 19 Oct 2014 19:37:40 +0200 -Subject: [PATCH 1/4] Fix support for HPPA - -Debian patches to fix support for some arches -https://bugs.webkit.org/show_bug.cgi?id=129540 ---- - Source/WTF/wtf/Platform.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 7712ddb..65f1379 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -71,6 +71,15 @@ - #define WTF_CPU_BIG_ENDIAN 1 - #endif - -+/* CPU(HPPA) - HP PARISC */ -+#if defined(__hppa__) -+#define WTF_CPU_HPPA 1 -+#define WTF_CPU_BIG_ENDIAN 1 -+#define ENABLE_JIT 0 -+#define ENABLE_YARR_JIT 0 -+#define ENABLE_ASSEMBLER 0 -+#endif -+ - /* CPU(IA64) - Itanium / IA-64 */ - #if defined(__ia64__) - #define WTF_CPU_IA64 1 --- -2.1.2 - diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch deleted file mode 100644 index 0b7808b..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9348d1c7fbbd9fcbb1702c0c6d81c723ec0b6879 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 19 Oct 2014 19:40:21 +0200 -Subject: [PATCH 3/4] Use system malloc for IA64 - -https://bugs.webkit.org/show_bug.cgi?id=129542 ---- - Source/WTF/wtf/Platform.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index d9afcd7..c4cf1d2 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -662,6 +662,13 @@ - #endif - #endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */ - -+/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because -+ some memory barriers are missing in the thread-unsafe code around the -+ pagemap_cache_ object. */ -+#if CPU(IA64) || CPU(IA64_32) -+#define USE_SYSTEM_MALLOC 1 -+#endif -+ - /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k and Windows. */ - #if !defined(ENABLE_JIT) \ - && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \ --- -2.1.2 - diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch deleted file mode 100644 index 57587e9..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d98ac8c1040318e648f8417fa5ca6df66cc00b35 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 19 Oct 2014 19:38:18 +0200 -Subject: [PATCH 2/4] Fix support for IA64 - ---- - Source/WTF/wtf/Platform.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 65f1379..d9afcd7 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -87,6 +87,9 @@ - #if !defined(__LP64__) - #define WTF_CPU_IA64_32 1 - #endif -+#define ENABLE_JIT 0 -+#define ENABLE_YARR_JIT 0 -+#define ENABLE_ASSEMBLER 0 - #endif - - /* CPU(MIPS) - MIPS 32-bit */ --- -2.1.2 - diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch deleted file mode 100644 index 57be875..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9348d1c7fbbd9fcbb1702c0c6d81c723ec0b6879 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 19 Oct 2014 19:40:21 +0200 -Subject: [PATCH 3/4] Use system malloc for IA64 - -https://bugs.webkit.org/show_bug.cgi?id=129542 ---- - Source/WTF/wtf/Platform.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index d9afcd7..c4cf1d2 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -662,6 +662,13 @@ - #endif - #endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */ - -+/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because -+ some memory barriers are missing in the thread-unsafe code around the -+ pagemap_cache_ object. */ -+#if CPU(IA64) || CPU(IA64_32) -+#define USE_SYSTEM_MALLOC 1 -+#endif -+ - /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k. */ - #if !defined(ENABLE_JIT) \ - && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \ --- -2.1.2 - diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild deleted file mode 100644 index c4d72b7..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild +++ /dev/null @@ -1,231 +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 +gstreamer +introspection +jit libsecret +opengl spell +webgl" -# gles2 wayland X -# bugs 372493, 416331 -REQUIRED_USE=" - geoloc? ( introspection ) - introspection? ( gstreamer ) - webgl? ( opengl ) -" -# gles2? ( egl ) -# webgl? ( ^^ ( gles2 opengl ) ) -# !webgl? ( ?? ( gles2 opengl ) ) -# || ( wayland X ) - -# 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? -# 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.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/libsoup-2.42:2.4[introspection?] - virtual/jpeg:0= - >=x11-libs/cairo-1.10.2:=[X] - >=x11-libs/gtk+-3.6.0:3[X,introspection?] - >=x11-libs/pango-1.30.0 - x11-libs/libX11 - 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 ) - 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 ) -" -# gles2? ( media-libs/mesa[gles2] ) -# wayland? ( >=x11-libs/gtk+-3.12:3[wayland] ) - -# 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() { - # Debian patches to fix support for some arches - # https://bugs.webkit.org/show_bug.cgi?id=129540 - epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch - # https://bugs.webkit.org/show_bug.cgi?id=129542 - epatch "${FILESDIR}"/${PN}-2.6.0-ia64-malloc.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" - - # 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 "<sys-libs/glibc-2.18" ; then - append-cppflags "-D__STDC_LIMIT_MACROS" - fi - - local ruby_interpreter="" - - if has_version "virtual/rubygems[ruby_targets_ruby22]"; then - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)" - elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)" - elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)" - else - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)" - fi - - # TODO: Check Web Audio support - # should somehow let user select between them? - # - # FTL_JIT requires llvm + libcxxabi - # $(cmake-utils_use_enable wayland WAYLAND_TARGET) - # $(cmake-utils_use_enable X X11_TARGET) - # $(cmake-utils_use_find_package gles2 OpenGLES2) - local mycmakeargs=( - $(cmake-utils_use_enable test API_TESTS) - $(cmake-utils_use_enable doc GTKDOC) - $(cmake-utils_use_enable geoloc GEOLOCATION) - $(cmake-utils_use_enable gstreamer VIDEO) - $(cmake-utils_use_enable gstreamer WEB_AUDIO) - $(cmake-utils_use_enable introspection) - $(cmake-utils_use_enable jit) - $(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE) - $(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK) - $(cmake-utils_use_enable webgl WEBGL) - $(cmake-utils_use_find_package egl EGL) - $(cmake-utils_use_find_package opengl OpenGL) - -DCMAKE_BUILD_TYPE=Release - -DENABLE_X11_TARGET=ON - -DPORT=GTK - -DENABLE_PLUGIN_PROCESS_GTK2=ON - ${ruby_interpreter} - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_test() { - # Prevents test failures on PaX systems - use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* - - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - - # Prevents crashes on PaX systems, bug #522808 - use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" - pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2} -}
