commit: 21d23d3866cad233e440e6f70e062c9d130709f9
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 17:20:51 2015 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 17:20:51 2015 +0000
URL: https://gitweb.gentoo.org/dev/anarchy.git/commit/?id=21d23d38
Fix build failure when cmake-3.4 is used
net-libs/webkit-gtk/Manifest | 6 +
.../files/webkit-gtk-2.8.5-cmake3_4.patch | 22 ++
.../files/webkit-gtk-2.8.5-fix-alpha-build.patch | 22 ++
.../files/webkit-gtk-2.8.5-fix-ia64-build.patch | 21 ++
...kit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch | 22 ++
net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild | 253 +++++++++++++++++++++
6 files changed, 346 insertions(+)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
new file mode 100644
index 0000000..0597672
--- /dev/null
+++ b/net-libs/webkit-gtk/Manifest
@@ -0,0 +1,6 @@
+AUX webkit-gtk-2.8.5-cmake3_4.patch 1050 SHA256
c649e2f541807c84b4db518a9bc4378750e2fb366c379ef3493efd7ff651011c SHA512
5c84c8940339ecdc01082713d6db885a8272c68b357bc44d61322c69d1c0f07256f4e936d29b1118c9798ed6308c262bb1368e15446a63945e2aeb0407e833c8
WHIRLPOOL
2833b32aca6f600fe0dc75430f8fb85b317378bd2ed75902b3a8d0f442ed4a584f563d091b5bd4cd43c6e535897001f1f0070d642b03c4a5137dc92109afb661
+AUX webkit-gtk-2.8.5-fix-alpha-build.patch 910 SHA256
2e3ea0b6288ff3471349243edd75d1a97fbacdc6a426874f4c9be8a64d2c2b7f SHA512
748ef4b431c02b3b4ba8908b8bdf28f5b11b90a798ac21484d99a3941e0306102b9d8a298f177da63cd86579b64def31e6f2abe66044b5c211bb4382c5a57f86
WHIRLPOOL
4a8ee812d543c016a02321e5e6db83580c6f0301dd57b5cd5bf4e22b7a6f214ac6b41229160d60db42982fd37a11c5f654ef81a8c1b178a6d78e54ed6076ea11
+AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256
d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512
ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc
WHIRLPOOL
adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82
+AUX webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch 876 SHA256
50052d2a82d6c0d19af0bfb476824059e4448652c6533275084e24dfb5ef19c3 SHA512
ad0925070277d97fce3713f66ffcbfa193fdb3231d63717dfd8b217b420bf6f8665694eef2fcf9d2eef2abefe0fe5406759287395117497de34a00dba1b9c144
WHIRLPOOL
d4da619b5bf1000d5dee409b07bcce6ba8da25f0e726e22433e2a3a610773ee4394becd55ccf7efaddebb86e74f1f97868e98240fa9bb80c0ab7a320f03c666e
+DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256
3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512
b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb
WHIRLPOOL
1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead
+EBUILD webkit-gtk-2.8.5.ebuild 7654 SHA256
d4832c0d0c65b94796b5b2de667dc1a82308880fa15b2d6883c00e2f16e81dcc SHA512
a4d59c81d8f351b860420a6a98f6ae04bdc2ca99dcab037c05bd637ad5c576209973c8736142084faa9124e26f9e0ffab36b9f7edd48fe341583c58a9f68134c
WHIRLPOOL
1b4989a7f4a0e142f9a5cd1b24341b81fe30c46991bc884abe8034d28b0633bc8fb17f4ed01358171c34020e9ffbcf041715183c1118f05ed3ae239f10c0ced8
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-cmake3_4.patch
b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-cmake3_4.patch
new file mode 100644
index 0000000..97c4a24
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-cmake3_4.patch
@@ -0,0 +1,22 @@
+diff -urN a/Source/cmake/FindOpenGL.cmake b/Source/cmake/FindOpenGL.cmake
+--- a/Source/cmake/FindOpenGL.cmake 2015-07-23 01:55:39.000000000 -0500
++++ b/Source/cmake/FindOpenGL.cmake 2015-11-14 11:01:33.402195159 -0600
+@@ -59,6 +59,7 @@
+ include(CMakePushCheckState)
+ CMAKE_PUSH_CHECK_STATE()
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES}
${OPENGL_INCLUDE_DIRS})
++ include(CheckIncludeFiles)
+ check_include_files("GL/glx.h" GLX_FOUND)
+ CMAKE_POP_CHECK_STATE()
+ endif ()
+diff -urN a/Source/cmake/FindWebP.cmake b/Source/cmake/FindWebP.cmake
+--- a/Source/cmake/FindWebP.cmake 2015-07-22 07:37:58.000000000 -0500
++++ b/Source/cmake/FindWebP.cmake 2015-11-14 11:02:14.185196825 -0600
+@@ -35,6 +35,7 @@
+ if (NOT(WEBP_FOUND))
+ # Older installations of libwebp do not install a pkgconfig file, so we
fall
+ # back to a manual search for a libwebp header file.
++ include(CheckIncludeFiles)
+ check_include_files("webp/decode.h" WEBP_FOUND_HEADER)
+ if (WEBP_FOUND_HEADER)
+ set(WEBP_LIBRARIES "-lwebp")
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
new file mode 100644
index 0000000..cafceb5
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
@@ -0,0 +1,22 @@
+--- ./Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000
+0300
++++ ./Source/JavaScriptCore/CMakeLists.txt 2015-10-29 17:47:10.535712494
+0300
+@@ -1146,6 +1146,7 @@
+ list(APPEND JavaScriptCore_SOURCES
${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj)
+ endif ()
+ elseif (WTF_CPU_ARM64)
++elseif (WTF_CPU_ALPHA)
+ elseif (WTF_CPU_HPPA)
+ elseif (WTF_CPU_IA64)
+ elseif (WTF_CPU_PPC)
+ elseif (WTF_CPU_PPC64)
+--- CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300
++++ CMakeLists.txt 2015-10-29 01:23:37.416886279 +0300
+@@ -82,6 +82,8 @@
+ set(WTF_CPU_ARM 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
+ set(WTF_CPU_ARM64 1)
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha")
++ set(WTF_CPU_ALPHA 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+ set(WTF_CPU_MIPS 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4")
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
new file mode 100644
index 0000000..6c88c49
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -98,6 +98,8 @@
+ set(WTF_CPU_PPC64LE 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "parisc*")
+ set(WTF_CPU_HPPA 1)
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
++ set(WTF_CPU_IA64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390")
+ set(WTF_CPU_S390 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
+--- a/Source/JavaScriptCore/CMakeLists.txt
++++ b/Source/JavaScriptCore/CMakeLists.txt
+@@ -1147,6 +1147,7 @@
+ endif ()
+ elseif (WTF_CPU_ARM64)
+ elseif (WTF_CPU_HPPA)
++elseif (WTF_CPU_IA64)
+ elseif (WTF_CPU_PPC)
+ elseif (WTF_CPU_PPC64)
+ elseif (WTF_CPU_PPC64LE)
diff --git
a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
new file mode 100644
index 0000000..79b57ae
--- /dev/null
+++
b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
@@ -0,0 +1,22 @@
+2015-08-24 Alexandre Rostovtsev <[email protected]>
+
+ webkit2gtkinjectedbundle requires forwarding headers
+ https://bugs.webkit.org/show_bug.cgi?id=148379
+
+ Fixes GTK build with -j1
+
+ * PlatformGTK.cmake:
+
+Index: Source/WebKit2/PlatformGTK.cmake
+===================================================================
+--- Source/WebKit2/PlatformGTK.cmake (revision 188859)
++++ Source/WebKit2/PlatformGTK.cmake (working copy)
+@@ -860,7 +860,7 @@ include_directories(
+ )
+
+ add_library(webkit2gtkinjectedbundle MODULE
"${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp")
+-add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
++add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings
WebKit2-forwarding-headers)
+ add_webkit2_prefix_header(webkit2gtkinjectedbundle)
+
+ # Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
new file mode 100644
index 0000000..a5fa29c
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
@@ -0,0 +1,253 @@
+# 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
+
+ # https://bugs.webkit.org/show_bug.cgi?id=150117
+ epatch "${FILESDIR}"/${PN}-2.8.5-cmake3_4.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 "<sys-libs/glibc-2.18" ; then
+ append-cppflags "-D__STDC_LIMIT_MACROS"
+ fi
+
+ # Multiple rendering bugs on youtube, github, etc without this, bug
#547224
+ append-flags $(test-flags -fno-strict-aliasing)
+
+ 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
+ local mycmakeargs=(
+ $(cmake-utils_use_enable test API_TESTS)
+ $(cmake-utils_use_enable doc GTKDOC)
+ $(cmake-utils_use_enable geoloc GEOLOCATION)
+ $(cmake-utils_use_find_package gles2 OpenGLES2)
+ $(cmake-utils_use_enable gles2 GLES2)
+ $(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 wayland WAYLAND_TARGET)
+ $(cmake-utils_use_enable webgl WEBGL)
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_enable X X11_TARGET)
+ -DCMAKE_BUILD_TYPE=Release
+ -DPORT=GTK
+ -DENABLE_PLUGIN_PROCESS_GTK2=ON
+ ${ruby_interpreter}
+ )
+ if $(tc-getLD) --version | grep -q "GNU gold"; then
+ mycmakeargs+=( -DUSE_LD_GOLD=ON )
+ else
+ mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+ fi
+
+ 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}
+}
