* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2020-04-23 14:57 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2020-04-23 14:57 UTC (permalink / raw
To: gentoo-commits
commit: e18fed3c8d2f73389f82ce697c6a507b396990fd
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Tue Apr 21 07:32:37 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 14:57:07 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e18fed3c
net-libs/webkit-gtk: bump to 2.28.1
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-libs/webkit-gtk/Manifest | 1 +
.../webkit-gtk-2.28.1-lower-stack-usage.patch | 17 ++
.../webkit-gtk/files/webkit-gtk-2.28.1-musl.patch | 68 +++++
net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild | 296 +++++++++++++++++++++
4 files changed, 382 insertions(+)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index cc4924b..ba34c03 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
+DIST webkitgtk-2.28.1.tar.xz 21427628 BLAKE2B 58f19d68598ed1aee58f9f700c84e76c9c58980e39d7fe1883c3be991f575074db3156b9a7a041bb3d59130d87d37b1bdee9cf6c122c4f0b0ba6637d66534c32 SHA512 30cfe63d202673d1f0b0ab32e062eab225e51b993d9bb0f51c02d0497423e1591b5a2e943c30d1c9ee6d9073dfbd13b8ec24bca94f380fe8886019e8185628b8
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.28.1-lower-stack-usage.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.28.1-lower-stack-usage.patch
new file mode 100644
index 0000000..71955f3
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.28.1-lower-stack-usage.patch
@@ -0,0 +1,17 @@
+diff --git a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h
+index 41cab118..2ac66c7a 100644
+--- a/Source/JavaScriptCore/runtime/OptionsList.h
++++ b/Source/JavaScriptCore/runtime/OptionsList.h
+@@ -90,9 +90,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
+ \
+ v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
+ \
+- v(Unsigned, maxPerThreadStackUsage, 5 * MB, Normal, "Max allowed stack usage by the VM") \
+- v(Unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
+- v(Unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
++ v(Unsigned, maxPerThreadStackUsage, 80 * KB , Normal, "Max allowed stack usage by the VM") \
++ v(Unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
++ v(Unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
+ \
+ v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
+ v(Unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.28.1-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.28.1-musl.patch
new file mode 100644
index 0000000..e28d9a5
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.28.1-musl.patch
@@ -0,0 +1,68 @@
+--- a/Source/JavaScriptCore/runtime/MachineContext.h
++++ b/Source/JavaScriptCore/runtime/MachineContext.h
+@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ #if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
+@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+
+--- a/Source/WebCore/xml/XPathGrammar.cpp
++++ b/Source/WebCore/xml/XPathGrammar.cpp
+@@ -966,7 +966,7 @@ int yydebug;
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -989,7 +989,7 @@ yystrlen (yystr)
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
new file mode 100644
index 0000000..bc1ab61
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+ gles2-only? ( egl !opengl )
+ gstreamer? ( opengl? ( egl ) )
+ wayland? ( egl )
+ || ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+ >=gui-libs/libwpe-1.3.0:1.0
+ >=gui-libs/wpebackend-fdo-1.3.1:1.0
+"
+RDEPEND="
+ >=x11-libs/cairo-1.16.0:=[X?]
+ >=media-libs/fontconfig-2.13.0:1.0
+ >=media-libs/freetype-2.9.0:2
+ >=dev-libs/libgcrypt-1.7.0:0=
+ >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+ >=media-libs/harfbuzz-1.4.2:=[icu(+)]
+ >=dev-libs/icu-3.8.1-r1:=
+ virtual/jpeg:0=
+ >=net-libs/libsoup-2.54:2.4[introspection?]
+ >=dev-libs/libxml2-2.8.0:2
+ >=media-libs/libpng-1.4:0=
+ dev-db/sqlite:3=
+ sys-libs/zlib:0
+ >=dev-libs/atk-2.16.0
+ media-libs/libwebp:=
+
+ >=dev-libs/glib-2.44.0:2
+ >=dev-libs/libxslt-1.1.7
+ media-libs/woff2
+ gnome-keyring? ( app-crypt/libsecret )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+ dev-libs/libtasn1:=
+ spell? ( >=app-text/enchant-0.22:2 )
+ gstreamer? (
+ >=media-libs/gstreamer-1.14:1.0
+ >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
+ gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+ >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+ >=media-libs/gst-plugins-bad-1.14:1.0 )
+
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXrender
+ x11-libs/libXt )
+
+ libnotify? ( x11-libs/libnotify )
+ dev-libs/hyphen
+ jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+ egl? ( media-libs/mesa[egl] )
+ gles2-only? ( media-libs/mesa[gles2] )
+ opengl? ( virtual/opengl )
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.12
+ opengl? ( ${wpe_depend} )
+ gles2-only? ( ${wpe_depend} )
+ )
+
+ seccomp? (
+ >=sys-apps/bubblewrap-0.3.1
+ sys-libs/libseccomp
+ sys-apps/xdg-dbus-proxy
+ )
+"
+unset wpe_depend
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ ${RUBY_DEPS}
+ >=app-accessibility/at-spi2-core-2.5.3
+ dev-util/glib-utils
+ >=dev-util/gperf-3.0.1
+ >=sys-devel/bison-2.4.3
+ || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ >=dev-lang/perl-5.10
+ virtual/perl-Data-Dumper
+ virtual/perl-Carp
+ virtual/perl-JSON-PP
+
+ gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+ geolocation? ( dev-util/gdbus-codegen )
+"
+# test? (
+# dev-python/pygobject:3[python_targets_python2_7]
+# x11-themes/hicolor-icon-theme
+# jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+ geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] ; then
+ if 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++17 ; then
+ die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+ fi
+ fi
+
+ if ! use opengl && ! use gles2-only; then
+ ewarn
+ ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+ ewarn "This is an unsupported configuration meant for very specific embedded"
+ ewarn "use cases, where there truly is no GL possible (and even that use case"
+ ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+ ewarn "really really should be enabling OpenGL!"
+ ewarn
+ fi
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ check-reqs_pkg_setup
+ fi
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+ eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
+ if use elibc_musl ; then
+ # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=be463923b10a7268117c27c7e5515fc32457918c
+ eapply "${FILESDIR}/${P}-musl.patch"
+ eapply "${FILESDIR}/${P}-lower-stack-usage.patch"
+ fi
+ cmake-utils_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Respect CC, otherwise fails on prefix #395875
+ tc-export CC
+
+ # 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
+
+ # We try to use gold when possible for this package
+# if ! tc-ld-is-gold ; then
+# append-ldflags "-Wl,--reduce-memory-overheads"
+# fi
+
+ # Ruby situation is a bit complicated. See bug 513888
+ local rubyimpl
+ local ruby_interpreter=""
+ for rubyimpl in ${USE_RUBY}; do
+ if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+ fi
+ done
+ # This will rarely occur. Only a couple of corner cases could lead us to
+ # that failure. See bug 513888
+ [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # opengl needs to be explicetly handled, bug #576634
+
+ local use_wpe_renderer=OFF
+ local opengl_enabled
+ if use opengl || use gles2-only; then
+ opengl_enabled=ON
+ use wayland && use_wpe_renderer=ON
+ else
+ opengl_enabled=OFF
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+ -DENABLE_QUARTZ_TARGET=$(usex aqua)
+ -DENABLE_API_TESTS=$(usex test)
+ -DENABLE_GTKDOC=$(usex gtk-doc)
+ -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+ $(cmake-utils_use_find_package gles2-only OpenGLES2)
+ -DENABLE_GLES2=$(usex gles2-only)
+ -DENABLE_VIDEO=$(usex gstreamer)
+ -DENABLE_WEB_AUDIO=$(usex gstreamer)
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DUSE_LIBNOTIFY=$(usex libnotify)
+ -DUSE_LIBSECRET=$(usex gnome-keyring)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_WOFF2=ON
+ -DENABLE_SPELLCHECK=$(usex spell)
+ -DENABLE_WAYLAND_TARGET=$(usex wayland)
+ -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ -DENABLE_X11_TARGET=$(usex X)
+ -DENABLE_OPENGL=${opengl_enabled}
+ -DENABLE_WEBGL=${opengl_enabled}
+ -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+ -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+ -DCMAKE_BUILD_TYPE=Release
+ -DPORT=GTK
+ ${ruby_interpreter}
+ )
+
+ if use elibc_musl ; then
+ mycmakeargs+=( -DENABLE_SAMPLING_PROFILER=OFF )
+ fi
+
+ # Allow it to use GOLD when possible as it has all the magic to
+ # detect when to use it and using gold for this concrete package has
+ # multiple advantages and is also the upstream default, bug #585788
+# if tc-ld-is-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
+ 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
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2021-06-07 13:24 Jory Pratt
0 siblings, 0 replies; 16+ messages in thread
From: Jory Pratt @ 2021-06-07 13:24 UTC (permalink / raw
To: gentoo-commits
commit: 91ca32d896953e55dcf70ddbe2f90fe2f6af1d9b
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon May 31 08:07:28 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Jun 7 13:23:44 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=91ca32d8
net-libs/webkit-gtk: treeclean
Upstream fixed all remaining issues with musl build and it is now
officially supported since version 2.32.1 [Upstream-Release-Notes].
This version is already stable in ::gentoo, therefore, we can clean it
from this tree.
Upstream-Release-Notes: https://wpewebkit.org/release/wpewebkit-2.32.1.html
Gentoo-Issue: https://github.com/gentoo/gentoo/pull/14120
Gentoo-Bug: https://bugs.gentoo.org/708426
Closes: https://github.com/gentoo/musl/pull/437
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
net-libs/webkit-gtk/Manifest | 1 -
.../webkit-gtk/files/2.28.2-non-jumbo-fix.patch | 34 ---
.../files/2.28.2-opengl-without-X-fixes.patch | 53 ----
.../webkit-gtk/files/2.28.4-non-jumbo-fix2.patch | 31 ---
.../webkit-gtk/files/2.30.3-fix-noGL-build.patch | 27 --
.../webkit-gtk-2.24.4-eglmesaext-include.patch | 10 -
.../webkit-gtk/files/webkit-gtk-2.28.1-musl.patch | 68 -----
.../webkit-gtk-2.28.4-lower-stack-usage.patch | 17 --
net-libs/webkit-gtk/metadata.xml | 15 -
net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild | 309 ---------------------
10 files changed, 565 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
deleted file mode 100644
index 58a92b6..0000000
--- a/net-libs/webkit-gtk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST webkitgtk-2.30.5.tar.xz 22311832 BLAKE2B b00e889d59883e62bcf179df8a766e20a7cd7ee2db462c4eb4279686aac5ea1cad7903189b14031088ab23b8dfd89c1f09f90e2deb5d208281d55c262cc0cb3c SHA512 406fc767a806bb2af446c73e7079720a4d82d592a95a20f30f468c31cdc2efd25e082a5ecfbe00c27f62236e1e56a729c48191451d130188419967975378235d
diff --git a/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch
deleted file mode 100644
index da9f1d3..0000000
--- a/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d553de92ed238278f51b93a2c90af7d3ff7a2da2 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 12 May 2020 15:28:45 +0300
-Subject: [PATCH] Try to fix an apparent non-unified build error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp: In member function ‘WTF::RefPtr<WebKit::InjectedBundleNodeHandle>
-WebKit::InjectedBundleHitTestResult::urlElementHandle() const’:
-Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:57:78: error: no matching function for call to
-‘WebKit::InjectedBundleNodeHandle::getOrCreate(WebCore::Element*)’
- 57 | return InjectedBundleNodeHandle::getOrCreate(m_hitTestResult.URLElement());
- | ^
-In file included from Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:29
----
- .../WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
-index df8e55df1f0..26f045bd3fc 100644
---- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
-+++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
-@@ -32,6 +32,7 @@
- #include "WebImage.h"
- #include <WebCore/BitmapImage.h>
- #include <WebCore/Document.h>
-+#include <WebCore/Element.h>
- #include <WebCore/Frame.h>
- #include <WebCore/FrameLoader.h>
- #include <WebCore/FrameView.h>
---
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
deleted file mode 100644
index 6976c3c..0000000
--- a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 9 May 2020 23:11:52 +0300
-Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
- some build configurations
-
----
- Source/WebCore/platform/graphics/GLContext.cpp | 5 ++++-
- Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
-index b217988b990..1ba0eb8a482 100644
---- a/Source/WebCore/platform/graphics/GLContext.cpp
-+++ b/Source/WebCore/platform/graphics/GLContext.cpp
-@@ -28,6 +28,9 @@
-
- #if USE(GLX)
- #include "GLContextGLX.h"
-+#endif
-+
-+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
- #include "OpenGLShims.h"
- #endif
-
-@@ -57,7 +60,7 @@ inline ThreadGlobalGLContext* currentContext()
-
- static bool initializeOpenGLShimsIfNeeded()
- {
--#if USE(OPENGL_ES) || USE(LIBEPOXY)
-+#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE)
- return true;
- #else
- static bool initialized = false;
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-index 3515be452b2..82cce70f14b 100644
---- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-@@ -64,7 +64,10 @@
-
- #if USE(GLX)
- #include <GL/glx.h>
--#include <WebCore/OpenGLShims.h>
-+#endif
-+
-+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
-+#include "WebCore/OpenGLShims.h"
- #endif
-
- #if USE(GSTREAMER)
---
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
deleted file mode 100644
index d7bc379..0000000
--- a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 11 Jul 2020 15:28:05 +0300
-Subject: [PATCH] Try to fix another apparent non-unified build error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42: required from here
-/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::ImageBuffer’
- 79 | static_assert(sizeof(_Tp)>0,
- | ^~~~~~~~~~~
----
- Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
-index 55d9e34df61..12a7a83cc61 100644
---- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
-+++ b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
-@@ -19,6 +19,7 @@
-
- #pragma once
-
-+#include "ImageBuffer.h"
- #include "RenderSVGResourceContainer.h"
- #include "SVGClipPathElement.h"
- #include "SVGUnitTypes.h"
---
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch b/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
deleted file mode 100644
index 5e9f426..0000000
--- a/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 25cf4db5575192fd306b7a74d496d1e10d8cfd3e Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 27 Nov 2020 22:47:30 +0200
-Subject: [PATCH] [X11] Fix build with disabled OpenGL
-
-The added PlatformDisplayX11::visual() method requires symbols from
-X11/Xutil.h, which wasn't added as an explicit include with only
-EGL headers indirectly pulled it in with standard build options.
----
- Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
-index 8fe3d3e92c88..2b2805446aad 100644
---- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
-+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
-@@ -30,6 +30,7 @@
-
- #if PLATFORM(X11)
- #include <X11/Xlib.h>
-+#include <X11/Xutil.h>
- #include <X11/extensions/Xcomposite.h>
- #if PLATFORM(GTK)
- #include <X11/extensions/Xdamage.h>
---
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
deleted file mode 100644
index 9c277e7..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2019-08-26 17:55:46.000000000 +0300
-+++ webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2019-11-04 23:33:44.146933810 +0300
-@@ -31,6 +31,7 @@
- #include "WebKitWaylandServerProtocol.h"
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <WebCore/GLContext.h>
- #include <WebCore/PlatformDisplayWayland.h>
- #include <WebCore/Region.h>
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.28.1-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.28.1-musl.patch
deleted file mode 100644
index e28d9a5..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.28.1-musl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/Source/JavaScriptCore/runtime/MachineContext.h
-+++ b/Source/JavaScriptCore/runtime/MachineContext.h
-@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
-
- #if CPU(X86)
- return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
-@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-
---- a/Source/WebCore/xml/XPathGrammar.cpp
-+++ b/Source/WebCore/xml/XPathGrammar.cpp
-@@ -966,7 +966,7 @@ int yydebug;
- #if YYERROR_VERBOSE
-
- # ifndef yystrlen
--# if defined __GLIBC__ && defined _STRING_H
-+# if defined __linux__ && defined _STRING_H
- # define yystrlen strlen
- # else
- /* Return the length of YYSTR. */
-@@ -989,7 +989,7 @@ yystrlen (yystr)
- # endif
-
- # ifndef yystpcpy
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
- # define yystpcpy stpcpy
- # else
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.28.4-lower-stack-usage.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.28.4-lower-stack-usage.patch
deleted file mode 100644
index a7af804..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.28.4-lower-stack-usage.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h
-index 41cab118..2ac66c7a 100644
---- a/Source/JavaScriptCore/runtime/OptionsList.h
-+++ b/Source/JavaScriptCore/runtime/OptionsList.h
-@@ -90,9 +90,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
- \
- v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
- \
-- v(Unsigned, maxPerThreadStackUsage, 5 * MB, Normal, "Max allowed stack usage by the VM") \
-- v(Unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
-- v(Unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
-+ v(Unsigned, maxPerThreadStackUsage, 128 * KB , Normal, "Max allowed stack usage by the VM") \
-+ v(Unsigned, softReservedZoneSize, 48 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
-+ v(Unsigned, reservedZoneSize, 32 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
- \
- v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
- v(Unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
deleted file mode 100644
index ab36b12..0000000
--- a/net-libs/webkit-gtk/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
- <flag name="egl">Enable EGL support</flag>
- <flag name="examples">Install the MiniBrowser example application</flag>
- <flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
- <flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
- <flag name="jumbo-build">Combine source files to speed up build process</flag>
-</use>
-</pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
deleted file mode 100644
index d5295d1..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..8} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
- gles2-only? ( egl !opengl )
- gstreamer? ( opengl? ( egl ) )
- wayland? ( egl )
- || ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
- >=gui-libs/libwpe-1.5.0:1.0
- >=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
- >=x11-libs/cairo-1.16.0:=[X?]
- >=media-libs/fontconfig-2.13.0:1.0
- >=media-libs/freetype-2.9.0:2
- >=dev-libs/libgcrypt-1.7.0:0=
- >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
- >=media-libs/harfbuzz-1.4.2:=[icu(+)]
- >=dev-libs/icu-60.2:=
- virtual/jpeg:0=
- >=net-libs/libsoup-2.54:2.4[introspection?]
- >=dev-libs/libxml2-2.8.0:2
- >=media-libs/libpng-1.4:0=
- dev-db/sqlite:3=
- sys-libs/zlib:0
- >=dev-libs/atk-2.16.0
- media-libs/libwebp:=
-
- >=dev-libs/glib-2.44.0:2
- >=dev-libs/libxslt-1.1.7
- media-libs/woff2
- gnome-keyring? ( app-crypt/libsecret )
- introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
- dev-libs/libtasn1:=
- spell? ( >=app-text/enchant-0.22:2 )
- gstreamer? (
- >=media-libs/gstreamer-1.14:1.0
- >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
- gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
- >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
- >=media-libs/gst-plugins-bad-1.14:1.0 )
-
- X? (
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXrender
- x11-libs/libXt )
-
- libnotify? ( x11-libs/libnotify )
- dev-libs/hyphen
- jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
- egl? ( media-libs/mesa[egl] )
- gles2-only? ( media-libs/mesa[gles2] )
- opengl? ( virtual/opengl )
- wayland? (
- dev-libs/wayland
- >=dev-libs/wayland-protocols-1.12
- opengl? ( ${wpe_depend} )
- gles2-only? ( ${wpe_depend} )
- )
-
- seccomp? (
- >=sys-apps/bubblewrap-0.3.1
- sys-libs/libseccomp
- sys-apps/xdg-dbus-proxy
- )
-
- systemd? ( sys-apps/systemd:= )
- gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-unset wpe_depend
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
- ${PYTHON_DEPS}
- ${RUBY_DEPS}
- >=app-accessibility/at-spi2-core-2.5.3
- dev-util/glib-utils
- >=dev-util/gperf-3.0.1
- >=sys-devel/bison-2.4.3
- || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
- sys-devel/gettext
- virtual/pkgconfig
-
- >=dev-lang/perl-5.10
- virtual/perl-Data-Dumper
- virtual/perl-Carp
- virtual/perl-JSON-PP
-
- gtk-doc? ( >=dev-util/gtk-doc-1.32 )
- geolocation? ( dev-util/gdbus-codegen )
- >=dev-util/cmake-3.10
-"
-# test? (
-# dev-python/pygobject:3[python_targets_python2_7]
-# x11-themes/hicolor-icon-theme
-# jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] ; then
- if 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++17 ; then
- die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
- fi
- fi
-
- if ! use opengl && ! use gles2-only; then
- ewarn
- ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
- ewarn "This is an unsupported configuration meant for very specific embedded"
- ewarn "use cases, where there truly is no GL possible (and even that use case"
- ewarn "is very unlikely to come by). If you have GL (even software-only), you"
- ewarn "really really should be enabling OpenGL!"
- ewarn
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- check-reqs_pkg_setup
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
- eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
- eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
- eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
- eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch
- if use elibc_musl ; then
- # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=be463923b10a7268117c27c7e5515fc32457918c
- eapply "${FILESDIR}/${PN}-2.28.1-musl.patch"
- eapply "${FILESDIR}/${PN}-2.28.4-lower-stack-usage.patch"
- fi
- cmake_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # Respect CC, otherwise fails on prefix #395875
- tc-export CC
-
- # 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
-
- # We try to use gold when possible for this package
-# if ! tc-ld-is-gold ; then
-# append-ldflags "-Wl,--reduce-memory-overheads"
-# fi
-
- # Ruby situation is a bit complicated. See bug 513888
- local rubyimpl
- local ruby_interpreter=""
- for rubyimpl in ${USE_RUBY}; do
- if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
- fi
- done
- # This will rarely occur. Only a couple of corner cases could lead us to
- # that failure. See bug 513888
- [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
- #
- # opengl needs to be explicetly handled, bug #576634
-
- local use_wpe_renderer=OFF
- local opengl_enabled
- if use opengl || use gles2-only; then
- opengl_enabled=ON
- use wayland && use_wpe_renderer=ON
- else
- opengl_enabled=OFF
- fi
-
- local mycmakeargs=(
- -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
- -DENABLE_QUARTZ_TARGET=$(usex aqua)
- -DENABLE_API_TESTS=$(usex test)
- -DENABLE_GTKDOC=$(usex gtk-doc)
- -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
- $(cmake_use_find_package gles2-only OpenGLES2)
- -DENABLE_GLES2=$(usex gles2-only)
- -DENABLE_MINIBROWSER=$(usex examples)
- -DENABLE_VIDEO=$(usex gstreamer)
- -DENABLE_WEB_AUDIO=$(usex gstreamer)
- -DENABLE_INTROSPECTION=$(usex introspection)
- -DUSE_LIBNOTIFY=$(usex libnotify)
- -DUSE_LIBSECRET=$(usex gnome-keyring)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_WOFF2=ON
- -DENABLE_SPELLCHECK=$(usex spell)
- -DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
- -DENABLE_GAMEPAD=$(usex gamepad)
- -DENABLE_WAYLAND_TARGET=$(usex wayland)
- -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
- $(cmake_use_find_package egl EGL)
- $(cmake_use_find_package opengl OpenGL)
- -DENABLE_X11_TARGET=$(usex X)
- -DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
- -DENABLE_WEBGL=${opengl_enabled}
- -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
- -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
- -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
- -DPORT=GTK
- ${ruby_interpreter}
- )
-
- if use elibc_musl ; then
- mycmakeargs+=( -DENABLE_SAMPLING_PROFILER=OFF )
- fi
-
- # Allow it to use GOLD when possible as it has all the magic to
- # detect when to use it and using gold for this concrete package has
- # multiple advantages and is also the upstream default, bug #585788
-# if tc-ld-is-gold ; then
-# mycmakeargs+=( -DUSE_LD_GOLD=ON )
-# else
-# mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-# fi
-
- # https://bugs.gentoo.org/761238
- append-cppflags -DNDEBUG
-
- WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-src_test() {
- # Prevents test failures on PaX systems
- pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # Prevents crashes on PaX systems, bug #522808
- pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
- pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2020-12-04 19:12 Jory Pratt
0 siblings, 0 replies; 16+ messages in thread
From: Jory Pratt @ 2020-12-04 19:12 UTC (permalink / raw
To: gentoo-commits
commit: ff1b278f45f4cf2a9f1f0978534b0405cb3398e1
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Tue Dec 1 01:04:08 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 19:11:13 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ff1b278f
net-libs/webkit-gtk: bump to 2.30.3
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
net-libs/webkit-gtk/Manifest | 1 +
.../webkit-gtk/files/2.30.3-fix-noGL-build.patch | 27 ++
net-libs/webkit-gtk/files/2.30.3-icu68.patch | 179 ++++++++++++
net-libs/webkit-gtk/metadata.xml | 1 +
net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild | 307 +++++++++++++++++++++
5 files changed, 515 insertions(+)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e700873..ab2f785 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
DIST webkitgtk-2.28.4.tar.xz 21424908 BLAKE2B 5ca9206c3c7d0a00bc76487ae8fe79e6c5b94a86f23300f196b3edbd5e3f1ea68768ef4465b32fa694a7b6a4a2b274dfb9dba4a20b8329f9138970f1a82eb7e6 SHA512 227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1
+DIST webkitgtk-2.30.3.tar.xz 22311704 BLAKE2B d5a8ba1fe7fbbcd3d8504ad98650ec685a41ddaa43e1392172cf7840100157a283e4ccf4cf62f2f581deffd8d860cf61b43fe59178b02306efb88c8e1a803520 SHA512 cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
diff --git a/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch b/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
new file mode 100644
index 0000000..5e9f426
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.30.3-fix-noGL-build.patch
@@ -0,0 +1,27 @@
+From 25cf4db5575192fd306b7a74d496d1e10d8cfd3e Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 27 Nov 2020 22:47:30 +0200
+Subject: [PATCH] [X11] Fix build with disabled OpenGL
+
+The added PlatformDisplayX11::visual() method requires symbols from
+X11/Xutil.h, which wasn't added as an explicit include with only
+EGL headers indirectly pulled it in with standard build options.
+---
+ Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
+index 8fe3d3e92c88..2b2805446aad 100644
+--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
++++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
+@@ -30,6 +30,7 @@
+
+ #if PLATFORM(X11)
+ #include <X11/Xlib.h>
++#include <X11/Xutil.h>
+ #include <X11/extensions/Xcomposite.h>
+ #if PLATFORM(GTK)
+ #include <X11/extensions/Xdamage.h>
+--
+2.20.1
+
diff --git a/net-libs/webkit-gtk/files/2.30.3-icu68.patch b/net-libs/webkit-gtk/files/2.30.3-icu68.patch
new file mode 100644
index 0000000..33116fe
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.30.3-icu68.patch
@@ -0,0 +1,179 @@
+From a5f1691b5b885dd228018740803075e7b6059e4b Mon Sep 17 00:00:00 2001
+From: "stephan.szabo@sony.com"
+ <stephan.szabo@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Tue, 3 Nov 2020 20:06:15 +0000
+Subject: [PATCH] [WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and
+ TRUE macros by default https://bugs.webkit.org/show_bug.cgi?id=218522
+
+Reviewed by Don Olmstead.
+
+Source/WebCore:
+
+* platform/text/TextCodecICU.cpp: Replace use of TRUE with true
+
+Source/WebKit:
+
+* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false
+
+Source/WTF:
+
+Replace uses of FALSE and TRUE with false and true.
+
+* wtf/text/icu/UTextProvider.h:
+* wtf/text/icu/UTextProviderLatin1.cpp:
+* wtf/text/icu/UTextProviderUTF16.cpp:
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WTF/wtf/text/icu/UTextProvider.h | 8 ++++----
+ Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp | 14 +++++++-------
+ Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp | 4 ++--
+ Source/WebCore/platform/text/TextCodecICU.cpp | 2 +-
+ .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +-
+ 6 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/Source/WTF/wtf/text/icu/UTextProvider.h b/Source/WTF/wtf/text/icu/UTextProvider.h
+index c8f28d6ed3da..3c6fbeab6a5c 100644
+--- a/Source/WTF/wtf/text/icu/UTextProvider.h
++++ b/Source/WTF/wtf/text/icu/UTextProvider.h
+@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+ text->chunkOffset = text->chunkLength;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ } else {
+@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
+ text->chunkOffset = 0;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ }
+diff --git a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
+index 0a646b7f390d..49980f95ba79 100644
+--- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
++++ b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
+ if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (index >= length && uText->chunkNativeLimit == length) {
+ // Off the end of the buffer, but we can't get it.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return FALSE;
++ return false;
+ }
+ } else {
+ if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (!index && !uText->chunkNativeStart) {
+ // Already at the beginning; can't go any farther.
+ uText->chunkOffset = 0;
+- return FALSE;
++ return false;
+ }
+ }
+
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
+
+ uText->nativeIndexingLimit = uText->chunkLength;
+
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text)
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+diff --git a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
+index 69c8d091bd62..9c3fa709200a 100644
+--- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
++++ b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
+@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text)
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp
+index 19b41eb7125f..2f7d1930b8d7 100644
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -194,7 +194,7 @@ void TextCodecICU::createICUConverter() const
+ UErrorCode error = U_ZERO_ERROR;
+ m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close };
+ if (m_converter)
+- ucnv_setFallback(m_converter.get(), TRUE);
++ ucnv_setFallback(m_converter.get(), true);
+ }
+
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error)
+diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
+index 61e3f6050d7f..5a51b9ec1d68 100644
+--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
++++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
+@@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor()
+ int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor)
+ {
+ monitor->didDraw();
+- return FALSE;
++ return false;
+ }
+
+ void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function<void(CallbackBase::Error)>&& callback)
+--
+2.20.1
+
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 24e8c4e..3e6a3fc 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="egl">Enable EGL support</flag>
+ <flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
<flag name="jumbo-build">Combine source files to speed up build process</flag>
</use>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
new file mode 100644
index 0000000..5c4743f
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python3_{6..8} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+ gles2-only? ( egl !opengl )
+ gstreamer? ( opengl? ( egl ) )
+ wayland? ( egl )
+ || ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+ >=gui-libs/libwpe-1.5.0:1.0
+ >=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+ >=x11-libs/cairo-1.16.0:=[X?]
+ >=media-libs/fontconfig-2.13.0:1.0
+ >=media-libs/freetype-2.9.0:2
+ >=dev-libs/libgcrypt-1.7.0:0=
+ >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+ >=media-libs/harfbuzz-1.4.2:=[icu(+)]
+ >=dev-libs/icu-60.2:=
+ virtual/jpeg:0=
+ >=net-libs/libsoup-2.54:2.4[introspection?]
+ >=dev-libs/libxml2-2.8.0:2
+ >=media-libs/libpng-1.4:0=
+ dev-db/sqlite:3=
+ sys-libs/zlib:0
+ >=dev-libs/atk-2.16.0
+ media-libs/libwebp:=
+
+ >=dev-libs/glib-2.44.0:2
+ >=dev-libs/libxslt-1.1.7
+ media-libs/woff2
+ gnome-keyring? ( app-crypt/libsecret )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+ dev-libs/libtasn1:=
+ spell? ( >=app-text/enchant-0.22:2 )
+ gstreamer? (
+ >=media-libs/gstreamer-1.14:1.0
+ >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+ gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+ >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+ >=media-libs/gst-plugins-bad-1.14:1.0 )
+
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXrender
+ x11-libs/libXt )
+
+ libnotify? ( x11-libs/libnotify )
+ dev-libs/hyphen
+ jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+ egl? ( media-libs/mesa[egl] )
+ gles2-only? ( media-libs/mesa[gles2] )
+ opengl? ( virtual/opengl )
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.12
+ opengl? ( ${wpe_depend} )
+ gles2-only? ( ${wpe_depend} )
+ )
+
+ seccomp? (
+ >=sys-apps/bubblewrap-0.3.1
+ sys-libs/libseccomp
+ sys-apps/xdg-dbus-proxy
+ )
+
+ systemd? ( sys-apps/systemd:= )
+ gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ ${RUBY_DEPS}
+ >=app-accessibility/at-spi2-core-2.5.3
+ dev-util/glib-utils
+ >=dev-util/gperf-3.0.1
+ >=sys-devel/bison-2.4.3
+ || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ >=dev-lang/perl-5.10
+ virtual/perl-Data-Dumper
+ virtual/perl-Carp
+ virtual/perl-JSON-PP
+
+ gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+ geolocation? ( dev-util/gdbus-codegen )
+"
+# test? (
+# dev-python/pygobject:3[python_targets_python2_7]
+# x11-themes/hicolor-icon-theme
+# jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+ geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] ; then
+ if 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++17 ; then
+ die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+ fi
+ fi
+
+ if ! use opengl && ! use gles2-only; then
+ ewarn
+ ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+ ewarn "This is an unsupported configuration meant for very specific embedded"
+ ewarn "use cases, where there truly is no GL possible (and even that use case"
+ ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+ ewarn "really really should be enabling OpenGL!"
+ ewarn
+ fi
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ check-reqs_pkg_setup
+ fi
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PV}-icu68.patch
+ eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+ eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+ eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
+ eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
+ eapply "${FILESDIR}"/${PV}-fix-noGL-build.patch
+ if use elibc_musl ; then
+ # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=be463923b10a7268117c27c7e5515fc32457918c
+ eapply "${FILESDIR}/${PN}-2.28.1-musl.patch"
+ eapply "${FILESDIR}/${PN}-2.28.4-lower-stack-usage.patch"
+ fi
+ cmake-utils_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Respect CC, otherwise fails on prefix #395875
+ tc-export CC
+
+ # 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
+
+ # We try to use gold when possible for this package
+# if ! tc-ld-is-gold ; then
+# append-ldflags "-Wl,--reduce-memory-overheads"
+# fi
+
+ # Ruby situation is a bit complicated. See bug 513888
+ local rubyimpl
+ local ruby_interpreter=""
+ for rubyimpl in ${USE_RUBY}; do
+ if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+ fi
+ done
+ # This will rarely occur. Only a couple of corner cases could lead us to
+ # that failure. See bug 513888
+ [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # opengl needs to be explicetly handled, bug #576634
+
+ local use_wpe_renderer=OFF
+ local opengl_enabled
+ if use opengl || use gles2-only; then
+ opengl_enabled=ON
+ use wayland && use_wpe_renderer=ON
+ else
+ opengl_enabled=OFF
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+ -DENABLE_QUARTZ_TARGET=$(usex aqua)
+ -DENABLE_API_TESTS=$(usex test)
+ -DENABLE_GTKDOC=$(usex gtk-doc)
+ -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+ $(cmake-utils_use_find_package gles2-only OpenGLES2)
+ -DENABLE_GLES2=$(usex gles2-only)
+ -DENABLE_VIDEO=$(usex gstreamer)
+ -DENABLE_WEB_AUDIO=$(usex gstreamer)
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DUSE_LIBNOTIFY=$(usex libnotify)
+ -DUSE_LIBSECRET=$(usex gnome-keyring)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_WOFF2=ON
+ -DENABLE_SPELLCHECK=$(usex spell)
+ -DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+ -DENABLE_GAMEPAD=$(usex gamepad)
+ -DENABLE_WAYLAND_TARGET=$(usex wayland)
+ -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ -DENABLE_X11_TARGET=$(usex X)
+ -DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
+ -DENABLE_WEBGL=${opengl_enabled}
+ -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+ -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+ -DCMAKE_BUILD_TYPE=Release
+ -DPORT=GTK
+ ${ruby_interpreter}
+ )
+
+ if use elibc_musl ; then
+ mycmakeargs+=( -DENABLE_SAMPLING_PROFILER=OFF )
+ fi
+
+ # Allow it to use GOLD when possible as it has all the magic to
+ # detect when to use it and using gold for this concrete package has
+ # multiple advantages and is also the upstream default, bug #585788
+# if tc-ld-is-gold ; then
+# mycmakeargs+=( -DUSE_LD_GOLD=ON )
+# else
+# mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+# fi
+
+ WK_USE_CCACHE=NO cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_test() {
+ # Prevents test failures on PaX systems
+ 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
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
+
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2020-08-01 12:22 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2020-08-01 12:22 UTC (permalink / raw
To: gentoo-commits
commit: 81247b73ed2f49805f8ea3f9b318d7eb0d6638bb
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Thu Jul 30 07:10:39 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Aug 1 12:22:12 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=81247b73
net-libs/webkit-gtk: security bump to 2.28.4
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-libs/webkit-gtk/Manifest | 1 +
.../webkit-gtk/files/2.28.4-non-jumbo-fix2.patch | 31 +++
.../webkit-gtk-2.28.4-lower-stack-usage.patch | 17 ++
net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild | 299 +++++++++++++++++++++
4 files changed, 348 insertions(+)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e5f86c3..63a7c52 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
DIST webkitgtk-2.28.3.tar.xz 21425556 BLAKE2B f51522c33fa97aa00dee1428bc256ef910dd8764b3731580639c79642965c60b91b8d2f5c1d3bdb60975c68706d415447e8b52520ecfa1687968f3790137234b SHA512 575184edb8279f1dca67cbeeb45280ca5da9aa388e208251d9ad7a56907950cfd85b1fc426eee90699593c428f4e1037c96cb6aa16f534c71734c64950f2d643
+DIST webkitgtk-2.28.4.tar.xz 21424908 BLAKE2B 5ca9206c3c7d0a00bc76487ae8fe79e6c5b94a86f23300f196b3edbd5e3f1ea68768ef4465b32fa694a7b6a4a2b274dfb9dba4a20b8329f9138970f1a82eb7e6 SHA512 227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1
diff --git a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
new file mode 100644
index 0000000..d7bc379
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
@@ -0,0 +1,31 @@
+From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 11 Jul 2020 15:28:05 +0300
+Subject: [PATCH] Try to fix another apparent non-unified build error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42: required from here
+/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::ImageBuffer’
+ 79 | static_assert(sizeof(_Tp)>0,
+ | ^~~~~~~~~~~
+---
+ Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+index 55d9e34df61..12a7a83cc61 100644
+--- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
++++ b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+@@ -19,6 +19,7 @@
+
+ #pragma once
+
++#include "ImageBuffer.h"
+ #include "RenderSVGResourceContainer.h"
+ #include "SVGClipPathElement.h"
+ #include "SVGUnitTypes.h"
+--
+2.20.1
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.28.4-lower-stack-usage.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.28.4-lower-stack-usage.patch
new file mode 100644
index 0000000..a7af804
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.28.4-lower-stack-usage.patch
@@ -0,0 +1,17 @@
+diff --git a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h
+index 41cab118..2ac66c7a 100644
+--- a/Source/JavaScriptCore/runtime/OptionsList.h
++++ b/Source/JavaScriptCore/runtime/OptionsList.h
+@@ -90,9 +90,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
+ \
+ v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
+ \
+- v(Unsigned, maxPerThreadStackUsage, 5 * MB, Normal, "Max allowed stack usage by the VM") \
+- v(Unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
+- v(Unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
++ v(Unsigned, maxPerThreadStackUsage, 128 * KB , Normal, "Max allowed stack usage by the VM") \
++ v(Unsigned, softReservedZoneSize, 48 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
++ v(Unsigned, reservedZoneSize, 32 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
+ \
+ v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
+ v(Unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
new file mode 100644
index 0000000..074f545
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+ gles2-only? ( egl !opengl )
+ gstreamer? ( opengl? ( egl ) )
+ wayland? ( egl )
+ || ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+ >=gui-libs/libwpe-1.3.0:1.0
+ >=gui-libs/wpebackend-fdo-1.3.1:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+ >=x11-libs/cairo-1.16.0:=[X?]
+ >=media-libs/fontconfig-2.13.0:1.0
+ >=media-libs/freetype-2.9.0:2
+ >=dev-libs/libgcrypt-1.7.0:0=
+ >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+ >=media-libs/harfbuzz-1.4.2:=[icu(+)]
+ >=dev-libs/icu-3.8.1-r1:=
+ virtual/jpeg:0=
+ >=net-libs/libsoup-2.54:2.4[introspection?]
+ >=dev-libs/libxml2-2.8.0:2
+ >=media-libs/libpng-1.4:0=
+ dev-db/sqlite:3=
+ sys-libs/zlib:0
+ >=dev-libs/atk-2.16.0
+ media-libs/libwebp:=
+
+ >=dev-libs/glib-2.44.0:2
+ >=dev-libs/libxslt-1.1.7
+ media-libs/woff2
+ gnome-keyring? ( app-crypt/libsecret )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+ dev-libs/libtasn1:=
+ spell? ( >=app-text/enchant-0.22:2 )
+ gstreamer? (
+ >=media-libs/gstreamer-1.14:1.0
+ >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+ gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+ >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+ >=media-libs/gst-plugins-bad-1.14:1.0 )
+
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXrender
+ x11-libs/libXt )
+
+ libnotify? ( x11-libs/libnotify )
+ dev-libs/hyphen
+ jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+ egl? ( media-libs/mesa[egl] )
+ gles2-only? ( media-libs/mesa[gles2] )
+ opengl? ( virtual/opengl )
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.12
+ opengl? ( ${wpe_depend} )
+ gles2-only? ( ${wpe_depend} )
+ )
+
+ seccomp? (
+ >=sys-apps/bubblewrap-0.3.1
+ sys-libs/libseccomp
+ sys-apps/xdg-dbus-proxy
+ )
+"
+unset wpe_depend
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ ${RUBY_DEPS}
+ >=app-accessibility/at-spi2-core-2.5.3
+ dev-util/glib-utils
+ >=dev-util/gperf-3.0.1
+ >=sys-devel/bison-2.4.3
+ || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ >=dev-lang/perl-5.10
+ virtual/perl-Data-Dumper
+ virtual/perl-Carp
+ virtual/perl-JSON-PP
+
+ gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+ geolocation? ( dev-util/gdbus-codegen )
+"
+# test? (
+# dev-python/pygobject:3[python_targets_python2_7]
+# x11-themes/hicolor-icon-theme
+# jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+ geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] ; then
+ if 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++17 ; then
+ die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+ fi
+ fi
+
+ if ! use opengl && ! use gles2-only; then
+ ewarn
+ ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+ ewarn "This is an unsupported configuration meant for very specific embedded"
+ ewarn "use cases, where there truly is no GL possible (and even that use case"
+ ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+ ewarn "really really should be enabling OpenGL!"
+ ewarn
+ fi
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ check-reqs_pkg_setup
+ fi
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+ eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+ eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
+ eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
+ if use elibc_musl ; then
+ # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=be463923b10a7268117c27c7e5515fc32457918c
+ eapply "${FILESDIR}/${PN}-2.28.1-musl.patch"
+ eapply "${FILESDIR}/${PN}-2.28.4-lower-stack-usage.patch"
+ fi
+ cmake-utils_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Respect CC, otherwise fails on prefix #395875
+ tc-export CC
+
+ # 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
+
+ # We try to use gold when possible for this package
+# if ! tc-ld-is-gold ; then
+# append-ldflags "-Wl,--reduce-memory-overheads"
+# fi
+
+ # Ruby situation is a bit complicated. See bug 513888
+ local rubyimpl
+ local ruby_interpreter=""
+ for rubyimpl in ${USE_RUBY}; do
+ if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+ fi
+ done
+ # This will rarely occur. Only a couple of corner cases could lead us to
+ # that failure. See bug 513888
+ [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # opengl needs to be explicetly handled, bug #576634
+
+ local use_wpe_renderer=OFF
+ local opengl_enabled
+ if use opengl || use gles2-only; then
+ opengl_enabled=ON
+ use wayland && use_wpe_renderer=ON
+ else
+ opengl_enabled=OFF
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+ -DENABLE_QUARTZ_TARGET=$(usex aqua)
+ -DENABLE_API_TESTS=$(usex test)
+ -DENABLE_GTKDOC=$(usex gtk-doc)
+ -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+ $(cmake-utils_use_find_package gles2-only OpenGLES2)
+ -DENABLE_GLES2=$(usex gles2-only)
+ -DENABLE_VIDEO=$(usex gstreamer)
+ -DENABLE_WEB_AUDIO=$(usex gstreamer)
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DUSE_LIBNOTIFY=$(usex libnotify)
+ -DUSE_LIBSECRET=$(usex gnome-keyring)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_WOFF2=ON
+ -DENABLE_SPELLCHECK=$(usex spell)
+ -DENABLE_WAYLAND_TARGET=$(usex wayland)
+ -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ -DENABLE_X11_TARGET=$(usex X)
+ -DENABLE_OPENGL=${opengl_enabled}
+ -DENABLE_WEBGL=${opengl_enabled}
+ -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+ -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+ -DCMAKE_BUILD_TYPE=Release
+ -DPORT=GTK
+ ${ruby_interpreter}
+ )
+
+ if use elibc_musl ; then
+ mycmakeargs+=( -DENABLE_SAMPLING_PROFILER=OFF )
+ fi
+
+ # Allow it to use GOLD when possible as it has all the magic to
+ # detect when to use it and using gold for this concrete package has
+ # multiple advantages and is also the upstream default, bug #585788
+# if tc-ld-is-gold ; then
+# mycmakeargs+=( -DUSE_LD_GOLD=ON )
+# else
+# mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+# fi
+
+ WK_USE_CCACHE=NO cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_test() {
+ # Prevents test failures on PaX systems
+ 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
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2020-03-26 23:51 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2020-03-26 23:51 UTC (permalink / raw
To: gentoo-commits
commit: 5114c8b95a0da7faa97386c86541bda1861d3faf
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed Mar 25 17:59:55 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 23:51:09 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5114c8b9
net-libs/webkit-gtk: reintroduce package synced with ::gentoo
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --force
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-libs/webkit-gtk/Manifest | 2 +
.../files/2.26.2-fix-arm-non-unified-build.patch | 27 ++
net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch | 27 ++
.../webkit-gtk/files/webkit-gtk-2.22.4-musl.patch | 137 ++++++++++
.../webkit-gtk-2.24.4-eglmesaext-include.patch | 10 +
.../files/webkit-gtk-2.24.4-icu-65.patch | 53 ++++
.../webkit-gtk/files/webkit-gtk-2.26.2-musl.patch | 136 ++++++++++
net-libs/webkit-gtk/metadata.xml | 18 ++
net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 287 ++++++++++++++++++++
net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild | 290 +++++++++++++++++++++
net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild | 290 +++++++++++++++++++++
11 files changed, 1277 insertions(+)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
new file mode 100644
index 0000000..cc4924b
--- /dev/null
+++ b/net-libs/webkit-gtk/Manifest
@@ -0,0 +1,2 @@
+DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
+DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
new file mode 100644
index 0000000..0f09599
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
@@ -0,0 +1,27 @@
+Add missing headers required during non-unified build.
+
+Unified build happens to get them included by the other sources unified
+into same source file, thus didn't fail.
+
+diff -urNp a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
+--- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
++++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
+@@ -30,6 +30,7 @@
+
+ #include "BuiltinNames.h"
+ #include "BytecodeGenerator.h"
++#include "BytecodeStructs.h"
+ #include "CallFrame.h"
+ #include "JIT.h"
+ #include "JSCInlines.h"
+diff -urNp a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
++++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+@@ -23,6 +23,7 @@
+ #include "MachineStackMarker.h"
+
+ #include "ConservativeRoots.h"
++#include "CPU.h"
+ #include "MachineContext.h"
+ #include <setjmp.h>
+ #include <stdlib.h>
diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
new file mode 100644
index 0000000..85328be
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
@@ -0,0 +1,27 @@
+Upstream commit 41455af5d76a726f195838846b61e1693a2da99c is supposed to fix this,
+but it looks like it's not enough with older perl-based gtk-doc.
+Keep this extra patch only until we can't depend on a newer gtk-doc version, which
+should be retested whether this patch is unnecessary then.
+
+Upstream extra reference for the above reference commit:
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245027 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
+index 023b14c33f4..657b1febf5d 100644
+--- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
++++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
+@@ -1505,7 +1505,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
+ * WebKitSettings:enable-media:
+ *
+ * Enable or disable support for media playback on pages. This setting is enabled by
+- * default. Disabling it means `<audio>`, `<track>` and `<video>` elements will have
++ * default. Disabling it means audio, track and video elements will have
+ * playback support disabled.
+ *
+ * Since: 2.26
+--
+2.20.1
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.22.4-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.22.4-musl.patch
new file mode 100644
index 0000000..c829f19
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.22.4-musl.patch
@@ -0,0 +1,137 @@
+--- a/Source/JavaScriptCore/runtime/MachineContext.h
++++ b/Source/JavaScriptCore/runtime/MachineContext.h
+@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ #if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
+@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+
+--- a/Source/JavaScriptCore/runtime/Options.h
++++ b/Source/JavaScriptCore/runtime/Options.h
+@@ -138,9 +138,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
+ \
+ v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
+ \
+- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \
+- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
+- v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
++ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \
++ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
++ v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
+ \
+ v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
+ v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
+
+--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
++++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
+@@ -836,7 +836,7 @@ int yydebug;
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -852,7 +852,7 @@ yystrlen (const char *yystr)
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+
+--- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
++++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
+@@ -1975,7 +1975,7 @@ int yydebug;
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -1991,7 +1991,7 @@ yystrlen (const char *yystr)
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -710,7 +710,7 @@
+ #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
+ #endif
+
+-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+ #define HAVE_MACHINE_CONTEXT 1
+ #endif
+
+--- a/Source/WebCore/xml/XPathGrammar.cpp
++++ b/Source/WebCore/xml/XPathGrammar.cpp
+@@ -966,7 +966,7 @@ int yydebug;
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -989,7 +989,7 @@ yystrlen (yystr)
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
new file mode 100644
index 0000000..9c277e7
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-eglmesaext-include.patch
@@ -0,0 +1,10 @@
+--- webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2019-08-26 17:55:46.000000000 +0300
++++ webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2019-11-04 23:33:44.146933810 +0300
+@@ -31,6 +31,7 @@
+ #include "WebKitWaylandServerProtocol.h"
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <WebCore/GLContext.h>
+ #include <WebCore/PlatformDisplayWayland.h>
+ #include <WebCore/Region.h>
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
new file mode 100644
index 0000000..475c985
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
@@ -0,0 +1,53 @@
+From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 4 Oct 2019 22:17:11 +0200
+Subject: [PATCH] Add missing semicolons to fix build with icu 65.1
+
+---
+ Source/WTF/wtf/URLHelpers.cpp | 2 +-
+ Source/WebCore/dom/Document.cpp | 6 +++---
+ 4 files changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp
+index 18e7f13cd61..c584f1a0cb7 100644
+--- a/Source/WTF/wtf/URLHelpers.cpp
++++ b/Source/WTF/wtf/URLHelpers.cpp
+@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt
+ Optional<UChar32> previousCodePoint;
+ while (i < length) {
+ UChar32 c;
+- U16_NEXT(buffer, i, length, c)
++ U16_NEXT(buffer, i, length, c);
+ UErrorCode error = U_ZERO_ERROR;
+ UScriptCode script = uscript_getScript(c, &error);
+ if (error != U_ZERO_ERROR) {
+diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
+index 0fd0fa090bf..01f76850f3d 100644
+--- a/Source/WebCore/dom/Document.cpp
++++ b/Source/WebCore/dom/Document.cpp
+@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
+ unsigned i = 0;
+
+ UChar32 c;
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNameStart(c))
+ return false;
+
+ while (i < length) {
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNamePart(c))
+ return false;
+ }
+@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons
+
+ for (unsigned i = 0; i < length; ) {
+ UChar32 c;
+- U16_NEXT(qualifiedName, i, length, c)
++ U16_NEXT(qualifiedName, i, length, c);
+ if (c == ':') {
+ if (sawColon)
+ return Exception { InvalidCharacterError };
+--
+2.23.0
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-musl.patch
new file mode 100644
index 0000000..8cd73b3
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-musl.patch
@@ -0,0 +1,136 @@
+--- a/Source/JavaScriptCore/runtime/MachineContext.h
++++ b/Source/JavaScriptCore/runtime/MachineContext.h
+@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ #if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
+@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+
+--- a/Source/JavaScriptCore/runtime/Options.h
++++ b/Source/JavaScriptCore/runtime/Options.h
+@@ -138,9 +138,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
+ \
+ v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
+ \
+- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \
+- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
+- v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
++ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \
++ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
++ v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
+ \
+ v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
+ v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
+
+--- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
++++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
+@@ -1975,7 +1975,7 @@ int yydebug;
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -1991,7 +1991,7 @@ yystrlen (const char *yystr)
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -710,7 +710,7 @@
+ #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
+ #endif
+
+-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+ #define HAVE_MACHINE_CONTEXT 1
+ #endif
+
+--- a/Source/WebCore/xml/XPathGrammar.cpp
++++ b/Source/WebCore/xml/XPathGrammar.cpp
+@@ -966,7 +966,7 @@ int yydebug;
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -989,7 +989,7 @@ yystrlen (yystr)
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+--- ./Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp.orig
++++ ./Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
+@@ -728,7 +728,7 @@
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -743,7 +743,7 @@
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
new file mode 100644
index 0000000..e88c10a
--- /dev/null
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+ <flag name="coverage">Enable code coverage support</flag>
+ <flag name="egl">Enable EGL support</flag>
+ <flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
+ <flag name="gles2">Enable GLESv2 support</flag>
+ <flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL</flag>
+ <flag name="jumbo-build">Combine source files to speed up build process</flag>
+ <flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</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.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
new file mode 100644
index 0000000..9012463
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~arm ~ppc ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+ geolocation? ( introspection )
+ gles2? ( egl !opengl )
+ gstreamer? ( opengl? ( egl ) )
+ nsplugin? ( X )
+ webgl? ( gstreamer
+ || ( gles2 opengl ) )
+ wayland? ( egl )
+ || ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+ >=x11-libs/cairo-1.16.0:=[X?]
+ >=media-libs/fontconfig-2.13.0:1.0
+ >=media-libs/freetype-2.9.0:2
+ >=dev-libs/libgcrypt-1.7.0:0=
+ >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+ >=media-libs/harfbuzz-1.4.2:=[icu(+)]
+ >=dev-libs/icu-3.8.1-r1:=
+ virtual/jpeg:0=
+ >=net-libs/libsoup-2.48:2.4[introspection?]
+ >=dev-libs/libxml2-2.8.0:2
+ >=media-libs/libpng-1.4:0=
+ dev-db/sqlite:3=
+ sys-libs/zlib:0
+ >=dev-libs/atk-2.8.0
+ media-libs/libwebp:=
+
+ >=dev-libs/glib-2.40:2
+ >=dev-libs/libxslt-1.1.7
+ media-libs/woff2
+ gnome-keyring? ( app-crypt/libsecret )
+ geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+ dev-libs/libtasn1:=
+ nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+ spell? ( >=app-text/enchant-0.22:= )
+ gstreamer? (
+ >=media-libs/gstreamer-1.14:1.0
+ >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+ >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+ >=media-libs/gst-plugins-bad-1.14:1.0 )
+
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXrender
+ x11-libs/libXt )
+
+ libnotify? ( x11-libs/libnotify )
+ dev-libs/hyphen
+ jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+ egl? ( media-libs/mesa[egl] )
+ gles2? ( media-libs/mesa[gles2] )
+ opengl? ( virtual/opengl )
+ webgl? (
+ x11-libs/libXcomposite
+ x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ ${RUBY_DEPS}
+ >=app-accessibility/at-spi2-core-2.5.3
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/gperf-3.0.1
+ >=sys-devel/bison-2.4.3
+ || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ >=dev-lang/perl-5.10
+ virtual/perl-Data-Dumper
+ virtual/perl-Carp
+ virtual/perl-JSON-PP
+
+ doc? ( >=dev-util/gtk-doc-1.10 )
+ geolocation? ( dev-util/gdbus-codegen )
+"
+# test? (
+# 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" ]] ; then
+ if 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.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+ fi
+
+ if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+ die 'The active compiler needs to be gcc 4.9 (or newer)'
+ fi
+ fi
+
+ if ! use opengl && ! use gles2; then
+ ewarn
+ ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+ ewarn "This is an unsupported configuration meant for very specific embedded"
+ ewarn "use cases, where there truly is no GL possible (and even that use case"
+ ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+ ewarn "really really should be enabling OpenGL!"
+ ewarn
+ fi
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ check-reqs_pkg_setup
+ fi
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596
+ eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+ if use elibc_musl ; then
+ # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=ae4a15801816b7f140076fa8f636d46247902af3
+ eapply "${FILESDIR}"/${PN}-2.22.4-musl.patch
+ fi
+ cmake-utils_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Respect CC, otherwise fails on prefix #395875
+ tc-export CC
+
+ # 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
+
+ # We try to use gold when possible for this package
+# if ! tc-ld-is-gold ; then
+# append-ldflags "-Wl,--reduce-memory-overheads"
+# fi
+
+ # Multiple rendering bugs on youtube, github, etc without this, bug #547224
+ append-flags $(test-flags -fno-strict-aliasing)
+
+ # Ruby situation is a bit complicated. See bug 513888
+ local rubyimpl
+ local ruby_interpreter=""
+ for rubyimpl in ${USE_RUBY}; do
+ if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+ fi
+ done
+ # This will rarely occur. Only a couple of corner cases could lead us to
+ # that failure. See bug 513888
+ [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # FTL_JIT requires llvm
+ #
+ # opengl needs to be explicetly handled, bug #576634
+
+ local opengl_enabled
+ if use opengl || use gles2; then
+ opengl_enabled=ON
+ else
+ opengl_enabled=OFF
+ fi
+
+ local mycmakeargs=(
+ #-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
+ -DENABLE_QUARTZ_TARGET=$(usex aqua)
+ -DENABLE_API_TESTS=$(usex test)
+ -DENABLE_GTKDOC=$(usex doc)
+ -DENABLE_GEOLOCATION=$(usex geolocation)
+ $(cmake-utils_use_find_package gles2 OpenGLES2)
+ -DENABLE_GLES2=$(usex gles2)
+ -DENABLE_VIDEO=$(usex gstreamer)
+ -DENABLE_WEB_AUDIO=$(usex gstreamer)
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DUSE_LIBNOTIFY=$(usex libnotify)
+ -DUSE_LIBSECRET=$(usex gnome-keyring)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_WOFF2=ON
+ -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+ -DENABLE_SPELLCHECK=$(usex spell)
+ -DENABLE_WAYLAND_TARGET=$(usex wayland)
+ -DENABLE_WEBGL=$(usex webgl)
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ -DENABLE_X11_TARGET=$(usex X)
+ -DENABLE_OPENGL=${opengl_enabled}
+ -DCMAKE_BUILD_TYPE=Release
+ -DPORT=GTK
+ ${ruby_interpreter}
+ )
+
+ # Allow it to use GOLD when possible as it has all the magic to
+ # detect when to use it and using gold for this concrete package has
+ # multiple advantages and is also the upstream default, bug #585788
+# if tc-ld-is-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
+ 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
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+ use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
new file mode 100644
index 0000000..6585c0d
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+ gles2-only? ( egl !opengl )
+ gstreamer? ( opengl? ( egl ) )
+ wayland? ( egl )
+ || ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+ >=gui-libs/libwpe-1.3.0:1.0
+ >=gui-libs/wpebackend-fdo-1.3.1:1.0
+"
+RDEPEND="
+ >=x11-libs/cairo-1.16.0:=[X?]
+ >=media-libs/fontconfig-2.13.0:1.0
+ >=media-libs/freetype-2.9.0:2
+ >=dev-libs/libgcrypt-1.7.0:0=
+ >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+ >=media-libs/harfbuzz-1.4.2:=[icu(+)]
+ >=dev-libs/icu-3.8.1-r1:=
+ virtual/jpeg:0=
+ >=net-libs/libsoup-2.54:2.4[introspection?]
+ >=dev-libs/libxml2-2.8.0:2
+ >=media-libs/libpng-1.4:0=
+ dev-db/sqlite:3=
+ sys-libs/zlib:0
+ >=dev-libs/atk-2.16.0
+ media-libs/libwebp:=
+
+ >=dev-libs/glib-2.44.0:2
+ >=dev-libs/libxslt-1.1.7
+ media-libs/woff2
+ gnome-keyring? ( app-crypt/libsecret )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+ dev-libs/libtasn1:=
+ spell? ( >=app-text/enchant-0.22:2 )
+ gstreamer? (
+ >=media-libs/gstreamer-1.14:1.0
+ >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
+ gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+ >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+ >=media-libs/gst-plugins-bad-1.14:1.0 )
+
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXrender
+ x11-libs/libXt )
+
+ libnotify? ( x11-libs/libnotify )
+ dev-libs/hyphen
+ jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+ egl? ( media-libs/mesa[egl] )
+ gles2-only? ( media-libs/mesa[gles2] )
+ opengl? ( virtual/opengl )
+ wayland? (
+ opengl? ( ${wpe_depend} )
+ gles2-only? ( ${wpe_depend} )
+ )
+
+ seccomp? (
+ >=sys-apps/bubblewrap-0.3.1
+ sys-libs/libseccomp
+ sys-apps/xdg-dbus-proxy
+ )
+"
+unset wpe_depend
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ ${RUBY_DEPS}
+ >=app-accessibility/at-spi2-core-2.5.3
+ dev-util/glib-utils
+ >=dev-util/gperf-3.0.1
+ >=sys-devel/bison-2.4.3
+ || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ >=dev-lang/perl-5.10
+ virtual/perl-Data-Dumper
+ virtual/perl-Carp
+ virtual/perl-JSON-PP
+
+ gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+ geolocation? ( dev-util/gdbus-codegen )
+"
+# test? (
+# dev-python/pygobject:3[python_targets_python2_7]
+# x11-themes/hicolor-icon-theme
+# jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+ geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] ; then
+ if 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++17 ; then
+ die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+ fi
+ fi
+
+ if ! use opengl && ! use gles2-only; then
+ ewarn
+ ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
+ ewarn "This is an unsupported configuration meant for very specific embedded"
+ ewarn "use cases, where there truly is no GL possible (and even that use case"
+ ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+ ewarn "really really should be enabling OpenGL!"
+ ewarn
+ fi
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ check-reqs_pkg_setup
+ fi
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+ eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
+ eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
+ if use elibc_musl ; then
+ # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=9c8441ce582f411dbec289ab698e6d0a962f62cc
+ eapply "${FILESDIR}/${PN}-2.26.2-musl.patch"
+ fi
+ cmake-utils_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Respect CC, otherwise fails on prefix #395875
+ tc-export CC
+
+ # 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
+
+ # We try to use gold when possible for this package
+# if ! tc-ld-is-gold ; then
+# append-ldflags "-Wl,--reduce-memory-overheads"
+# fi
+
+ # Ruby situation is a bit complicated. See bug 513888
+ local rubyimpl
+ local ruby_interpreter=""
+ for rubyimpl in ${USE_RUBY}; do
+ if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+ fi
+ done
+ # This will rarely occur. Only a couple of corner cases could lead us to
+ # that failure. See bug 513888
+ [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # opengl needs to be explicetly handled, bug #576634
+
+ local use_wpe_renderer=OFF
+ local opengl_enabled
+ if use opengl || use gles2-only; then
+ opengl_enabled=ON
+ use wayland && use_wpe_renderer=ON
+ else
+ opengl_enabled=OFF
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+ -DENABLE_QUARTZ_TARGET=$(usex aqua)
+ -DENABLE_API_TESTS=$(usex test)
+ -DENABLE_GTKDOC=$(usex gtk-doc)
+ -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+ $(cmake-utils_use_find_package gles2-only OpenGLES2)
+ -DENABLE_GLES2=$(usex gles2-only)
+ -DENABLE_VIDEO=$(usex gstreamer)
+ -DENABLE_WEB_AUDIO=$(usex gstreamer)
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DUSE_LIBNOTIFY=$(usex libnotify)
+ -DUSE_LIBSECRET=$(usex gnome-keyring)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_WOFF2=ON
+ -DENABLE_SPELLCHECK=$(usex spell)
+ -DENABLE_WAYLAND_TARGET=$(usex wayland)
+ -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ -DENABLE_X11_TARGET=$(usex X)
+ -DENABLE_OPENGL=${opengl_enabled}
+ -DENABLE_WEBGL=${opengl_enabled}
+ -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+ -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+ -DCMAKE_BUILD_TYPE=Release
+ -DPORT=GTK
+ ${ruby_interpreter}
+ )
+
+ # Allow it to use GOLD when possible as it has all the magic to
+ # detect when to use it and using gold for this concrete package has
+ # multiple advantages and is also the upstream default, bug #585788
+# if tc-ld-is-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
+ 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
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
new file mode 100644
index 0000000..a6644d6
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="amd64 arm64 ~ia64 ~ppc64 ~sparc x86"
+
+IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+ gles2-only? ( egl !opengl )
+ gstreamer? ( opengl? ( egl ) )
+ wayland? ( egl )
+ || ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+ >=gui-libs/libwpe-1.3.0:1.0
+ >=gui-libs/wpebackend-fdo-1.3.1:1.0
+"
+RDEPEND="
+ >=x11-libs/cairo-1.16.0:=[X?]
+ >=media-libs/fontconfig-2.13.0:1.0
+ >=media-libs/freetype-2.9.0:2
+ >=dev-libs/libgcrypt-1.7.0:0=
+ >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+ >=media-libs/harfbuzz-1.4.2:=[icu(+)]
+ >=dev-libs/icu-3.8.1-r1:=
+ virtual/jpeg:0=
+ >=net-libs/libsoup-2.54:2.4[introspection?]
+ >=dev-libs/libxml2-2.8.0:2
+ >=media-libs/libpng-1.4:0=
+ dev-db/sqlite:3=
+ sys-libs/zlib:0
+ >=dev-libs/atk-2.16.0
+ media-libs/libwebp:=
+
+ >=dev-libs/glib-2.44.0:2
+ >=dev-libs/libxslt-1.1.7
+ media-libs/woff2
+ gnome-keyring? ( app-crypt/libsecret )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+ dev-libs/libtasn1:=
+ spell? ( >=app-text/enchant-0.22:= )
+ gstreamer? (
+ >=media-libs/gstreamer-1.14:1.0
+ >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
+ gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+ >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+ >=media-libs/gst-plugins-bad-1.14:1.0 )
+
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXrender
+ x11-libs/libXt )
+
+ libnotify? ( x11-libs/libnotify )
+ dev-libs/hyphen
+ jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+ egl? ( media-libs/mesa[egl] )
+ gles2-only? ( media-libs/mesa[gles2] )
+ opengl? ( virtual/opengl )
+ wayland? (
+ opengl? ( ${wpe_depend} )
+ gles2-only? ( ${wpe_depend} )
+ )
+
+ seccomp? (
+ >=sys-apps/bubblewrap-0.3.1
+ sys-libs/libseccomp
+ sys-apps/xdg-dbus-proxy
+ )
+"
+unset wpe_depend
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ ${RUBY_DEPS}
+ >=app-accessibility/at-spi2-core-2.5.3
+ dev-util/glib-utils
+ >=dev-util/gperf-3.0.1
+ >=sys-devel/bison-2.4.3
+ || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ >=dev-lang/perl-5.10
+ virtual/perl-Data-Dumper
+ virtual/perl-Carp
+ virtual/perl-JSON-PP
+
+ gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+ geolocation? ( dev-util/gdbus-codegen )
+"
+# test? (
+# dev-python/pygobject:3[python_targets_python2_7]
+# x11-themes/hicolor-icon-theme
+# jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+ geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] ; then
+ if 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++17 ; then
+ die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+ fi
+ fi
+
+ if ! use opengl && ! use gles2-only; then
+ ewarn
+ ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
+ ewarn "This is an unsupported configuration meant for very specific embedded"
+ ewarn "use cases, where there truly is no GL possible (and even that use case"
+ ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+ ewarn "really really should be enabling OpenGL!"
+ ewarn
+ fi
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ check-reqs_pkg_setup
+ fi
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+ eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
+ eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
+ if use elibc_musl ; then
+ # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=9c8441ce582f411dbec289ab698e6d0a962f62cc
+ eapply "${FILESDIR}/${PN}-2.26.2-musl.patch"
+ fi
+ cmake-utils_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Respect CC, otherwise fails on prefix #395875
+ tc-export CC
+
+ # 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
+
+ # We try to use gold when possible for this package
+# if ! tc-ld-is-gold ; then
+# append-ldflags "-Wl,--reduce-memory-overheads"
+# fi
+
+ # Ruby situation is a bit complicated. See bug 513888
+ local rubyimpl
+ local ruby_interpreter=""
+ for rubyimpl in ${USE_RUBY}; do
+ if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+ fi
+ done
+ # This will rarely occur. Only a couple of corner cases could lead us to
+ # that failure. See bug 513888
+ [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # opengl needs to be explicetly handled, bug #576634
+
+ local use_wpe_renderer=OFF
+ local opengl_enabled
+ if use opengl || use gles2-only; then
+ opengl_enabled=ON
+ use wayland && use_wpe_renderer=ON
+ else
+ opengl_enabled=OFF
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+ -DENABLE_QUARTZ_TARGET=$(usex aqua)
+ -DENABLE_API_TESTS=$(usex test)
+ -DENABLE_GTKDOC=$(usex gtk-doc)
+ -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+ $(cmake-utils_use_find_package gles2-only OpenGLES2)
+ -DENABLE_GLES2=$(usex gles2-only)
+ -DENABLE_VIDEO=$(usex gstreamer)
+ -DENABLE_WEB_AUDIO=$(usex gstreamer)
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DUSE_LIBNOTIFY=$(usex libnotify)
+ -DUSE_LIBSECRET=$(usex gnome-keyring)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_WOFF2=ON
+ -DENABLE_SPELLCHECK=$(usex spell)
+ -DENABLE_WAYLAND_TARGET=$(usex wayland)
+ -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ -DENABLE_X11_TARGET=$(usex X)
+ -DENABLE_OPENGL=${opengl_enabled}
+ -DENABLE_WEBGL=${opengl_enabled}
+ -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+ -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+ -DCMAKE_BUILD_TYPE=Release
+ -DPORT=GTK
+ ${ruby_interpreter}
+ )
+
+ # Allow it to use GOLD when possible as it has all the magic to
+ # detect when to use it and using gold for this concrete package has
+ # multiple advantages and is also the upstream default, bug #585788
+# if tc-ld-is-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
+ 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
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2019-10-21 21:50 Jory Pratt
0 siblings, 0 replies; 16+ messages in thread
From: Jory Pratt @ 2019-10-21 21:50 UTC (permalink / raw
To: gentoo-commits
commit: 743e57d790ffd19d05fc8cc6d72516748e0aa2eb
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Mon Oct 21 17:51:41 2019 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 21:50:09 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=743e57d7
net-libs/webkit-gtk: drop old and sync keywords with tree
Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com>
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
net-libs/webkit-gtk/Manifest | 1 -
.../webkit-gtk/files/webkit-gtk-2.22.2-musl.patch | 145 -----------
net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild | 283 ---------------------
net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 2 +-
4 files changed, 1 insertion(+), 430 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 38c6c23..99e6386 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.24.3.tar.xz 17912032 BLAKE2B 9ac897f10ef25a25b70b73499fb79b72d469c0016231b94fb3376dc8876fd9ac2874bac38450ddf67c80dba8a66fa509c8cd42bc4ce5316d6e4a17fa1346803c SHA512 b358bb11f7df477e5b3d6a12e2e6b41cb4e6a7274e34ce6299bf0c56044ffc7db5a834e9abf5c71d992ef41d194d30171b8be406420ffc54fe766cc811afb79f
DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.22.2-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.22.2-musl.patch
deleted file mode 100644
index b5fd0bb..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.22.2-musl.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
-index 836d755..4a0518a 100644
---- a/Source/JavaScriptCore/runtime/MachineContext.h
-+++ b/Source/JavaScriptCore/runtime/MachineContext.h
-@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
-
- #if CPU(X86)
- return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
-@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
-
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-diff --git a/Source/JavaScriptCore/runtime/Options.h b/Source/JavaScriptCore/runtime/Options.h
-index 27396d2..23a7b9e 100644
---- a/Source/JavaScriptCore/runtime/Options.h
-+++ b/Source/JavaScriptCore/runtime/Options.h
-@@ -144,9 +144,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
- \
- v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
- \
-- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \
-- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
-- v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
-+ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \
-+ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
-+ v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
- \
- v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
- v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
-diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
-index c0f8b9c..1074cce 100644
---- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
-+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
-@@ -836,7 +836,7 @@ int yydebug;
- #if YYERROR_VERBOSE
-
- # ifndef yystrlen
--# if defined __GLIBC__ && defined _STRING_H
-+# if defined __linux__ && defined _STRING_H
- # define yystrlen strlen
- # else
- /* Return the length of YYSTR. */
-@@ -852,7 +852,7 @@ yystrlen (const char *yystr)
- # endif
-
- # ifndef yystpcpy
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
- # define yystpcpy stpcpy
- # else
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-diff --git a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
-index 14cd536..6084d64 100644
---- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
-+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
-@@ -1975,7 +1975,7 @@ int yydebug;
- #if YYERROR_VERBOSE
-
- # ifndef yystrlen
--# if defined __GLIBC__ && defined _STRING_H
-+# if defined __linux__ && defined _STRING_H
- # define yystrlen strlen
- # else
- /* Return the length of YYSTR. */
-@@ -1991,7 +1991,7 @@ yystrlen (const char *yystr)
- # endif
-
- # ifndef yystpcpy
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
- # define yystpcpy stpcpy
- # else
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index 67cfa93..341a9f5 100644
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -697,7 +697,7 @@
- #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
- #endif
-
--#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
-+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
- #define HAVE_MACHINE_CONTEXT 1
- #endif
-
-diff --git a/Source/WebCore/xml/XPathGrammar.cpp b/Source/WebCore/xml/XPathGrammar.cpp
-index 31df1c0..bc569c1 100644
---- a/Source/WebCore/xml/XPathGrammar.cpp
-+++ b/Source/WebCore/xml/XPathGrammar.cpp
-@@ -966,7 +966,7 @@ int yydebug;
- #if YYERROR_VERBOSE
-
- # ifndef yystrlen
--# if defined __GLIBC__ && defined _STRING_H
-+# if defined __linux__ && defined _STRING_H
- # define yystrlen strlen
- # else
- /* Return the length of YYSTR. */
-@@ -989,7 +989,7 @@ yystrlen (yystr)
- # endif
-
- # ifndef yystpcpy
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
- # define yystpcpy stpcpy
- # else
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
deleted file mode 100644
index 796c0c9..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
- geolocation? ( introspection )
- gles2? ( egl !opengl )
- gstreamer? ( opengl? ( egl ) )
- nsplugin? ( X )
- webgl? ( gstreamer
- || ( gles2 opengl ) )
- wayland? ( egl )
- || ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
- >=x11-libs/cairo-1.16.0:=[X?]
- >=media-libs/fontconfig-2.13.0:1.0
- >=media-libs/freetype-2.9.0:2
- >=dev-libs/libgcrypt-1.7.0:0=
- >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
- >=media-libs/harfbuzz-1.4.2:=[icu(+)]
- >=dev-libs/icu-3.8.1-r1:=
- virtual/jpeg:0=
- >=net-libs/libsoup-2.48:2.4[introspection?]
- >=dev-libs/libxml2-2.8.0:2
- >=media-libs/libpng-1.4:0=
- dev-db/sqlite:3=
- sys-libs/zlib:0
- >=dev-libs/atk-2.8.0
- media-libs/libwebp:=
-
- >=dev-libs/glib-2.40:2
- >=dev-libs/libxslt-1.1.7
- media-libs/woff2
- gnome-keyring? ( app-crypt/libsecret )
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
- dev-libs/libtasn1:=
- nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
- spell? ( >=app-text/enchant-0.22:= )
- gstreamer? (
- >=media-libs/gstreamer-1.14:1.0
- >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
- >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
- >=media-libs/gst-plugins-bad-1.14:1.0 )
-
- X? (
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXrender
- x11-libs/libXt )
-
- libnotify? ( x11-libs/libnotify )
- dev-libs/hyphen
- jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
- egl? ( media-libs/mesa[egl] )
- gles2? ( media-libs/mesa[gles2] )
- opengl? ( virtual/opengl )
- webgl? (
- x11-libs/libXcomposite
- x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- ${RUBY_DEPS}
- >=app-accessibility/at-spi2-core-2.5.3
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/gperf-3.0.1
- >=sys-devel/bison-2.4.3
- || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
- sys-devel/gettext
- virtual/pkgconfig
-
- >=dev-lang/perl-5.10
- virtual/perl-Data-Dumper
- virtual/perl-Carp
- virtual/perl-JSON-PP
-
- doc? ( >=dev-util/gtk-doc-1.10 )
- geolocation? ( dev-util/gdbus-codegen )
-"
-# test? (
-# 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" ]] ; then
- if 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.9.x or Clang >= 3.3 for C++11-specific compiler flags"
- fi
-
- if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
- die 'The active compiler needs to be gcc 4.9 (or newer)'
- fi
- fi
-
- if ! use opengl && ! use gles2; then
- ewarn
- ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
- ewarn "This is an unsupported configuration meant for very specific embedded"
- ewarn "use cases, where there truly is no GL possible (and even that use case"
- ewarn "is very unlikely to come by). If you have GL (even software-only), you"
- ewarn "really really should be enabling OpenGL!"
- ewarn
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- check-reqs_pkg_setup
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Taken from https://git.alpinelinux.org/aports/commit/community/webkit2gtk/musl-fixes.patch?id=609fbb0235cf6440f5d502885c4e0531c835aed7
- eapply "${FILESDIR}"/${PN}-2.22.2-musl.patch
- cmake-utils_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # Respect CC, otherwise fails on prefix #395875
- tc-export CC
-
- # 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
-
- # We try to use gold when possible for this package
-# if ! tc-ld-is-gold ; then
-# append-ldflags "-Wl,--reduce-memory-overheads"
-# fi
-
- # Multiple rendering bugs on youtube, github, etc without this, bug #547224
- append-flags $(test-flags -fno-strict-aliasing)
-
- # Ruby situation is a bit complicated. See bug 513888
- local rubyimpl
- local ruby_interpreter=""
- for rubyimpl in ${USE_RUBY}; do
- if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
- fi
- done
- # This will rarely occur. Only a couple of corner cases could lead us to
- # that failure. See bug 513888
- [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
- #
- # FTL_JIT requires llvm
- #
- # opengl needs to be explicetly handled, bug #576634
-
- local opengl_enabled
- if use opengl || use gles2; then
- opengl_enabled=ON
- else
- opengl_enabled=OFF
- fi
-
- local mycmakeargs=(
- #-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
- -DENABLE_QUARTZ_TARGET=$(usex aqua)
- -DENABLE_API_TESTS=$(usex test)
- -DENABLE_GTKDOC=$(usex doc)
- -DENABLE_GEOLOCATION=$(usex geolocation)
- $(cmake-utils_use_find_package gles2 OpenGLES2)
- -DENABLE_GLES2=$(usex gles2)
- -DENABLE_VIDEO=$(usex gstreamer)
- -DENABLE_WEB_AUDIO=$(usex gstreamer)
- -DENABLE_INTROSPECTION=$(usex introspection)
- -DUSE_LIBNOTIFY=$(usex libnotify)
- -DUSE_LIBSECRET=$(usex gnome-keyring)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_WOFF2=ON
- -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
- -DENABLE_SPELLCHECK=$(usex spell)
- -DENABLE_WAYLAND_TARGET=$(usex wayland)
- -DENABLE_WEBGL=$(usex webgl)
- $(cmake-utils_use_find_package egl EGL)
- $(cmake-utils_use_find_package opengl OpenGL)
- -DENABLE_X11_TARGET=$(usex X)
- -DENABLE_OPENGL=${opengl_enabled}
- -DCMAKE_BUILD_TYPE=Release
- -DPORT=GTK
- ${ruby_interpreter}
- )
-
- # Allow it to use GOLD when possible as it has all the magic to
- # detect when to use it and using gold for this concrete package has
- # multiple advantages and is also the upstream default, bug #585788
-# if tc-ld-is-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
- 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
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
- use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index 4edd6ac..72ed98d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86"
IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2019-09-02 15:01 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2019-09-02 15:01 UTC (permalink / raw
To: gentoo-commits
commit: 281eae9da6f8b01d55b4d37d90b844836034add0
Author: Spotlight <spotlight <AT> joscomputing <DOT> space>
AuthorDate: Sat Aug 31 05:45:42 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep 2 14:53:56 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=281eae9d
net-libs/webkit-gtk: sync with tree/update patches
Patches taken from Alpine's port tree.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-libs/webkit-gtk/Manifest | 4 +-
.../webkit-gtk/files/webkit-gtk-2.22.4-musl.patch | 137 +++++++++++++++++++++
...-gtk-2.24.1.ebuild => webkit-gtk-2.24.3.ebuild} | 7 +-
...-gtk-2.24.2.ebuild => webkit-gtk-2.24.4.ebuild} | 9 +-
4 files changed, 146 insertions(+), 11 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4254443..38c6c23 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,2 @@
-DIST webkitgtk-2.24.1.tar.xz 17897488 BLAKE2B 62cd6d896d4b4847430f0d41de92595e955db283626dad2aa560071da12ccd0c24093163e15cc50c30ceb96f9767797f9051657ec68f822e7e371c8566872ad5 SHA512 65424f03b6baca53d64f0d633f53e2f7788c7fb65aa8b50b696418c140707c40351ec3cc0a8652806d75b9da98a04a8bb4203dd6ee4c51a3f93878964354c1ca
-DIST webkitgtk-2.24.2.tar.xz 17908808 BLAKE2B bf53f27a5fa15067fb91cbfcff3c2287418c797a4ad03d3a71fbdb194c27e069ab5985b9c8e8df008ed80c80fe2a397d71297b4c187fd7c3acbfe2961d332c50 SHA512 8376167cfc4530886a2ac644ab84ff1021a63f6236d7be9eeb9e0ecade8bad5384b652dfe3720fdd31cddb39df6c935f859f1c0a59f42d7c71998992c4a9ffaa
+DIST webkitgtk-2.24.3.tar.xz 17912032 BLAKE2B 9ac897f10ef25a25b70b73499fb79b72d469c0016231b94fb3376dc8876fd9ac2874bac38450ddf67c80dba8a66fa509c8cd42bc4ce5316d6e4a17fa1346803c SHA512 b358bb11f7df477e5b3d6a12e2e6b41cb4e6a7274e34ce6299bf0c56044ffc7db5a834e9abf5c71d992ef41d194d30171b8be406420ffc54fe766cc811afb79f
+DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.22.4-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.22.4-musl.patch
new file mode 100644
index 0000000..c829f19
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.22.4-musl.patch
@@ -0,0 +1,137 @@
+--- a/Source/JavaScriptCore/runtime/MachineContext.h
++++ b/Source/JavaScriptCore/runtime/MachineContext.h
+@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ #if CPU(X86)
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
+@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || defined(__linux__)
+
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+
+--- a/Source/JavaScriptCore/runtime/Options.h
++++ b/Source/JavaScriptCore/runtime/Options.h
+@@ -138,9 +138,9 @@ constexpr bool enableWebAssemblyStreamingApi = false;
+ \
+ v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
+ \
+- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \
+- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
+- v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
++ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \
++ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
++ v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
+ \
+ v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
+ v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
+
+--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
++++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
+@@ -836,7 +836,7 @@ int yydebug;
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -852,7 +852,7 @@ yystrlen (const char *yystr)
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+
+--- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
++++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
+@@ -1975,7 +1975,7 @@ int yydebug;
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -1991,7 +1991,7 @@ yystrlen (const char *yystr)
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -710,7 +710,7 @@
+ #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
+ #endif
+
+-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+ #define HAVE_MACHINE_CONTEXT 1
+ #endif
+
+--- a/Source/WebCore/xml/XPathGrammar.cpp
++++ b/Source/WebCore/xml/XPathGrammar.cpp
+@@ -966,7 +966,7 @@ int yydebug;
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -989,7 +989,7 @@ yystrlen (yystr)
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
similarity index 96%
rename from net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
index 7075a96..f731da0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
@@ -15,9 +15,9 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
# webgl needs gstreamer, bug #560612
# gstreamer with opengl/gles2 needs egl
@@ -159,8 +159,7 @@ pkg_setup() {
}
src_prepare() {
- # musl and jit
- # patch taken from: https://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch
+ # Taken from https://git.alpinelinux.org/aports/commit/community/webkit2gtk/musl-fixes.patch?id=609fbb0235cf6440f5d502885c4e0531c835aed7
eapply "${FILESDIR}"/${PN}-2.22.2-musl.patch
cmake-utils_src_prepare
gnome2_src_prepare
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
similarity index 96%
rename from net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index 7075a96..4edd6ac 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -15,9 +15,9 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
# webgl needs gstreamer, bug #560612
# gstreamer with opengl/gles2 needs egl
@@ -159,9 +159,8 @@ pkg_setup() {
}
src_prepare() {
- # musl and jit
- # patch taken from: https://git.alpinelinux.org/cgit/aports/tree/community/webkit2gtk/musl-fixes.patch
- eapply "${FILESDIR}"/${PN}-2.22.2-musl.patch
+ # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=ae4a15801816b7f140076fa8f636d46247902af3
+ eapply "${FILESDIR}"/${PN}-2.22.4-musl.patch
cmake-utils_src_prepare
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2018-06-17 9:43 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2018-06-17 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 60ffd1511ee20bbbbc692bf2402e5e0ac4159557
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sun Jun 17 09:01:46 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 09:37:31 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=60ffd151
net-libs/webkit-gtk: cleanup
net-libs/webkit-gtk/Manifest | 1 -
.../files/2.16.1-avoid-perl-ithreads.patch | 88 -------
.../files/webkit-gtk-1.11.90-gtk-docize-fix.patch | 10 -
.../files/webkit-gtk-1.6.1-darwin-quartz.patch | 67 -----
.../files/webkit-gtk-2.2.5-hppa-platform.patch | 20 --
.../files/webkit-gtk-2.2.5-ia64-platform.patch | 12 -
.../files/webkit-gtk-2.4.1-ia64-malloc.patch | 20 --
.../files/webkit-gtk-2.4.11-video-web-audio.patch | 11 -
.../files/webkit-gtk-2.4.4-atomic-ppc.patch | 32 ---
.../files/webkit-gtk-2.4.4-jpeg-9a.patch | 30 ---
.../files/webkit-gtk-2.4.7-disable-webgl.patch | 11 -
.../webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch | 29 ---
...-2.4.9-remove-disallow_ctypes_h-braindead.patch | 19 --
.../files/webkit-gtk-2.4.9-remove-execinfo_h.patch | 37 ---
net-libs/webkit-gtk/metadata.xml | 1 -
net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 8 +-
net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild | 279 ---------------------
net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 266 --------------------
18 files changed, 3 insertions(+), 938 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8c34d62..06548c5 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
-DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb
diff --git a/net-libs/webkit-gtk/files/2.16.1-avoid-perl-ithreads.patch b/net-libs/webkit-gtk/files/2.16.1-avoid-perl-ithreads.patch
deleted file mode 100644
index 506696f..0000000
--- a/net-libs/webkit-gtk/files/2.16.1-avoid-perl-ithreads.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 1ac17bea2273df0dfec21897b00efb8351648e1b Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sun, 9 Apr 2017 04:10:52 +1200
-Subject: Remove need for threaded perl at expense of being single-threaded
-
-This could theoretically be implemented with forks, but I opted not
-to because its too hard, and the platform specifics are too messy.
-
-This could theoretically also have support for automatic detection
-as to which strategy to use based on OS/availability, but the
-implementation details of that are too much for my pateience today.
-
-In an ideal world, this file would support:
-
-1. Single threaded builds for spartans
-2. Forked builds for people who are on linux but don't want to rebuild
- their perl just to have threads ( which produce negligible benefit
- and measurable performance penalties to all code )
-3. Threaded builds for people who are on windows where forks may not
- be entirely sane.
-
-But #1 is good enough atm.
-
-This is important for Gentoo, because end users decide on their own
-choices with regards to threading support for perl, and threading
-support is off by default due to the performance issues mentioned in #2
-in conjunction with the fact that "threads" is officially discouraged
-by Perl Upstream.
-
-And as Gentoo users have to have a system Perl to compile WebkitGTK,
-this means installing WebkitGTK requires rebuilding their system Perl
-with threads.
-
-And this *also* means that all packages presently compiled against Perl
-become broken, because non-threaded perl and threaded perl are not ABI
-compatible with each other, and this can scale into hundreds of
-packages and significant transient breakage.
-
-This ends up in practice being *far* *worse* in terms of time wasted
-than the mediocre time inefficiency created by needing a single
-threaded build.
----
- Source/WebCore/bindings/scripts/generate-bindings-all.pl | 15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/Source/WebCore/bindings/scripts/generate-bindings-all.pl b/Source/WebCore/bindings/scripts/generate-bindings-all.pl
-index 37b27cc74..b3a378df0 100755
---- a/Source/WebCore/bindings/scripts/generate-bindings-all.pl
-+++ b/Source/WebCore/bindings/scripts/generate-bindings-all.pl
-@@ -32,9 +32,6 @@ use File::Basename;
- use File::Spec;
- use File::Find;
- use Getopt::Long;
--use threads;
--use threads::shared;
--use Thread::Queue;
-
- my $perl = $^X;
- my $scriptDir = $FindBin::Bin;
-@@ -121,13 +118,11 @@ my @idlFilesToUpdate = grep &{sub {
- implicitDependencies($depFile));
- needsUpdate(\@output, \@deps);
- }}, @idlFiles;
--my $queue = Thread::Queue->new(@idlFilesToUpdate);
--my $abort :shared = 0;
--my $totalCount = @idlFilesToUpdate;
--my $currentCount :shared = 0;
-
--my @threadPool = map { threads->create(\&worker) } (1 .. $numOfJobs);
--$_->join for @threadPool;
-+my $abort = 0;
-+my $totalCount = @idlFilesToUpdate;
-+my $currentCount = 0;
-+worker();
- exit $abort;
-
- sub needsUpdate
-@@ -158,7 +153,7 @@ sub mtime
- }
-
- sub worker {
-- while (my $file = $queue->dequeue_nb()) {
-+ while (my $file = shift @idlFilesToUpdate) {
- last if $abort;
- eval {
- $currentCount++;
---
-2.12.2
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 c94f545..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac.old 2013-03-02 09:22:53.791750644 +0200
-+++ b/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-2.2.5-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
deleted file mode 100644
index 8aee778..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: webkitgtk/Source/WTF/wtf/Platform.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -72,6 +72,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
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
deleted file mode 100644
index a63e9e8..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Source/WTF/wtf/Platform.h 2014-02-25 00:33:16.561606810 +0100
-+++ b/Source/WTF/wtf/Platform.h 2014-02-25 00:49:52.895512955 +0100
-@@ -79,6 +79,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 */
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch
deleted file mode 100644
index 8c387ff..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix wide pointer issues on ia64 (closes: #642750).
-Author: Stephan Schreiber <info@fs-driver.org>
-Index: webkitgtk/Source/WTF/wtf/Platform.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -705,6 +705,13 @@
- #define ENABLE_JIT 1
- #endif
-
-+/* 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 Win64. */
- #if !defined(ENABLE_JIT) \
- && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch
deleted file mode 100644
index ead696c..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -purN a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
---- a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-03-14 08:09:01.000000000 +0100
-+++ b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-04-10 19:43:00.215345381 +0200
-@@ -40,6 +40,7 @@
- #include "PaintInfo.h"
- #include "PlatformContextCairo.h"
- #include "RenderElement.h"
-+#include "RenderBox.h"
- #include "TextDirection.h"
- #include "UserAgentStyleSheets.h"
- #include "WidgetRenderingContext.h"
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
deleted file mode 100644
index c160376..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-$OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $
-https://bugs.webkit.org/show_bug.cgi?id=130837
---- a/Source/WebKit2/Platform/IPC/Connection.h.orig Fri Jul 4 11:06:55 2014
-+++ b/Source/WebKit2/Platform/IPC/Connection.h Mon Jul 14 19:31:35 2014
-@@ -216,7 +216,11 @@ class Connection : public ThreadSafeRefCounted<Connect
-
- Client* m_client;
- bool m_isServer;
-+#if CPU(PPC)
-+ uint64_t m_syncRequestID;
-+#else
- std::atomic<uint64_t> m_syncRequestID;
-+#endif
-
- bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage;
- bool m_shouldExitOnSyncMessageSendFailure;
-$OpenBSD: patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp,v 1.3 2014/03/27 22:03:48 landry Exp $
-https://bugs.webkit.org/show_bug.cgi?id=130837
---- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig Thu Mar 27 21:13:49 2014
-+++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp Thu Mar 27 21:14:23 2014
-@@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest()
-
- uint64_t StatisticsRequest::addOutstandingRequest()
- {
-+#if CPU(PPC)
-+ static int64_t uniqueRequestID;
-+#else
- static std::atomic<int64_t> uniqueRequestID;
-+#endif
-
- uint64_t requestID = ++uniqueRequestID;
- m_outstandingRequests.add(requestID);
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
deleted file mode 100644
index cded605..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.gentoo.org/481688
-http://trac.webkit.org/changeset/166490/trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-
---- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-+++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-@@ -334,5 +334,5 @@
- case JPEG_HEADER:
- // Read file parameters with jpeg_read_header().
-- if (jpeg_read_header(&m_info, true) == JPEG_SUSPENDED)
-+ if (jpeg_read_header(&m_info, TRUE) == JPEG_SUSPENDED)
- return false; // I/O suspension.
-
-@@ -420,7 +420,7 @@
- m_info.dct_method = dctMethod();
- m_info.dither_mode = ditherMode();
-- m_info.do_fancy_upsampling = doFancyUpsampling();
-- m_info.enable_2pass_quant = false;
-- m_info.do_block_smoothing = true;
-+ m_info.do_fancy_upsampling = doFancyUpsampling() ? TRUE : FALSE;
-+ m_info.enable_2pass_quant = FALSE;
-+ m_info.do_block_smoothing = TRUE;
-
- // Start decompressor.
-@@ -573,5 +573,5 @@
- // called, then we have hit the end of the buffer. A return value of false
- // indicates that we have no data to supply yet.
-- return false;
-+ return FALSE;
- }
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch
deleted file mode 100644
index 67760e2..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp 2014-09-26 11:40:44.000000000 +0400
-+++ webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp 2014-10-13 15:38:38.496444600 +0400
-@@ -17,7 +17,7 @@
- */
-
- #include "config.h"
--#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS)
-+#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS) || USE(EGL) || USE(GLX)
-
- #define DISABLE_SHIMS
- #include "OpenGLShims.h"
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch
deleted file mode 100644
index bd8507c..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fedora patch fixes build failure for gcc-6 (abs/fabs ambifuity)
-https://bugs.webkit.org/show_bug.cgi?id=159124#c1
-https://bugs.gentoo.org/show_bug.cgi?id=592048
-diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp
---- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2015-05-20 03:03:24.000000000 -0600
-+++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-02-07 11:30:42.392686308 -0700
-@@ -85,8 +85,8 @@
- guint32 eventTime = getEventTime(event);
-
- if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
-- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
-- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
-+ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
-+ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
- && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime))
- && (buttonEvent->button == m_previousClickButton)))
- m_currentClickCount++;
-diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
---- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600
-+++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700
-@@ -659,7 +659,7 @@
- if (!std::isfinite(time))
- return String::fromUTF8(_("indefinite time"));
-
-- int seconds = static_cast<int>(abs(time));
-+ int seconds = static_cast<int>(fabs(time));
- int days = seconds / (60 * 60 * 24);
- int hours = seconds / (60 * 60);
- int minutes = (seconds / 60) % 60;
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch
deleted file mode 100644
index 61aae3d..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur webkitgtk-2.4.9.orig/Source/WTF/wtf/DisallowCType.h webkitgtk-2.4.9/Source/WTF/wtf/DisallowCType.h
---- webkitgtk-2.4.9.orig/Source/WTF/wtf/DisallowCType.h 2015-05-20 05:03:24.000000000 -0400
-+++ webkitgtk-2.4.9/Source/WTF/wtf/DisallowCType.h 2015-07-19 14:44:26.855225521 -0400
-@@ -29,6 +29,8 @@
- #ifndef WTF_DisallowCType_h
- #define WTF_DisallowCType_h
-
-+#if 0 // BRAIN DEAD - The detection here makes some bad assumptions.
-+
- // The behavior of many of the functions in the <ctype.h> header is dependent
- // on the current locale. But almost all uses of these functions are for
- // locale-independent, ASCII-specific purposes. In WebKit code we use our own
-@@ -81,4 +83,6 @@
-
- #endif
-
-+#endif // BRAIN DEAD
-+
- #endif
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-execinfo_h.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-execinfo_h.patch
deleted file mode 100644
index d7be9dd..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-execinfo_h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur webkitgtk-2.4.9.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.4.9/Source/WTF/wtf/Assertions.cpp
---- webkitgtk-2.4.9.orig/Source/WTF/wtf/Assertions.cpp 2015-05-20 05:03:24.000000000 -0400
-+++ webkitgtk-2.4.9/Source/WTF/wtf/Assertions.cpp 2015-07-19 14:41:58.665232623 -0400
-@@ -66,7 +66,8 @@
- #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
- #include <cxxabi.h>
- #include <dlfcn.h>
--#include <execinfo.h>
-+// removed for musl - we need better intelligence here
-+//#include <execinfo.h>
- #endif
-
- extern "C" {
-@@ -234,7 +235,8 @@
- void WTFGetBacktrace(void** stack, int* size)
- {
- #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
-- *size = backtrace(stack, *size);
-+// removed for musl - we need better intelligence here
-+// *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
- // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
-@@ -280,9 +282,10 @@
- void WTFPrintBacktrace(void** stack, int size)
- {
- #if USE(BACKTRACE_SYMBOLS)
-- char** symbols = backtrace_symbols(stack, size);
-- if (!symbols)
-- return;
-+// removed for musl - we need better intelligence here
-+// char** symbols = backtrace_symbols(stack, size);
-+// if (!symbols)
-+// return;
- #endif
-
- for (int i = 0; i < size; ++i) {
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 9a96619..0d69dc7 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -8,7 +8,6 @@
<use>
<flag name="coverage">Enable code coverage support</flag>
<flag name="egl">Enable EGL support</flag>
- <flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
<flag name="gles2">Enable GLESv2 support</flag>
<flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index 127c2ba..a284a86 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -4,14 +4,14 @@
EAPI=6
CMAKE_MAKEFILE_GENERATOR="ninja"
PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25"
inherit check-reqs cmake-utils 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"
+HOMEPAGE="https://www.webkitgtk.org/"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
@@ -200,8 +200,6 @@ src_configure() {
ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
- elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
else
ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
fi
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
deleted file mode 100644
index 0590a68..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit autotools check-reqs 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="amd64 ~arm ~ppc x86"
-
-IUSE="aqua coverage debug +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
- geolocation? ( 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
-# gtk3-3.20 is needed to ensure we get fixed theming:
-# https://bugzilla.gnome.org/show_bug.cgi?id=757503
-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.20.0:3[X?,aqua?,introspection?]
- >=x11-libs/pango-1.30.0
-
- >=x11-libs/gtk+-2.24.10:2
-
- egl? ( media-libs/mesa[egl] )
- geolocation? ( >=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
-
- geolocation? ( 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 && eapply "${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
- eapply "${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
- eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
- # https://bugs.webkit.org/show_bug.cgi?id=129542
- eapply "${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
- eapply "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
-
- # Fix build with recent libjpeg, bug #481688
- # https://bugs.webkit.org/show_bug.cgi?id=122412
- eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
-
- # Fix building with --disable-webgl, bug #500966
- # https://bugs.webkit.org/show_bug.cgi?id=131267
- eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
-
- # https://bugs.webkit.org/show_bug.cgi?id=156510
- eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
-
- # https://bugs.webkit.org/show_bug.cgi?id=159124#c1
- eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
-
- # musl patches
- eapply "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
- eapply "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.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 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_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*
-
- # Tests need virtualx, bug #294691, bug #310695
- # Parallel tests sometimes fail
- virtx emake -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.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
deleted file mode 100644
index 8a0e5e0..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit autotools check-reqs 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="amd64 ~arm ~mips ~ppc x86"
-
-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 && eapply "${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
- eapply "${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
- eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
- # https://bugs.webkit.org/show_bug.cgi?id=129542
- eapply "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
- # Fix build with recent libjpeg, bug #481688
- # https://bugs.webkit.org/show_bug.cgi?id=122412
- eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
-
- # Fix building with --disable-webgl, bug #500966
- # https://bugs.webkit.org/show_bug.cgi?id=131267
- eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
-
- # https://bugs.webkit.org/show_bug.cgi?id=156510
- eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
-
- # https://bugs.webkit.org/show_bug.cgi?id=159124#c1
- eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
-
- # musl patches
- eapply "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
- eapply "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.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_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*
-
- # Tests need virtualx, bug #294691, bug #310695
- # Parallel tests sometimes fail
- virtx emake -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
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2017-11-22 4:57 Aric Belsito
0 siblings, 0 replies; 16+ messages in thread
From: Aric Belsito @ 2017-11-22 4:57 UTC (permalink / raw
To: gentoo-commits
commit: 8e95feeba1c88436eb5b3403c849351a4f17ae7d
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Nov 22 04:57:26 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Nov 22 04:57:26 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8e95feeb
net-libs/webkit-gtk: version bump to 2.18.3
net-libs/webkit-gtk/Manifest | 3 +-
.../webkit-gtk/files/webkit-gtk-2.14.3-musl.patch | 82 ------
net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild | 291 ---------------------
...-gtk-2.18.1.ebuild => webkit-gtk-2.18.3.ebuild} | 0
4 files changed, 1 insertion(+), 375 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 00ca6f0..dc75e12 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,3 @@
-DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 SHA512 bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b WHIRLPOOL b3053979c1837d97ba525e078d4a14c64a66c61cb0117041af02c8fd250b2062fda66e782134d6bf44f3f80a04917a9b2ac61aa4e800f0011e5243d7eb8583f4
-DIST webkitgtk-2.18.1.tar.xz 14823708 SHA256 9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 SHA512 671392f46a34def51df34e5ce384acdcf7526b286e64f1220921f6c654a28148553e815f6f0fd02252b642dcabef9c646f5386b9ec3d2cb01520782833bb650b WHIRLPOOL e16e1e295d99d6589787fb51e2e3c5867877206428294b824307a5e7af43bdebeda3050a397fffee154c1a624fd21d59e25387fba58c91ce5ab30613773db056
DIST webkitgtk-2.18.2.tar.xz 14823612 SHA256 b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7 SHA512 94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c WHIRLPOOL a1ccd765d6699f07ecad8b4c899398bb2152076eda4f3a86af61d67c741229cf3d0ef02a7c8fbca2fb494e1bb1822518a18aa4f88026e91ebd2d4835d6807545
+DIST webkitgtk-2.18.3.tar.xz 14824668 SHA256 e15420e1616a6f70f321541d467af5ca285bff66b1e0fa68a01df3ccf1b18f9e SHA512 8ba68d7234205728ed4b92358304cf0d0b771647d9b4316085241adeacafe67dee685225b0b46752087b93416ce8d2053a5a7c2376fda1eee7bc6d9024ae787e WHIRLPOOL 1151c09119bfbb213bb3cd291f3ddcc49e3c9f77396bc960e381754e564d72ea21e70641f3cd57f42b2dcb77c05fd92e158b02b0ae94fade22129d8ae114524a
DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch
deleted file mode 100644
index f5b40f9..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp webkitgtk-2.14.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
---- webkitgtk-2.14.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-01-21 14:57:58.821113862 -0800
-+++ webkitgtk-2.14.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-01-21 14:59:46.889444106 -0800
-@@ -549,7 +549,7 @@
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__) && ENABLE(JIT)
-+#elif OS(LINUX) && ENABLE(JIT)
-
- #if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
-@@ -648,9 +648,8 @@
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__)
-+#elif OS(LINUX)
-
--// The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EBP]);
- #elif CPU(X86_64)
-@@ -730,9 +729,8 @@
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__)
-+#elif OS(LINUX)
-
--// The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EIP]);
- #elif CPU(X86_64)
-@@ -821,9 +819,8 @@
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__)
-+#elif OS(LINUX)
-
--// The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESI]);
- #elif CPU(X86_64)
-diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp webkitgtk-2.14.3/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
---- webkitgtk-2.14.3.orig/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2017-01-21 14:57:58.933115241 -0800
-+++ webkitgtk-2.14.3/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2017-01-21 15:00:42.712131243 -0800
-@@ -49,7 +49,7 @@
- #include "ScriptCallStackFactory.h"
- #include <wtf/Stopwatch.h>
-
--#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
-+#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK) && defined(__GLIBC__) && !defined(__UCLIBC__))
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -187,7 +187,7 @@
-
- void JSGlobalObjectInspectorController::appendAPIBacktrace(ScriptCallStack* callStack)
- {
--#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
-+#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK) && defined(__GLIBC__) && !defined(__UCLIBC__))
- static const int framesToShow = 31;
- static const int framesToSkip = 3; // WTFGetBacktrace, appendAPIBacktrace, reportAPIException.
-
-diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/runtime/Options.h webkitgtk-2.14.3/Source/JavaScriptCore/runtime/Options.h
---- webkitgtk-2.14.3.orig/Source/JavaScriptCore/runtime/Options.h 2017-01-21 14:57:59.074116976 -0800
-+++ webkitgtk-2.14.3/Source/JavaScriptCore/runtime/Options.h 2017-01-21 15:01:36.813797195 -0800
-@@ -112,9 +112,9 @@
- \
- v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
- \
-- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \
-- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
-- v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
-+ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \
-+ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
-+ v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
- \
- v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
- v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
deleted file mode 100644
index 2b3f210..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils 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="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
- geolocation? ( introspection )
- gles2? ( egl )
- introspection? ( gstreamer )
- nsplugin? ( X )
- webgl? ( ^^ ( gles2 opengl ) )
- !webgl? ( ?? ( gles2 opengl ) )
- webgl? ( gstreamer )
- wayland? ( egl )
- || ( aqua 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
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-RDEPEND="
- dev-db/sqlite:3=
- >=dev-libs/glib-2.36:2
- dev-libs/hyphen
- >=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-1.3.3:=[icu(+)]
- >=media-libs/libpng-1.4:0=
- media-libs/libwebp:=
- dev-libs/libgcrypt:0=
- >=net-libs/libsoup-2.42:2.4[introspection?]
- >=x11-libs/cairo-1.10.2:=
- >=x11-libs/gtk+-3.22:3[introspection?]
- >=x11-libs/pango-1.30.0
- virtual/jpeg:0=
-
- aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
- egl? ( media-libs/mesa[egl] )
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
- gles2? ( media-libs/mesa[gles2] )
- gnome-keyring? ( app-crypt/libsecret )
- gstreamer? (
- >=media-libs/gstreamer-1.2.3:1.0
- >=media-libs/gst-plugins-base-1.2.3:1.0
- >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
- libnotify? ( x11-libs/libnotify )
- nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
- 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/libXcomposite
- 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/gcc-4.9 >=sys-devel/clang-3.3 )
- sys-devel/gettext
- virtual/pkgconfig
-
- dev-lang/perl
- virtual/perl-Data-Dumper
- virtual/perl-Carp
-
- doc? ( >=dev-util/gtk-doc-1.10 )
- geolocation? ( 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
-
-PATCHES=(
- # https://bugs.gentoo.org/show_bug.cgi?id=555504
- "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
- # https://bugs.gentoo.org/show_bug.cgi?id=564352
- # https://bugs.webkit.org/show_bug.cgi?id=167283
- "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
- # musl and jit
- "${FILESDIR}"/${PN}-2.14.3-musl.patch
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] ; then
- if 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.9.x or Clang >= 3.3 for C++11-specific compiler flags"
- fi
-
- if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
- die 'The active compiler needs to be gcc 4.9 (or newer)'
- fi
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- check-reqs_pkg_setup
- fi
-
- python-any-r1_pkg_setup
-}
-
-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
-
- # We try to use gold when possible for this package
-# if ! tc-ld-is-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_ruby24]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
- elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
- elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
- else
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
- fi
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
- #
- # FTL_JIT requires llvm
- #
- # opengl needs to be explicetly handled, bug #576634
-
- local opengl_enabled
- if use opengl || use gles2; then
- opengl_enabled=ON
- else
- opengl_enabled=OFF
- fi
-
- # support for webgl (aka 2d-canvas accelerating)
- local canvas_enabled
- if use webgl && ! use gles2 ; then
- canvas_enabled=ON
- else
- canvas_enabled=OFF
- fi
-
- local mycmakeargs=(
- -DENABLE_QUARTZ_TARGET=$(usex aqua)
- -DENABLE_API_TESTS=$(usex test)
- -DENABLE_GTKDOC=$(usex doc)
- -DENABLE_GEOLOCATION=$(usex geolocation)
- $(cmake-utils_use_find_package gles2 OpenGLES2)
- -DENABLE_GLES2=$(usex gles2)
- -DENABLE_VIDEO=$(usex gstreamer)
- -DENABLE_WEB_AUDIO=$(usex gstreamer)
- -DENABLE_INTROSPECTION=$(usex introspection)
- -DENABLE_JIT=$(usex jit)
- -DUSE_LIBNOTIFY=$(usex libnotify)
- -DUSE_LIBSECRET=$(usex gnome-keyring)
- -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
- -DENABLE_SPELLCHECK=$(usex spell)
- -DENABLE_WAYLAND_TARGET=$(usex wayland)
- -DENABLE_WEBGL=$(usex webgl)
- $(cmake-utils_use_find_package egl EGL)
- $(cmake-utils_use_find_package opengl OpenGL)
- -DENABLE_X11_TARGET=$(usex X)
- -DENABLE_OPENGL=${opengl_enabled}
- -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
- -DCMAKE_BUILD_TYPE=Release
- -DPORT=GTK
- ${ruby_interpreter}
- )
-
- # Allow it to use GOLD when possible as it has all the magic to
- # detect when to use it and using gold for this concrete package has
- # multiple advantages and is also the upstream default, bug #585788
-# if tc-ld-is-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"
- use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
similarity index 100%
rename from net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2017-10-23 20:49 Aric Belsito
0 siblings, 0 replies; 16+ messages in thread
From: Aric Belsito @ 2017-10-23 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 2a24c444d20f548aa3e09f3f2b67019041b980b6
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Oct 23 20:48:28 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Oct 23 20:48:28 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2a24c444
net-libs/webkit-gtk: fix patch
still couldn't tell musl has machine_context
net-libs/webkit-gtk/Manifest | 2 +-
.../webkit-gtk/files/webkit-gtk-2.18.1-musl.patch | 83 ++++++++++++++++++++--
2 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 3cb56ca..d798191 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,7 +2,7 @@ AUX 2.16.1-avoid-perl-ithreads.patch 3179 SHA256 77a3e8ad48868c23834e14b98f99131
AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256 20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32 WHIRLPOOL a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43
AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
AUX webkit-gtk-2.14.3-musl.patch 4111 SHA256 cc371f6dd10f489169eaa5b0ef3b197eae7a0f7d349aca86f830dd45f39473af SHA512 eb47b3c9d58bfa121acf83f2f58e819e2e2a2198c58ff926a1d3db8ee1c5ddbcbaad5c06d113cec1c20f286877823edcd52cc0caf3993a8b89a6fb5277f0a387 WHIRLPOOL 486613fe49588ed3019298eebe66a94a6e823e1719ff602dedc330222a931350a605dc64013f3a0244d661d335699a5836cf4083c93b5723a6cb457845e5ca04
-AUX webkit-gtk-2.18.1-musl.patch 2792 SHA256 b73ac3741a866ea95abe6ee3288903a8c9a94ee167fabc4c067a362f0913fe99 SHA512 1d27969060710e65d79cde5fd03b8162710dd24c95368f4feafcd0c1a7b8e2e8d5f53e30d7e25f7fbb7d15882921503a8e96280485fea503645ff4f84d84fa26 WHIRLPOOL bff48b32057364fa8c45f524b618d1f5a17e8e3a9536f575d73da7c261e878cd48e38b987b47da1f7a9b5e2e64f256dd7b3e0b5123df80ff1a108df3b7975753
+AUX webkit-gtk-2.18.1-musl.patch 6201 SHA256 0c8cc541f5d211ab8e342ee3d203ecb4288a1c707a34a50cd0d6a32edf2aaeea SHA512 d22ece5f3a2414abcbd804fbe8340dbcd91ad503fc76950f931edbe22d3b15d5991717ea02bdfa21f82d08df9d0b4443265893b271560fbcef2dd90ca633b13c WHIRLPOOL 249682a8f402a28b609b0e46f8310a2a0e338aa095a5debb21703486989505810b253c7d4290857c9be7947d4579f74791b19cb45f9dfc6b429889019e81953c
AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch
index 6153432..d46dd47 100644
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch
@@ -1,6 +1,6 @@
diff -Naur webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h webkitgtk-2.18.1/Source/JavaScriptCore/runtime/MachineContext.h
---- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h 2017-10-23 11:04:02.710772221 -0700
-+++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/MachineContext.h 2017-10-23 11:06:15.310769846 -0700
+--- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h 2017-08-09 02:13:46.000000000 -0700
++++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/MachineContext.h 2017-10-23 13:37:19.427607525 -0700
@@ -146,7 +146,7 @@
#error Unknown Architecture
#endif
@@ -47,8 +47,8 @@ diff -Naur webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h
// The following sequence depends on glibc's sys/ucontext.h.
#if CPU(X86)
diff -Naur webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h webkitgtk-2.18.1/Source/JavaScriptCore/runtime/Options.h
---- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h 2017-10-23 11:04:02.711772221 -0700
-+++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/Options.h 2017-10-23 11:07:37.100768382 -0700
+--- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h 2017-08-13 23:05:57.000000000 -0700
++++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/Options.h 2017-10-23 13:37:19.428607525 -0700
@@ -120,9 +120,9 @@
\
v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
@@ -62,3 +62,78 @@ diff -Naur webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h webkitg
\
v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
+diff -Naur webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
+--- webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp 2017-08-09 02:13:47.000000000 -0700
++++ webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp 2017-10-23 13:46:31.956597630 -0700
+@@ -839,7 +839,7 @@
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -855,7 +855,7 @@
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+diff -Naur webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
+--- webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp 2017-08-09 02:13:47.000000000 -0700
++++ webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp 2017-10-23 13:46:13.605597959 -0700
+@@ -1994,7 +1994,7 @@
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -2010,7 +2010,7 @@
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+diff -Naur webkitgtk-2.18.1.orig/Source/WTF/wtf/Platform.h webkitgtk-2.18.1/Source/WTF/wtf/Platform.h
+--- webkitgtk-2.18.1.orig/Source/WTF/wtf/Platform.h 2017-10-16 05:18:56.000000000 -0700
++++ webkitgtk-2.18.1/Source/WTF/wtf/Platform.h 2017-10-23 13:44:27.882599852 -0700
+@@ -676,7 +676,7 @@
+ #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
+ #endif
+
+-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
++#if OS(DARWIN) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+ #define HAVE_MACHINE_CONTEXT 1
+ #endif
+
+diff -Naur webkitgtk-2.18.1.orig/Source/WebCore/xml/XPathGrammar.cpp webkitgtk-2.18.1/Source/WebCore/xml/XPathGrammar.cpp
+--- webkitgtk-2.18.1.orig/Source/WebCore/xml/XPathGrammar.cpp 2017-08-09 02:13:52.000000000 -0700
++++ webkitgtk-2.18.1/Source/WebCore/xml/XPathGrammar.cpp 2017-10-23 13:43:16.467601131 -0700
+@@ -967,7 +967,7 @@
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -990,7 +990,7 @@
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2017-05-13 11:26 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2017-05-13 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 49b2773dd15e1e91fc2b029f56c7efaa78781e6b
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 11:26:10 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat May 13 11:26:10 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=49b2773d
net-libs/webkit-gtk: add missing patch, issue #49
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-libs/webkit-gtk/Manifest | 1 +
.../files/2.16.2-avoid-perl-ithreads.patch | 130 +++++++++++++++++++++
2 files changed, 131 insertions(+)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1420587..051e2de 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,5 @@
AUX 2.16.1-avoid-perl-ithreads.patch 3179 SHA256 77a3e8ad48868c23834e14b98f99131940a461f79dfeee8703f79eaad60fbf39 SHA512 86a1bcde4a2870aea66823ac90bbb1a3d2398a781994c534720e39843785f2eb4d4382a761ee024ae5420d0aeef212175128bdafda1b47b036b5c6a30e002604 WHIRLPOOL 3e1730282070c1e06dc5b8d9b0dcf60a3e4b6eb6130c43c5dfb679593bd1ad97b29ac17eb0649e03e3ca0be929213fd7a84751142bcd2e921d3dedb643ef0534
+AUX 2.16.2-avoid-perl-ithreads.patch 3681 SHA256 659a6f2c2df55bdd5e5cff8b8a9628f2d18c66ecf92d267b68ed7f48540a2e93 SHA512 b5b567fc198eebf2fb1d538b2692907e30adcd5583a38a00bcd7bdff906464188392fd6ac0b65d574a8d7ea90873bb4f4d8fa2d09c1cdb32013241cc401b8b15 WHIRLPOOL 47784091762aeb0570af5ea3aab75c75a9322ffdb1dbb6b9326b9bc804c17b6490c01d59b03f577968d902d39217478b91a9838ba440bf01dfb76fd7c0a014df
AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256 20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32 WHIRLPOOL a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43
AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
AUX webkit-gtk-2.14.3-musl.patch 4111 SHA256 cc371f6dd10f489169eaa5b0ef3b197eae7a0f7d349aca86f830dd45f39473af SHA512 eb47b3c9d58bfa121acf83f2f58e819e2e2a2198c58ff926a1d3db8ee1c5ddbcbaad5c06d113cec1c20f286877823edcd52cc0caf3993a8b89a6fb5277f0a387 WHIRLPOOL 486613fe49588ed3019298eebe66a94a6e823e1719ff602dedc330222a931350a605dc64013f3a0244d661d335699a5836cf4083c93b5723a6cb457845e5ca04
diff --git a/net-libs/webkit-gtk/files/2.16.2-avoid-perl-ithreads.patch b/net-libs/webkit-gtk/files/2.16.2-avoid-perl-ithreads.patch
new file mode 100644
index 0000000..fb49731
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.16.2-avoid-perl-ithreads.patch
@@ -0,0 +1,130 @@
+From b9ee99577992ccb7a94840f5f7f2d77b31c4e0bd Mon Sep 17 00:00:00 2001
+From: "commit-queue@webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Sun, 9 Apr 2017 21:48:06 +0000
+Subject: [PATCH] generate-bindings-all.pl shouldn't use Perl threads
+ https://bugs.webkit.org/show_bug.cgi?id=170106
+
+Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2017-04-09
+Reviewed by Yusuke Suzuki.
+
+The use of interpreter-based threads in Perl is officially
+discouraged and not all Linux distributions and BSD compile Perl
+with threads support. Use fork instead of threads to run
+generate-bindings.pl in parallel.
+
+* bindings/scripts/generate-bindings-all.pl:
+(spawnGenerateBindingsIfNeeded): Added.
+(executeCommand): Removed the workaround for Cygwin Perl threads.
+(spawnCommand): Added.
+(worker): Deleted.
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@215166 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ .../bindings/scripts/generate-bindings-all.pl | 63 +++++++++++-----------
+diff --git a/Source/WebCore/bindings/scripts/generate-bindings-all.pl b/Source/WebCore/bindings/scripts/generate-bindings-all.pl
+index 37b27cc..968ea11 100755
+--- a/Source/WebCore/bindings/scripts/generate-bindings-all.pl
++++ b/Source/WebCore/bindings/scripts/generate-bindings-all.pl
+@@ -32,9 +32,6 @@ use File::Basename;
+ use File::Spec;
+ use File::Find;
+ use Getopt::Long;
+-use threads;
+-use threads::shared;
+-use Thread::Queue;
+
+ my $perl = $^X;
+ my $scriptDir = $FindBin::Bin;
+@@ -121,13 +118,18 @@ my @idlFilesToUpdate = grep &{sub {
+ implicitDependencies($depFile));
+ needsUpdate(\@output, \@deps);
+ }}, @idlFiles;
+-my $queue = Thread::Queue->new(@idlFilesToUpdate);
+-my $abort :shared = 0;
++
++my $abort = 0;
+ my $totalCount = @idlFilesToUpdate;
+-my $currentCount :shared = 0;
++my $currentCount = 0;
+
+-my @threadPool = map { threads->create(\&worker) } (1 .. $numOfJobs);
+-$_->join for @threadPool;
++spawnGenerateBindingsIfNeeded() for (1 .. $numOfJobs);
++while (waitpid(-1, 0) != -1) {
++ if ($?) {
++ $abort = 1;
++ }
++ spawnGenerateBindingsIfNeeded();
++}
+ exit $abort;
+
+ sub needsUpdate
+@@ -157,20 +159,16 @@ sub mtime
+ return (stat $file)[9];
+ }
+
+-sub worker {
+- while (my $file = $queue->dequeue_nb()) {
+- last if $abort;
+- eval {
+- $currentCount++;
+- my $basename = basename($file);
+- printProgress("[$currentCount/$totalCount] $basename");
+- executeCommand($perl, @args, $file) == 0 or die;
+- };
+- if ($@) {
+- $abort = 1;
+- die;
+- }
+- }
++sub spawnGenerateBindingsIfNeeded
++{
++ return if $abort;
++ return unless @idlFilesToUpdate;
++ my $file = shift @idlFilesToUpdate;
++ $currentCount++;
++ my $basename = basename($file);
++ printProgress("[$currentCount/$totalCount] $basename");
++ my $pid = spawnCommand($perl, @args, $file);
++ $abort = 1 unless defined $pid;
+ }
+
+ sub buildDirectoryCache
+@@ -196,22 +194,23 @@ sub implicitDependencies
+
+ sub executeCommand
+ {
+- if ($^O eq 'cygwin') {
+- # 'system' of Cygwin Perl doesn't seem thread-safe
+- my $pid = fork();
+- defined($pid) or die;
+- if ($pid == 0) {
+- exec(@_) or die;
+- }
+- waitpid($pid, 0);
+- return $?;
+- }
+ if ($^O eq 'MSWin32') {
+ return system(quoteCommand(@_));
+ }
+ return system(@_);
+ }
+
++sub spawnCommand
++{
++ my $pid = fork();
++ if ($pid == 0) {
++ @_ = quoteCommand(@_) if ($^O eq 'MSWin32');
++ exec(@_);
++ die "Cannot exec";
++ }
++ return $pid;
++}
++
+ sub quoteCommand
+ {
+ return map {
+--
+1.8.3.1
+
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2017-05-08 23:30 Aric Belsito
0 siblings, 0 replies; 16+ messages in thread
From: Aric Belsito @ 2017-05-08 23:30 UTC (permalink / raw
To: gentoo-commits
commit: df515476eec5cffa9deef9ab3bdf6f8dcd00b12c
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon May 8 23:29:51 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon May 8 23:29:51 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=df515476
net-libs/webkit-gtk: sync with upstream
remove 2.14.5
net-libs/webkit-gtk/Manifest | 5 +-
...kit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch | 22 --
net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild | 290 ---------------------
net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild | 2 +-
4 files changed, 2 insertions(+), 317 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1282801..5a86b26 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -14,12 +14,9 @@ AUX webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch 733 SHA256 d447d71
AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d4f29417e3d4ebd619e183535368175c473485c2dd SHA512 f4a0647530f29bed5fdbf0fcec5d52c6064a13c00715fb6fb490490dee29dac87bb2b1d9ab35ce2bf7b9eb2da262cf5bb07b7c84f82f84cfab784a61f163811e WHIRLPOOL f18be67ef26051ebe271481c3444761c604a40fcda9679f3778cccbc3513f8501a6c3ea9b43fa1b3c3eaa04ca08585e62d8b3a27185358dc69c612ef8eab8364
AUX webkit-gtk-2.8.5-fix-alpha-build.patch 914 SHA256 aa6617505fe9342153ba9442ea109d880ca6c3315777c57ab599f67515e2a9f7 SHA512 c3599c21dbcc709cf1bbc56eafdff8f8d30d65732fff73e601a828b397523d9a0cec96a4e7940ad1b4b3d9b4711f6d5f2935dcd34cac9adec63b73401638fd5e WHIRLPOOL 68a39ccf49e7719393f14cd5d53497148527bd697b010378bdec4cdefb21c5fc7ce5081ce10b412c61390a82e45fa44d9d34aa7f223c51ad15eb1d0288ccbe60
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 880 SHA256 411a4238c2e863b60744287ad645f1e3e0cddd33e895f4dfb1e1c5cfd9f48765 SHA512 7150400387f5edd3a647359ef1d864634c25d0a7dad043c1b0734fb44d133f59bbc0ce065e59bc3abab0082272ac54c1b40752e06041e5e36c11f502a9734a62 WHIRLPOOL 470ea2f6228878ddae55cec72b667f14f56d5f7017ea1cce123dcc5da41dd3fd589214b722e5a85bd81f2a14445a759c55366826b82e3801d8e40ef2ba9c6826
-DIST webkitgtk-2.14.5.tar.xz 13956352 SHA256 3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f SHA512 3351d9b05458434835fa2db050c34906649c3b1222d7936d123306634a46e35e8cc3aa1bb7512b103af1996fce722254692826b6f695e32ae176032dc8c94e1c WHIRLPOOL 011745e5e1f8926b28b34ac797480b3c79ccfcf09d844d076d8cf3087959013f39f359d7a7ef06a8e95ca7e04d28284ff4901e483180d2a41b4b05568b658e74
DIST webkitgtk-2.16.1.tar.xz 14675996 SHA256 eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945 SHA512 4b8de15644d0d0f9814c674020cbbab8628347915b8010977dbe2365ce276ea05b3bf86171400ae8eb5bfdebbadcfabd1efce34a177b5c82aa765bd3351e7010 WHIRLPOOL c9deacbd229804aaaba88f9fcabdcde1a460430bb60258dfc8d7393723401d7e74d645ba8bf2dcf60e87c30739e45558b747911a4671a8950efe271cb7b86586
DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
-EBUILD webkit-gtk-2.14.5.ebuild 8494 SHA256 19383e3c9173e9c5696fb5156e77a5a98214ff6f3f8a96a71cf230f9512723ee SHA512 c0fdf4057ed187ee7717cb57ffd1c235fe6074b5ab0a18c1e86e07674c7e82512a3a6409980e69a1adfa24f00f57e3ce2bcf2d3ae04e3dbee3e64bbf7089f610 WHIRLPOOL fde9cff6fc10b64740349bcd27a1bba994d411fad55ab3c6f4b8d2bc99663625af4488b05d628b80d17caebe3ff2d439829895f4f8b0a787c49005bf995c8b51
-EBUILD webkit-gtk-2.16.1.ebuild 8541 SHA256 deccaa186fa287f0c4d1fd8da1aba577dc3aac39a624de642ce8d4edb43425b8 SHA512 af95977486cc2d756aa61a7845990df2e463b6735ea49da19906ad9e6f2f8bb8ffeadefcc6baa2b7175922ecf2cc1a1669cd43f63a3fe1415c71635d5e5d82a9 WHIRLPOOL 3e11ba466cb8aaf8107445524e28bb905c7112684179b3b4385834b86467c766f87011cfdefa7e69c53a6a8a22186147d5b1f414ed898785fbe185fdbf8faa3d
+EBUILD webkit-gtk-2.16.1.ebuild 8539 SHA256 ee3f0eea5671726783ae0a13b48c3593d9294af8f2c2497bd56bc8ec617bcd17 SHA512 b554abaf3032d8d48f7b9dcabd012a13d15a1437cf09a8d9498c6af1cb7902e4c1ec4589f23f8176f08d7b992b45a926f5da836c4242f0e03dae086273053989 WHIRLPOOL f78b1ea261d7a605798c31d024e33fc0a1048d8f6521e038cec40c2e3150917528feccaae0c8afba0024a334c4415e1f7d5e093622c881b247537ee02681290f
EBUILD webkit-gtk-2.4.11-r1.ebuild 9116 SHA256 cb634f504420a7b9c685f6e0b7def916e44c0671a31628ed5086da7b960013c9 SHA512 e4796fa71dbfbe6bfc996e51a5d1a5eae8d6ad35736c55ca3d8a705f09833f19bf9d61d643ca8de3d14eb25264e2d1de1778c58ba904c7db044bbfbd6da7bd73 WHIRLPOOL b62d76a261fc01f59cfaa9907585918b4ba9e5d059d5ac8e4a32fbb454ae41854e920c9e237236d775881fd097a6eca765e29e3551b2e4e87146ff666faf1f50
EBUILD webkit-gtk-2.4.11-r200.ebuild 8523 SHA256 0877a84ecd95a782324353b5f4d97de900826bdb68e92c5ffca780bed050948e SHA512 faec9fa216387bcbb070f645a7ef1534880239c4ded5ce4a384c8e7b477e44f48905e5d0e87e2748d9296ce53c7770e72451cd142e7c09e2e908f570716d44db WHIRLPOOL 30480cc629d706ce423ec5e709abb4075da678ba9445155ef8e960a3d4a823955914446c4259e49474c32c67d964dfb8ae12644557be3653bcf18a025aa39f9a
MISC metadata.xml 697 SHA256 4f096b51e01f6f74430bbca04ba292bcc015631d57417deb91a995fe943203a6 SHA512 64bebe1fd72f81707b462bdf3630404e71a87d1807519c86ed5eff393a324e30a32c489f0c7d86d3b6dc2b3855758452e95ae98fb4d0c27555947b35b28907d9 WHIRLPOOL 17cce501d17ac9a29c142462737d223b087bf80b18284fb346de62e9c9f9f23e02efa6a30ec63780ee48d0b2c21a34af9fdc6fd7f72ac152fb272085214adea1
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
deleted file mode 100644
index 49af448..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-2015-08-24 Alexandre Rostovtsev <tetromino@gentoo.org>
-
- 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
-===================================================================
---- a/Source/WebKit2/PlatformGTK.cmake (revision 188859)
-+++ b/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.14.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
deleted file mode 100644
index 5c2a3bf..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils 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="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
- geolocation? ( introspection )
- gles2? ( egl )
- introspection? ( gstreamer )
- nsplugin? ( X )
- webgl? ( ^^ ( gles2 opengl ) )
- !webgl? ( ?? ( gles2 opengl ) )
- webgl? ( gstreamer )
- wayland? ( egl )
- || ( aqua 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
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
- dev-db/sqlite:3=
- >=dev-libs/glib-2.36:2
- dev-libs/hyphen
- >=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?]
- >=x11-libs/cairo-1.10.2:=
- >=x11-libs/gtk+-3.14:3[introspection?]
- >=x11-libs/pango-1.30.0
- virtual/jpeg:0=
-
- aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
- egl? ( media-libs/mesa[egl] )
- geolocation? ( >=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
- >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
- libnotify? ( x11-libs/libnotify )
- nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
- 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/libXcomposite
- 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.9 >=sys-devel/clang-3.3 )
- sys-devel/gettext
- virtual/pkgconfig
-
- doc? ( >=dev-util/gtk-doc-1.10 )
- geolocation? ( 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
-
-PATCHES=(
- # https://bugs.gentoo.org/show_bug.cgi?id=555504
- "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
- # https://bugs.gentoo.org/show_bug.cgi?id=564352
- # https://bugs.webkit.org/show_bug.cgi?id=167283
- "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
- # https://bugs.webkit.org/show_bug.cgi?id=148379
- "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
- # musl and jit
- "${FILESDIR}"/${PN}-2.14.3-musl.patch
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] ; then
- if 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.9.x or Clang >= 3.3 for C++11-specific compiler flags"
- fi
-
- if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
- die 'The active compiler needs to be gcc 4.9 (or newer)'
- fi
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- check-reqs_pkg_setup
- fi
-
- python-any-r1_pkg_setup
-}
-
-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
-
- # We try to use gold when possible for this package
-# if ! tc-ld-is-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_ruby24]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
- elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
- elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
- else
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
- fi
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
- #
- # FTL_JIT requires llvm
- #
- # opengl needs to be explicetly handled, bug #576634
-
- local opengl_enabled
- if use opengl || use gles2; then
- opengl_enabled=ON
- else
- opengl_enabled=OFF
- fi
-
- # support for webgl (aka 2d-canvas accelerating)
- local canvas_enabled
- if use webgl && ! use gles2 ; then
- canvas_enabled=ON
- else
- canvas_enabled=OFF
- fi
-
- local mycmakeargs=(
- -DENABLE_QUARTZ_TARGET=$(usex aqua)
- -DENABLE_API_TESTS=$(usex test)
- -DENABLE_GTKDOC=$(usex doc)
- -DENABLE_GEOLOCATION=$(usex geolocation)
- $(cmake-utils_use_find_package gles2 OpenGLES2)
- -DENABLE_GLES2=$(usex gles2)
- -DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
- -DENABLE_VIDEO=$(usex gstreamer)
- -DENABLE_WEB_AUDIO=$(usex gstreamer)
- -DENABLE_INTROSPECTION=$(usex introspection)
- -DENABLE_JIT=$(usex jit)
- -DUSE_LIBNOTIFY=$(usex libnotify)
- -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
- -DENABLE_SPELLCHECK=$(usex spell)
- -DENABLE_WAYLAND_TARGET=$(usex wayland)
- -DENABLE_WEBGL=$(usex webgl)
- $(cmake-utils_use_find_package egl EGL)
- $(cmake-utils_use_find_package opengl OpenGL)
- -DENABLE_X11_TARGET=$(usex X)
- -DENABLE_OPENGL=${opengl_enabled}
- -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
- -DCMAKE_BUILD_TYPE=Release
- -DPORT=GTK
- ${ruby_interpreter}
- )
-
- # Allow it to use GOLD when possible as it has all the magic to
- # detect when to use it and using gold for this concrete package has
- # multiple advantages and is also the upstream default, bug #585788
-# if tc-ld-is-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"
- use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
index 44c59aa..24a2709 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2017-02-03 0:47 Aric Belsito
0 siblings, 0 replies; 16+ messages in thread
From: Aric Belsito @ 2017-02-03 0:47 UTC (permalink / raw
To: gentoo-commits
commit: 723e96f762eeaec837d88e20a1ba22de597f5658
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Fri Feb 3 00:47:06 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Fri Feb 3 00:47:06 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=723e96f7
net-libs/webkit-gtk: add 2.14.3
net-libs/webkit-gtk/Manifest | 6 +
.../webkit-gtk/files/webkit-gtk-2.14.3-musl.patch | 82 ++++++
.../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.14.3.ebuild | 293 +++++++++++++++++++++
6 files changed, 446 insertions(+)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 989b7e1..4eae739 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,6 @@
AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256 20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32 WHIRLPOOL a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43
AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
+AUX webkit-gtk-2.14.3-musl.patch 4111 SHA256 cc371f6dd10f489169eaa5b0ef3b197eae7a0f7d349aca86f830dd45f39473af SHA512 eb47b3c9d58bfa121acf83f2f58e819e2e2a2198c58ff926a1d3db8ee1c5ddbcbaad5c06d113cec1c20f286877823edcd52cc0caf3993a8b89a6fb5277f0a387 WHIRLPOOL 486613fe49588ed3019298eebe66a94a6e823e1719ff602dedc330222a931350a605dc64013f3a0244d661d335699a5836cf4083c93b5723a6cb457845e5ca04
AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
@@ -10,7 +11,12 @@ AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e62
AUX webkit-gtk-2.4.9-gcc-6.patch 1890 SHA256 d0d82c1a1e955e03dd7667e351d99da485d7297acf378e715820202e48d4088e SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c WHIRLPOOL 1ebbeb9564978b3ddf4488c9fe72113da0ff10a0ba8c3bcd418b913a936ebe09da907e86714b7419f2746af1648ab786850559c4a5c6a0f1b51ed98e9aab0334
AUX webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch 733 SHA256 d447d71943cacdec166f0a65f34258494f70719ba9cd951d5b512902e20200d0 SHA512 580531428c0498e996de358a20a499f36edaaa98a108088c5dde428a997a61e5a55293cf855d652655c193cd5cda8e25723cac360d3983fcd1fbce35aa9b41a0 WHIRLPOOL b68bc94045ef46f5959146b6d14e2e39c9a1e3c7a39a9e7164ece4db1d1fc9f3c846b26af5e7b2b81db5ee82913b4018097367c6843a8b41758316cd27371bcc
AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d4f29417e3d4ebd619e183535368175c473485c2dd SHA512 f4a0647530f29bed5fdbf0fcec5d52c6064a13c00715fb6fb490490dee29dac87bb2b1d9ab35ce2bf7b9eb2da262cf5bb07b7c84f82f84cfab784a61f163811e WHIRLPOOL f18be67ef26051ebe271481c3444761c604a40fcda9679f3778cccbc3513f8501a6c3ea9b43fa1b3c3eaa04ca08585e62d8b3a27185358dc69c612ef8eab8364
+AUX webkit-gtk-2.8.5-fix-alpha-build.patch 914 SHA256 aa6617505fe9342153ba9442ea109d880ca6c3315777c57ab599f67515e2a9f7 SHA512 c3599c21dbcc709cf1bbc56eafdff8f8d30d65732fff73e601a828b397523d9a0cec96a4e7940ad1b4b3d9b4711f6d5f2935dcd34cac9adec63b73401638fd5e WHIRLPOOL 68a39ccf49e7719393f14cd5d53497148527bd697b010378bdec4cdefb21c5fc7ce5081ce10b412c61390a82e45fa44d9d34aa7f223c51ad15eb1d0288ccbe60
+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 880 SHA256 411a4238c2e863b60744287ad645f1e3e0cddd33e895f4dfb1e1c5cfd9f48765 SHA512 7150400387f5edd3a647359ef1d864634c25d0a7dad043c1b0734fb44d133f59bbc0ce065e59bc3abab0082272ac54c1b40752e06041e5e36c11f502a9734a62 WHIRLPOOL 470ea2f6228878ddae55cec72b667f14f56d5f7017ea1cce123dcc5da41dd3fd589214b722e5a85bd81f2a14445a759c55366826b82e3801d8e40ef2ba9c6826
+DIST webkitgtk-2.14.3.tar.xz 13962776 SHA256 0bead450a4c92024f09008725bb3e8c3830a32c7e2983d566368c4fede9e106c SHA512 b530b84f238230f29462ef599ffd1b9a9458690ba03a78d09126bf4c4ab37b4dfb477da7c364d2446cc259720ff4743112672ebf7888b8e3ff2c8fc1271fda57 WHIRLPOOL 560b4c818ca6271eca72a31c65c11b0c42269a125e68dfac7932f40e6d108cff325e5340d6040889f429b0e6b978a2a6279432f23a0c8956af02e6ece8a61ff8
DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
+EBUILD webkit-gtk-2.14.3.ebuild 8558 SHA256 948c02462aee8e42db2d040c3e3c47079538935e99274e588064b6484b24c398 SHA512 0918411af48f6332925a3b2c3470273d7f6d586db94a065a34a899ed25635069c4559bacf3297d777779ed795dcb4360fa75f56ae7fcb2abecb0322e141192ae WHIRLPOOL 8df6af74418c8b595194dff849087bd8747062c586ace1ca76b1525d002bcc7c5fa63275bb536af9d75e405fcb613583b5b502e684b45bc41d18a9bf7fe4044c
EBUILD webkit-gtk-2.4.11-r1.ebuild 9123 SHA256 6fc62f471fe028d8e0a2fe0a130dc53833f62c49ab7136dbc446dd290b4b71ce SHA512 5e12f7febbd297859e6d9fa709efbdfe440b5d7900d70ee1e81479313bfabd5583b6c1a68d912748df02af2d1f430fac63382ecb92a9986cbb9841602294b5c8 WHIRLPOOL f9d46ac0776142733ee7d2fe5907acaa265198f6bc1334e74c8c6f7fecece8545de9f620d15d00b7f8aa3225e0d325ace4af58360145d3f9f8bd20a4ed74a067
EBUILD webkit-gtk-2.4.11-r200.ebuild 8530 SHA256 e579be98b8fba274c974019ac867e2a2fdefba5d4b7e4419c324f1eae74b7a5d SHA512 dbf7e7e1dffc157be18602e0e1bda57297f30c5a1f00862736067d6fee8573c1711f027bab07a698a1cd382a6f6d825327deed7274930a098f416e77c8d05371 WHIRLPOOL ec612bb5db541cdd866227f09281f63dbf9e157eb485c8ce8e87f9664ef3213750958f0ba13f3a87cfe641b3c6f1972ea15a9955d2293e101cf8b466dea10aad
MISC metadata.xml 634 SHA256 48f0a29437afb03701f60011476eb2ad74683d918b69c6963e16f92b763bb0de SHA512 36bcb7965d4bf4b61d9399c794d4f4a438152bf6338ef68cfd6a04f8c94351b35f1cb09172fb4eee4db9b072e0984420ee976031e2c27963fe0390e079494ba8 WHIRLPOOL e14b1f0070ff39f026b1c406718d68f2ccffe4c4db7bf5afe16c658cc1837cb3b29820868b2e9617beb37442eab7ac2f9d8340f55a763bc5ee8ebe1a2065c694
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch
new file mode 100644
index 0000000..f5b40f9
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch
@@ -0,0 +1,82 @@
+diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp webkitgtk-2.14.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+--- webkitgtk-2.14.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-01-21 14:57:58.821113862 -0800
++++ webkitgtk-2.14.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-01-21 14:59:46.889444106 -0800
+@@ -549,7 +549,7 @@
+ #error Unknown Architecture
+ #endif
+
+-#elif defined(__GLIBC__) && ENABLE(JIT)
++#elif OS(LINUX) && ENABLE(JIT)
+
+ #if CPU(X86)
+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
+@@ -648,9 +648,8 @@
+ #error Unknown Architecture
+ #endif
+
+-#elif defined(__GLIBC__)
++#elif OS(LINUX)
+
+-// The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EBP]);
+ #elif CPU(X86_64)
+@@ -730,9 +729,8 @@
+ #error Unknown Architecture
+ #endif
+
+-#elif defined(__GLIBC__)
++#elif OS(LINUX)
+
+-// The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EIP]);
+ #elif CPU(X86_64)
+@@ -821,9 +819,8 @@
+ #error Unknown Architecture
+ #endif
+
+-#elif defined(__GLIBC__)
++#elif OS(LINUX)
+
+-// The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESI]);
+ #elif CPU(X86_64)
+diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp webkitgtk-2.14.3/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
+--- webkitgtk-2.14.3.orig/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2017-01-21 14:57:58.933115241 -0800
++++ webkitgtk-2.14.3/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2017-01-21 15:00:42.712131243 -0800
+@@ -49,7 +49,7 @@
+ #include "ScriptCallStackFactory.h"
+ #include <wtf/Stopwatch.h>
+
+-#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
++#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK) && defined(__GLIBC__) && !defined(__UCLIBC__))
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+ #include <execinfo.h>
+@@ -187,7 +187,7 @@
+
+ void JSGlobalObjectInspectorController::appendAPIBacktrace(ScriptCallStack* callStack)
+ {
+-#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
++#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK) && defined(__GLIBC__) && !defined(__UCLIBC__))
+ static const int framesToShow = 31;
+ static const int framesToSkip = 3; // WTFGetBacktrace, appendAPIBacktrace, reportAPIException.
+
+diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/runtime/Options.h webkitgtk-2.14.3/Source/JavaScriptCore/runtime/Options.h
+--- webkitgtk-2.14.3.orig/Source/JavaScriptCore/runtime/Options.h 2017-01-21 14:57:59.074116976 -0800
++++ webkitgtk-2.14.3/Source/JavaScriptCore/runtime/Options.h 2017-01-21 15:01:36.813797195 -0800
+@@ -112,9 +112,9 @@
+ \
+ v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
+ \
+- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \
+- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
+- v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
++ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \
++ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
++ v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
+ \
+ v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
+ v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
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..3817bce
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
@@ -0,0 +1,22 @@
+--- a/Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300
++++ b/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)
+--- a/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300
++++ b/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..49af448
--- /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 <tetromino@gentoo.org>
+
+ 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
+===================================================================
+--- a/Source/WebKit2/PlatformGTK.cmake (revision 188859)
++++ b/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.14.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild
new file mode 100644
index 0000000..e9c4089
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils 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="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+ geolocation? ( introspection )
+ gles2? ( egl )
+ introspection? ( gstreamer )
+ nsplugin? ( X )
+ webgl? ( ^^ ( gles2 opengl ) )
+ !webgl? ( ?? ( gles2 opengl ) )
+ webgl? ( gstreamer )
+ wayland? ( egl )
+ || ( aqua 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
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+ dev-db/sqlite:3=
+ >=dev-libs/glib-2.36:2
+ dev-libs/hyphen
+ >=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?]
+ >=x11-libs/cairo-1.10.2:=
+ >=x11-libs/gtk+-3.14:3[introspection?]
+ >=x11-libs/pango-1.30.0
+ virtual/jpeg:0=
+
+ aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+ egl? ( media-libs/mesa[egl] )
+ geolocation? ( >=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
+ >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+ libnotify? ( x11-libs/libnotify )
+ nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+ 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/libXcomposite
+ 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.9 >=sys-devel/clang-3.3 )
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ doc? ( >=dev-util/gtk-doc-1.10 )
+ geolocation? ( 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" ]] ; then
+ if 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.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+ fi
+
+ if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+ die 'The active compiler needs to be gcc 4.9 (or newer)'
+ fi
+ fi
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ check-reqs_pkg_setup
+ fi
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=555504
+ eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=564352
+ # https://bugs.webkit.org/show_bug.cgi?id=167283
+ eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+ # https://bugs.webkit.org/show_bug.cgi?id=148379
+ eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+ # musl and jit
+ eapply "${FILESDIR}"/${PN}-2.14.3-musl.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
+
+ # We try to use gold when possible for this package
+# if ! tc-ld-is-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_ruby24]"; then
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+ else
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+ fi
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # FTL_JIT requires llvm
+ #
+ # opengl needs to be explicetly handled, bug #576634
+
+ local opengl_enabled
+ if use opengl || use gles2; then
+ opengl_enabled=ON
+ else
+ opengl_enabled=OFF
+ fi
+
+ # support for webgl (aka 2d-canvas accelerating)
+ local canvas_enabled
+ if use webgl && ! use gles2 ; then
+ canvas_enabled=ON
+ else
+ canvas_enabled=OFF
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_QUARTZ_TARGET=$(usex aqua)
+ -DENABLE_API_TESTS=$(usex test)
+ -DENABLE_GTKDOC=$(usex doc)
+ -DENABLE_GEOLOCATION=$(usex geolocation)
+ $(cmake-utils_use_find_package gles2 OpenGLES2)
+ -DENABLE_GLES2=$(usex gles2)
+ -DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
+ -DENABLE_VIDEO=$(usex gstreamer)
+ -DENABLE_WEB_AUDIO=$(usex gstreamer)
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DENABLE_JIT=$(usex jit)
+ -DUSE_LIBNOTIFY=$(usex libnotify)
+ -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+ -DENABLE_SPELLCHECK=$(usex spell)
+ -DENABLE_WAYLAND_TARGET=$(usex wayland)
+ -DENABLE_WEBGL=$(usex webgl)
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ -DENABLE_X11_TARGET=$(usex X)
+ -DENABLE_OPENGL=${opengl_enabled}
+ -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+ -DCMAKE_BUILD_TYPE=Release
+ -DPORT=GTK
+ ${ruby_interpreter}
+ )
+
+ # Allow it to use GOLD when possible as it has all the magic to
+ # detect when to use it and using gold for this concrete package has
+ # multiple advantages and is also the upstream default, bug #585788
+# if tc-ld-is-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"
+ use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2017-02-03 0:44 Aric Belsito
0 siblings, 0 replies; 16+ messages in thread
From: Aric Belsito @ 2017-02-03 0:44 UTC (permalink / raw
To: gentoo-commits
commit: 96435086ec227e2d4920d288d8a6c8e20f6c6a5f
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Fri Feb 3 00:43:51 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Fri Feb 3 00:43:51 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=96435086
net-libs/webkit-gtk: Bump 2.4.10-* to 2.4.11
Drop 2.10.9 which is woefully out of date.
net-libs/webkit-gtk/Manifest | 22 +-
.../files/webkit-gtk-1.11.90-gtk-docize-fix.patch | 4 +-
.../webkit-gtk-2.10.9-remove-execinfo_h.patch | 34 ---
.../files/webkit-gtk-2.4.11-video-web-audio.patch | 11 +
.../files/webkit-gtk-2.4.4-atomic-ppc.patch | 8 +-
.../files/webkit-gtk-2.4.4-jpeg-9a.patch | 4 +-
.../webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch | 29 +++
.../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/metadata.xml | 1 -
net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild | 280 ---------------------
...k-2.4.10.ebuild => webkit-gtk-2.4.11-r1.ebuild} | 56 ++---
...0-r200.ebuild => webkit-gtk-2.4.11-r200.ebuild} | 40 ++-
14 files changed, 104 insertions(+), 450 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 68b9afd..989b7e1 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,20 +1,16 @@
-AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818
+AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256 20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32 WHIRLPOOL a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43
AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
-AUX webkit-gtk-2.10.9-remove-execinfo_h.patch 1239 SHA256 71ce90e34c6ebfd4836e1f7a3307204fd0432c18e592ce6ec1ead7ece12afbee SHA512 1496cbc7b111f720f852d2dfee77214d43b7e3fca804dbbd7704a335a6f5e09d2fd38724d212a4aa7987ba9bf0d35b838b9473e69a890802be862fd003c8e9ca WHIRLPOOL 17a19a4bec478ddb9558918c58c39d023e59196b6bc286e638aec7f7bc80d6ac1a249dd94547361d8ad821a8338ec8e0ea64b8bd3ae1fb9deff3f055701a0d6e
AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
-AUX webkit-gtk-2.4.4-atomic-ppc.patch 1286 SHA256 458942430a4ee4c7f4efe0524b3b2c7d5213609136d1bc6c2a58fff92b247a33 SHA512 2aabf77fc69a26fde006cf16eabe7339bd5839bf205f50258978cad089f368cc5ce51f965ca3684c7958cfe217e50db1f09f47f5ee0b5057f4a108b2cfe23f6b WHIRLPOOL 7d346765d531d4c52423d963da3082398112ac4e82d2f5d6f973237a53917d4b3498d5c5f2398ed53337b7abc2774354496494f01de4dd592a512daff3cfbed9
-AUX webkit-gtk-2.4.4-jpeg-9a.patch 1258 SHA256 bd626ff2df4a44b98b0a82fa3f555a0a2cca8d1233f56104d78ff6959f5b2f2b SHA512 27be24cb4d592b5a8e1378751563baae6862ee64b69a4fe24f9f8da7b31020860adad784ecf6be6959c857566e0893526242ae03268679e3a590d673bf8717b8 WHIRLPOOL d768198c603a85afc56be1aa35506781e2bc7d561c7eda9ee64f6a504f6d77edda1537aa7d652b99350dfdd8213dd701b4d7fc8133946b67a4648ef8d5b7dac0
+AUX webkit-gtk-2.4.11-video-web-audio.patch 520 SHA256 103db2178fb3bc6db9706dc2874c1a68d748133082330a6f6cca909d26fa0dac SHA512 df7b54fed95d0132bbed22fa90f3523b94a70940ac33acefc46aa0c59b604ee36d3350035fe8bca78ba9a7ab45527d0c1afde8160e4d408eb8a7ee07048bd8d1 WHIRLPOOL af4cad5c7da3fca085e588dadf093ae3155351b81dbf2cfe8201c93515b4e23af08e62049f836dec960fe25297a786e379cd51c386ca9c605a8812cc9e5a6506
+AUX webkit-gtk-2.4.4-atomic-ppc.patch 1294 SHA256 64fc5b9e019fb759cfcf2dc65d7bf0dfcd2cff6469049098d84e180bcf4fbfcc SHA512 80c5c158eba950e56e6a3c046cc3325efcdeab0ad1add140bae1b08a9620553e2166f5df7b0a586814cd49add430dfd15b6675f1467532f294120bdd8852d067 WHIRLPOOL 310ac0d0d04156f681e9039634c2f3ca02c358f70dec091f4c1c221653eef97dcea8c454ac64d3c3b326c47687c3b4e7d168d2fba6813b28ae6c450891849723
+AUX webkit-gtk-2.4.4-jpeg-9a.patch 1262 SHA256 b442a8021ec5bfc751708fe6409baff6ae8576d7fb49da95245b6ba2c1557536 SHA512 8bfc1255f083b7d4cdbe5e03d7a006efae976988847f36c27758589a2410cf6b84e0c81a3c9673ec9b552e34af92e6d833a8db5413c03d0c85c3d82f4628c583 WHIRLPOOL 25e62e4c95b99bad82a45a82091c6ac7a7cbe02391b4873d383649413fa6eea236130a62aef7ba1f0a24f172554e9b6d650f7bfeb41abb96b8387ef85f807932
AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e623a2fd67e80111d624a2b3c01fde2fbbcd64e SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 WHIRLPOOL ba3f9b9dbee12f6dae05db9f343a46fd7d182d377e1a951e1785a5aff9a046d057bbf85821642e948c15a084e69d01054fe5632d7460892b196334adea582e72
+AUX webkit-gtk-2.4.9-gcc-6.patch 1890 SHA256 d0d82c1a1e955e03dd7667e351d99da485d7297acf378e715820202e48d4088e SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c WHIRLPOOL 1ebbeb9564978b3ddf4488c9fe72113da0ff10a0ba8c3bcd418b913a936ebe09da907e86714b7419f2746af1648ab786850559c4a5c6a0f1b51ed98e9aab0334
AUX webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch 733 SHA256 d447d71943cacdec166f0a65f34258494f70719ba9cd951d5b512902e20200d0 SHA512 580531428c0498e996de358a20a499f36edaaa98a108088c5dde428a997a61e5a55293cf855d652655c193cd5cda8e25723cac360d3983fcd1fbce35aa9b41a0 WHIRLPOOL b68bc94045ef46f5959146b6d14e2e39c9a1e3c7a39a9e7164ece4db1d1fc9f3c846b26af5e7b2b81db5ee82913b4018097367c6843a8b41758316cd27371bcc
AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d4f29417e3d4ebd619e183535368175c473485c2dd SHA512 f4a0647530f29bed5fdbf0fcec5d52c6064a13c00715fb6fb490490dee29dac87bb2b1d9ab35ce2bf7b9eb2da262cf5bb07b7c84f82f84cfab784a61f163811e WHIRLPOOL f18be67ef26051ebe271481c3444761c604a40fcda9679f3778cccbc3513f8501a6c3ea9b43fa1b3c3eaa04ca08585e62d8b3a27185358dc69c612ef8eab8364
-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.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
-EBUILD webkit-gtk-2.10.9.ebuild 8215 SHA256 bbed605d7e11fe85643355306d44c4ef269038e74c1fe1613fe0a2da740e0f95 SHA512 fc4affe4c157aa5c119d2b33f6a0436fa9fd41ced3020cc31eafdbe4181c27c5d51f2a5a8395ee7586d4820223af719ada02941bee8087d910e7c7fe87ed1962 WHIRLPOOL eb092102c34cf5770649bf5af05f227b67fe31d20820a9db2ce0b43a68754c7ec5e565f0c730c6a84f369437b77a814cbb79d6ba593d6f8225f8db41095a4c71
-EBUILD webkit-gtk-2.4.10-r200.ebuild 8475 SHA256 145d3cf546353f92325f3d98752903231867a56a6ef59ff8e0191c6e3b959afe SHA512 b1cdaf32976ee41a4acd0f877cf19ef133d979ec618d2d22f1d9d1170f3573fd3f553845a03c4f7b054657aa7f92d959974a6f8d35d150f5545903ecabcfa92f WHIRLPOOL 584c3f2b8942ddfffdff321544c253f698c002d51d0383fb837477f70c8d7196798a6bf9a909dc64bc0bf481875f998fa348e7ed40af8254ded52ec5741570a8
-EBUILD webkit-gtk-2.4.10.ebuild 8845 SHA256 9cdea807cc1dbe3b4c4f62b47de9b19f683fb5826546f892009aa26bb848cb9b SHA512 c615b9b07ec37a9aca81e6a4cb82cba52c24fb26cc22e5ee4f016cc951e922541d1a102e278ef6e69a56e1d62c50d72dca2ec221729a7ea58d677d2cb960930c WHIRLPOOL d099dc2555147efa2145bcad5eff2b61ade60d16b8ce3652ffaf116ad95ca12d939091b679d0b1f58600a0295b3d3deb095b6a5ab9f40fa44725778e5e6ba347
-MISC metadata.xml 717 SHA256 0b14a37b119705ad7c50e3857d51674eaade8148fed94caf07ca2afd5282fa58 SHA512 996dbd54e6670cde58d6fca941fd6d1a11a054e42791e1b451005c2c6b5b46d14454869cbc9e4911e5b7c0119b8a04096c95ac7c20f8389ab9cd866c9947b365 WHIRLPOOL 531accd99228e552b04a9644b470db00f9c633021a438bc1895e517e848ea73ce807ddb5225df5fd3f74af19b80e86ab83ae83c8254de4a6b246dea3f7cc1803
+DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
+EBUILD webkit-gtk-2.4.11-r1.ebuild 9123 SHA256 6fc62f471fe028d8e0a2fe0a130dc53833f62c49ab7136dbc446dd290b4b71ce SHA512 5e12f7febbd297859e6d9fa709efbdfe440b5d7900d70ee1e81479313bfabd5583b6c1a68d912748df02af2d1f430fac63382ecb92a9986cbb9841602294b5c8 WHIRLPOOL f9d46ac0776142733ee7d2fe5907acaa265198f6bc1334e74c8c6f7fecece8545de9f620d15d00b7f8aa3225e0d325ace4af58360145d3f9f8bd20a4ed74a067
+EBUILD webkit-gtk-2.4.11-r200.ebuild 8530 SHA256 e579be98b8fba274c974019ac867e2a2fdefba5d4b7e4419c324f1eae74b7a5d SHA512 dbf7e7e1dffc157be18602e0e1bda57297f30c5a1f00862736067d6fee8573c1711f027bab07a698a1cd382a6f6d825327deed7274930a098f416e77c8d05371 WHIRLPOOL ec612bb5db541cdd866227f09281f63dbf9e157eb485c8ce8e87f9664ef3213750958f0ba13f3a87cfe641b3c6f1972ea15a9955d2293e101cf8b466dea10aad
+MISC metadata.xml 634 SHA256 48f0a29437afb03701f60011476eb2ad74683d918b69c6963e16f92b763bb0de SHA512 36bcb7965d4bf4b61d9399c794d4f4a438152bf6338ef68cfd6a04f8c94351b35f1cb09172fb4eee4db9b072e0984420ee976031e2c27963fe0390e079494ba8 WHIRLPOOL e14b1f0070ff39f026b1c406718d68f2ccffe4c4db7bf5afe16c658cc1837cb3b29820868b2e9617beb37442eab7ac2f9d8340f55a763bc5ee8ebe1a2065c694
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
index 8f56ab2..c94f545 100644
--- 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
@@ -1,5 +1,5 @@
---- configure.ac.old 2013-03-02 09:22:53.791750644 +0200
-+++ configure.ac 2013-03-02 09:24:56.725213764 +0200
+--- a/configure.ac.old 2013-03-02 09:22:53.791750644 +0200
++++ b/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])
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch
deleted file mode 100644
index 5e661d9..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur webkitgtk-2.10.9.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.10.9/Source/WTF/wtf/Assertions.cpp
---- webkitgtk-2.10.9.orig/Source/WTF/wtf/Assertions.cpp 2016-03-17 02:48:18.000000000 -0400
-+++ webkitgtk-2.10.9/Source/WTF/wtf/Assertions.cpp 2016-06-01 09:31:42.345411637 -0400
-@@ -71,7 +71,7 @@
- #if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
- #include <cxxabi.h>
- #include <dlfcn.h>
--#include <execinfo.h>
-+//#include <execinfo.h>
- #endif
-
- extern "C" {
-@@ -226,7 +226,7 @@
- void WTFGetBacktrace(void** stack, int* size)
- {
- #if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
-- *size = backtrace(stack, *size);
-+// *size = backtrace(stack, *size);
- #elif OS(WINDOWS)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
- // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
-@@ -272,9 +272,9 @@
- void WTFPrintBacktrace(void** stack, int size)
- {
- #if USE(BACKTRACE_SYMBOLS)
-- char** symbols = backtrace_symbols(stack, size);
-- if (!symbols)
-- return;
-+// char** symbols = backtrace_symbols(stack, size);
-+// if (!symbols)
-+// return;
- #endif
-
- for (int i = 0; i < size; ++i) {
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch
new file mode 100644
index 0000000..ead696c
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch
@@ -0,0 +1,11 @@
+diff -purN a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
+--- a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-03-14 08:09:01.000000000 +0100
++++ b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-04-10 19:43:00.215345381 +0200
+@@ -40,6 +40,7 @@
+ #include "PaintInfo.h"
+ #include "PlatformContextCairo.h"
+ #include "RenderElement.h"
++#include "RenderBox.h"
+ #include "TextDirection.h"
+ #include "UserAgentStyleSheets.h"
+ #include "WidgetRenderingContext.h"
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
index 3c0ea88..c160376 100644
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
@@ -1,7 +1,7 @@
$OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $
https://bugs.webkit.org/show_bug.cgi?id=130837
---- Source/WebKit2/Platform/IPC/Connection.h.orig Fri Jul 4 11:06:55 2014
-+++ Source/WebKit2/Platform/IPC/Connection.h Mon Jul 14 19:31:35 2014
+--- a/Source/WebKit2/Platform/IPC/Connection.h.orig Fri Jul 4 11:06:55 2014
++++ b/Source/WebKit2/Platform/IPC/Connection.h Mon Jul 14 19:31:35 2014
@@ -216,7 +216,11 @@ class Connection : public ThreadSafeRefCounted<Connect
Client* m_client;
@@ -16,8 +16,8 @@ https://bugs.webkit.org/show_bug.cgi?id=130837
bool m_shouldExitOnSyncMessageSendFailure;
$OpenBSD: patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp,v 1.3 2014/03/27 22:03:48 landry Exp $
https://bugs.webkit.org/show_bug.cgi?id=130837
---- Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig Thu Mar 27 21:13:49 2014
-+++ Source/WebKit2/UIProcess/StatisticsRequest.cpp Thu Mar 27 21:14:23 2014
+--- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig Thu Mar 27 21:13:49 2014
++++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp Thu Mar 27 21:14:23 2014
@@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest()
uint64_t StatisticsRequest::addOutstandingRequest()
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
index 4226f2f..cded605 100644
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
@@ -1,8 +1,8 @@
http://bugs.gentoo.org/481688
http://trac.webkit.org/changeset/166490/trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
---- Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-+++ Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
++++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -334,5 +334,5 @@
case JPEG_HEADER:
// Read file parameters with jpeg_read_header().
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch
new file mode 100644
index 0000000..bd8507c
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch
@@ -0,0 +1,29 @@
+Fedora patch fixes build failure for gcc-6 (abs/fabs ambifuity)
+https://bugs.webkit.org/show_bug.cgi?id=159124#c1
+https://bugs.gentoo.org/show_bug.cgi?id=592048
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2015-05-20 03:03:24.000000000 -0600
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-02-07 11:30:42.392686308 -0700
+@@ -85,8 +85,8 @@
+ guint32 eventTime = getEventTime(event);
+
+ if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
+- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
+- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
++ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
++ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
+ && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime))
+ && (buttonEvent->button == m_previousClickButton)))
+ m_currentClickCount++;
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700
+@@ -659,7 +659,7 @@
+ if (!std::isfinite(time))
+ return String::fromUTF8(_("indefinite time"));
+
+- int seconds = static_cast<int>(abs(time));
++ int seconds = static_cast<int>(fabs(time));
+ int days = seconds / (60 * 60 * 24);
+ int hours = seconds / (60 * 60);
+ int minutes = (seconds / 60) % 60;
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
deleted file mode 100644
index cafceb5..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./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
deleted file mode 100644
index 6c88c49..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index 79b57ae..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-2015-08-24 Alexandre Rostovtsev <tetromino@gentoo.org>
-
- 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/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 @@
<flag name="egl">Enable EGL support.</flag>
<flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
<flag name="gles2">Enable GLESv2 support.</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.10.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
deleted file mode 100644
index 57248e3..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
+++ /dev/null
@@ -1,280 +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 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit check-reqs cmake-utils 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="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
-
-IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
-# seccomp
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
- geoloc? ( introspection )
- gles2? ( egl )
- introspection? ( gstreamer )
- nsplugin? ( X )
- webgl? ( ^^ ( gles2 opengl ) )
- !webgl? ( ?? ( gles2 opengl ) )
- webgl? ( gstreamer )
- || ( aqua 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
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-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
-
- aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
- 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
- >=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
- nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
- 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/libXcomposite
- x11-libs/libXrender
- x11-libs/libXt )
-"
-# Control knob is private and set to off
-# seccomp? ( sys-libs/libseccomp )
-
-# 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-libs/hyphen
- >=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.9 >=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" ]] ; then
- if 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.9.x or Clang >= 3.3 for C++11-specific compiler flags"
- fi
-
- if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
- die 'The active compiler needs to be gcc 4.9 (or newer)'
- fi
- 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
-
- # musl patches
- epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
- epatch "${FILESDIR}"/${PN}-2.10.9-remove-execinfo_h.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-ld-is-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_ruby23]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
- elif 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)"
- else
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
- fi
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
- #
- # FTL_JIT requires llvm
- #
- # opengl needs to be explicetly handled, bug #576634
-
- local opengl_enabled
- if use opengl || use gles2; then
- opengl_enabled=ON
- else
- opengl_enabled=OFF
- fi
-
- local mycmakeargs=(
- $(cmake-utils_use_enable aqua QUARTZ_TARGET)
- $(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 gnome-keyring CREDENTIAL_STORAGE)
- $(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 nsplugin PLUGIN_PROCESS_GTK2)
- $(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)
- -DENABLE_OPENGL=${opengl_enabled}
- -DCMAKE_BUILD_TYPE=Release
- -DPORT=GTK
- ${ruby_interpreter}
- )
- if tc-ld-is-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"
- use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
similarity index 84%
rename from net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
index 05127ab..3184cc7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI="6"
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
+inherit autotools check-reqs 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"
@@ -16,12 +15,12 @@ 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="amd64 ~arm ~mips ~ppc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
+IUSE="aqua coverage debug +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
# bugs 372493, 416331
REQUIRED_USE="
- geoloc? ( introspection )
+ geolocation? ( introspection )
gles2? ( egl )
introspection? ( gstreamer )
webgl? ( ^^ ( gles2 opengl ) )
@@ -33,6 +32,8 @@ REQUIRED_USE="
# Aqua support in gtk3 is untested
# gtk2 is needed for plugin process support
# gtk3-3.10 required for wayland
+# gtk3-3.20 is needed to ensure we get fixed theming:
+# https://bugzilla.gnome.org/show_bug.cgi?id=757503
RDEPEND="
dev-db/sqlite:3=
>=dev-libs/glib-2.36:2
@@ -47,13 +48,13 @@ RDEPEND="
>=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/gtk+-3.20.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 )
+ geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
gles2? ( media-libs/mesa[gles2] )
gnome-keyring? ( app-crypt/libsecret )
gstreamer? (
@@ -90,7 +91,7 @@ DEPEND="${RDEPEND}
>=sys-devel/make-3.82-r4
virtual/pkgconfig
- geoloc? ( dev-util/gdbus-codegen )
+ geolocation? ( dev-util/gdbus-codegen )
introspection? ( jit? ( sys-apps/paxctl ) )
test? (
dev-lang/python:2.7
@@ -140,7 +141,7 @@ 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
+ use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
# Leave optimization level to user CFLAGS
# FORTIFY_SOURCE is enabled by default in Gentoo
@@ -149,29 +150,35 @@ src_prepare() {
-i Source/autotools/SetupCompilerFlags.m4 || die
# bug #459978, upstream bug #113397
- epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
+ eapply "${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
+ eapply "${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
+ eapply "${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
+ eapply "${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
+ eapply "${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
+ eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
+
+ # https://bugs.webkit.org/show_bug.cgi?id=156510
+ eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
+
+ # https://bugs.webkit.org/show_bug.cgi?id=159124#c1
+ eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
# musl patches
- epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
- epatch "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.patch
+ eapply "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
+ eapply "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.patch
AT_M4DIR=Source/autotools eautoreconf
@@ -226,7 +233,7 @@ src_configure() {
$(use_enable coverage) \
$(use_enable debug) \
$(use_enable egl) \
- $(use_enable geoloc geolocation) \
+ $(use_enable geolocation) \
$(use_enable gles2) \
$(use_enable gnome-keyring credential_storage) \
$(use_enable gstreamer video) \
@@ -245,12 +252,6 @@ src_configure() {
${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"
@@ -258,10 +259,9 @@ src_test() {
# 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
+ virtx emake -j1 check
}
src_install() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
similarity index 89%
rename from net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
index 32ad6ed..abb40d8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI="6"
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
+inherit autotools check-reqs 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"
@@ -16,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
# bugs 372493, 416331
@@ -131,7 +130,7 @@ 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
+ use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
# Leave optimization level to user CFLAGS
# FORTIFY_SOURCE is enabled by default in Gentoo
@@ -140,25 +139,31 @@ src_prepare() {
-i Source/autotools/SetupCompilerFlags.m4 || die
# bug #459978, upstream bug #113397
- epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
+ eapply "${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
+ eapply "${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
+ eapply "${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
+ eapply "${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
+ eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
+
+ # https://bugs.webkit.org/show_bug.cgi?id=156510
+ eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
+
+ # https://bugs.webkit.org/show_bug.cgi?id=159124#c1
+ eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
# musl patches
- epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
- epatch "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.patch
+ eapply "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
+ eapply "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.patch
AT_M4DIR=Source/autotools eautoreconf
@@ -231,12 +236,6 @@ src_configure() {
${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"
@@ -244,10 +243,9 @@ src_test() {
# 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
+ virtx emake -j1 check
}
src_install() {
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2016-06-01 13:34 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2016-06-01 13:34 UTC (permalink / raw
To: gentoo-commits
commit: 36fd4098dcc93086d39c1e3fcef4c462173e09a6
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 1 13:36:39 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 13:36:39 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=36fd4098
net-libs/webkit-gtk: update to keep up with main tree
net-libs/webkit-gtk/Manifest | 12 +++----
...h => webkit-gtk-2.10.9-remove-execinfo_h.patch} | 19 +++++------
...-gtk-2.10.7.ebuild => webkit-gtk-2.10.9.ebuild} | 17 ++++++++--
...9-r200.ebuild => webkit-gtk-2.4.10-r200.ebuild} | 38 +++++-----------------
...t-gtk-2.4.9.ebuild => webkit-gtk-2.4.10.ebuild} | 36 +++++---------------
5 files changed, 46 insertions(+), 76 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 9a6bcec..68b9afd 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,6 +1,6 @@
AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818
AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
-AUX webkit-gtk-2.10.7-remove-execinfo_h.patch 1364 SHA256 ba69f07fcc325efc8b97bf828c2fbc145feeaa71b49195ccf08277d3ed6e185b SHA512 0738518490aedd5fe4dbec4cd21c3e67cb93dcbefe41fb621f66f4550a6439a370b61e836a6b3aea3709cd5ccb7643f2eac124b98cf069202b48f21d63f8dfb1 WHIRLPOOL e49766772e8a1cfa5f844dfe0024a238bedab42a977a5036476b0e02eb013b0785a6a744c5adca4eda46d8728ce7b018d970bde99d98377047ef2d118ab91e40
+AUX webkit-gtk-2.10.9-remove-execinfo_h.patch 1239 SHA256 71ce90e34c6ebfd4836e1f7a3307204fd0432c18e592ce6ec1ead7ece12afbee SHA512 1496cbc7b111f720f852d2dfee77214d43b7e3fca804dbbd7704a335a6f5e09d2fd38724d212a4aa7987ba9bf0d35b838b9473e69a890802be862fd003c8e9ca WHIRLPOOL 17a19a4bec478ddb9558918c58c39d023e59196b6bc286e638aec7f7bc80d6ac1a249dd94547361d8ad821a8338ec8e0ea64b8bd3ae1fb9deff3f055701a0d6e
AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
@@ -12,9 +12,9 @@ AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d
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.10.7.tar.xz 10988396 SHA256 990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512 f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b WHIRLPOOL 7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328
-DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
-EBUILD webkit-gtk-2.10.7.ebuild 7954 SHA256 ace3c75363b69437e233abf9bff0c8e46db6b063135de9f10e532f9f7afdded5 SHA512 048faf1b48b3b3c337f2ef4fec480a18c808d0aedd3f7b9ce0b510c77f49453244cca210b004251f480c97ff7f0a107da6989fcea7d2c5a1299affabc3e37601 WHIRLPOOL b4f2073784c186c11a106d21c44732a57856e66fc694635bd9ceded5e982106ee88b32d05ded3f7000f01afe3872fe296861429f23df8566a756ad0d03e3b02b
-EBUILD webkit-gtk-2.4.9-r200.ebuild 9355 SHA256 e575d08794b0c8ec2c1282c21c6eb82bb10b8b741924e8596504ff196397ca6b SHA512 8904f1e912bbcb8e817a0fb8343440279a0ec6b72d682d9957b4043492587f40823ee0e15d549377a4974b10bd5f7bc7579c9e41d268f749856e7bb1603549dc WHIRLPOOL cefbee06f3fbed09655107bdb58abdeda4da0d048111ece027277ebd19cc65c90de1f668836b40f28bfd94a04e20177a96ea1c5b1aeaee157c4178e20f492885
-EBUILD webkit-gtk-2.4.9.ebuild 9834 SHA256 eaa6df05bbf906160c3864d181c7f582a54a2804a9d5400e462f56eaf54ce037 SHA512 c7436ea640c76f118ed1794fe0fc769ce10a0b57c9d92932f3da10cd57d33f085f5656b2b86e3fe3f2bd6992c9b88591f53eede9de6f61d57531f3f61eab8e2d WHIRLPOOL 1759d9515453ded2058bf1c8cae35e91ddc4882706eb7f83187a641c0217d7519fe1df18f73d6b3a76579d36cac0e2dfbade9723b0f7775c1b55eeae22240d20
+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
+EBUILD webkit-gtk-2.10.9.ebuild 8215 SHA256 bbed605d7e11fe85643355306d44c4ef269038e74c1fe1613fe0a2da740e0f95 SHA512 fc4affe4c157aa5c119d2b33f6a0436fa9fd41ced3020cc31eafdbe4181c27c5d51f2a5a8395ee7586d4820223af719ada02941bee8087d910e7c7fe87ed1962 WHIRLPOOL eb092102c34cf5770649bf5af05f227b67fe31d20820a9db2ce0b43a68754c7ec5e565f0c730c6a84f369437b77a814cbb79d6ba593d6f8225f8db41095a4c71
+EBUILD webkit-gtk-2.4.10-r200.ebuild 8475 SHA256 145d3cf546353f92325f3d98752903231867a56a6ef59ff8e0191c6e3b959afe SHA512 b1cdaf32976ee41a4acd0f877cf19ef133d979ec618d2d22f1d9d1170f3573fd3f553845a03c4f7b054657aa7f92d959974a6f8d35d150f5545903ecabcfa92f WHIRLPOOL 584c3f2b8942ddfffdff321544c253f698c002d51d0383fb837477f70c8d7196798a6bf9a909dc64bc0bf481875f998fa348e7ed40af8254ded52ec5741570a8
+EBUILD webkit-gtk-2.4.10.ebuild 8845 SHA256 9cdea807cc1dbe3b4c4f62b47de9b19f683fb5826546f892009aa26bb848cb9b SHA512 c615b9b07ec37a9aca81e6a4cb82cba52c24fb26cc22e5ee4f016cc951e922541d1a102e278ef6e69a56e1d62c50d72dca2ec221729a7ea58d677d2cb960930c WHIRLPOOL d099dc2555147efa2145bcad5eff2b61ade60d16b8ce3652ffaf116ad95ca12d939091b679d0b1f58600a0295b3d3deb095b6a5ab9f40fa44725778e5e6ba347
MISC metadata.xml 717 SHA256 0b14a37b119705ad7c50e3857d51674eaade8148fed94caf07ca2afd5282fa58 SHA512 996dbd54e6670cde58d6fca941fd6d1a11a054e42791e1b451005c2c6b5b46d14454869cbc9e4911e5b7c0119b8a04096c95ac7c20f8389ab9cd866c9947b365 WHIRLPOOL 531accd99228e552b04a9644b470db00f9c633021a438bc1895e517e848ea73ce807ddb5225df5fd3f74af19b80e86ab83ae83c8254de4a6b246dea3f7cc1803
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch
similarity index 54%
rename from net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch
rename to net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch
index 07705ac..5e661d9 100644
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch
@@ -1,34 +1,31 @@
-diff -Naur webkitgtk-2.10.7.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.10.7/Source/WTF/wtf/Assertions.cpp
---- webkitgtk-2.10.7.orig/Source/WTF/wtf/Assertions.cpp 2016-01-29 16:29:32.000000000 +0000
-+++ webkitgtk-2.10.7/Source/WTF/wtf/Assertions.cpp 2016-03-15 00:12:11.432000000 +0000
-@@ -71,7 +71,8 @@
- #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+diff -Naur webkitgtk-2.10.9.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.10.9/Source/WTF/wtf/Assertions.cpp
+--- webkitgtk-2.10.9.orig/Source/WTF/wtf/Assertions.cpp 2016-03-17 02:48:18.000000000 -0400
++++ webkitgtk-2.10.9/Source/WTF/wtf/Assertions.cpp 2016-06-01 09:31:42.345411637 -0400
+@@ -71,7 +71,7 @@
+ #if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
#include <cxxabi.h>
#include <dlfcn.h>
-#include <execinfo.h>
-+// removed for musl - we need better intelligence here
+//#include <execinfo.h>
#endif
extern "C" {
-@@ -226,7 +227,8 @@
+@@ -226,7 +226,7 @@
void WTFGetBacktrace(void** stack, int* size)
{
- #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+ #if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
- *size = backtrace(stack, *size);
-+// removed for musl - we need better intelligence here
+// *size = backtrace(stack, *size);
#elif OS(WINDOWS)
// The CaptureStackBackTrace function is available in XP, but it is not defined
// in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
-@@ -272,9 +274,10 @@
+@@ -272,9 +272,9 @@
void WTFPrintBacktrace(void** stack, int size)
{
#if USE(BACKTRACE_SYMBOLS)
- char** symbols = backtrace_symbols(stack, size);
- if (!symbols)
- return;
-+// removed for musl - we need better intelligence here
+// char** symbols = backtrace_symbols(stack, size);
+// if (!symbols)
+// return;
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
similarity index 95%
rename from net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
index 647b8dd..57248e3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,6 +22,7 @@ KEYWORDS="amd64 ~arm ~mips ~ppc x86"
IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
# seccomp
+# webgl needs gstreamer, bug #560612
REQUIRED_USE="
geoloc? ( introspection )
gles2? ( egl )
@@ -29,6 +30,7 @@ REQUIRED_USE="
nsplugin? ( X )
webgl? ( ^^ ( gles2 opengl ) )
!webgl? ( ?? ( gles2 opengl ) )
+ webgl? ( gstreamer )
|| ( aqua wayland X )
"
@@ -150,7 +152,7 @@ src_prepare() {
# musl patches
epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
- epatch "${FILESDIR}"/${PN}-2.10.7-remove-execinfo_h.patch
+ epatch "${FILESDIR}"/${PN}-2.10.9-remove-execinfo_h.patch
# https://bugs.gentoo.org/show_bug.cgi?id=564352
epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
@@ -214,6 +216,16 @@ src_configure() {
# should somehow let user select between them?
#
# FTL_JIT requires llvm
+ #
+ # opengl needs to be explicetly handled, bug #576634
+
+ local opengl_enabled
+ if use opengl || use gles2; then
+ opengl_enabled=ON
+ else
+ opengl_enabled=OFF
+ fi
+
local mycmakeargs=(
$(cmake-utils_use_enable aqua QUARTZ_TARGET)
$(cmake-utils_use_enable test API_TESTS)
@@ -233,6 +245,7 @@ src_configure() {
$(cmake-utils_use_find_package egl EGL)
$(cmake-utils_use_find_package opengl OpenGL)
$(cmake-utils_use_enable X X11_TARGET)
+ -DENABLE_OPENGL=${opengl_enabled}
-DCMAKE_BUILD_TYPE=Release
-DPORT=GTK
${ruby_interpreter}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
similarity index 84%
rename from net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
index e5480ae..32ad6ed 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
@@ -5,8 +5,9 @@
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 toolchain-funcs versionator virtualx
+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"
@@ -15,9 +16,9 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="2" # no usable subslot
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
+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 +gstreamer +introspection +jit libsecret +opengl spell +webgl +X"
+IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
# bugs 372493, 416331
REQUIRED_USE="
geoloc? ( introspection )
@@ -51,11 +52,11 @@ RDEPEND="
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 )
- libsecret? ( app-crypt/libsecret )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
opengl? ( virtual/opengl )
spell? ( >=app-text/enchant-0.22:= )
webgl? (
@@ -68,14 +69,8 @@ RDEPEND="
# Need real bison, not yacc
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ ${RUBY_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_ruby23]
- virtual/rubygems[ruby_targets_ruby19]
- )
>=dev-libs/atk-2.8.0
>=dev-util/gtk-doc-am-1.10
>=dev-util/gperf-3.0.1
@@ -144,19 +139,6 @@ src_prepare() {
-e 's/-D_FORTIFY_SOURCE=2//g' \
-i Source/autotools/SetupCompilerFlags.m4 || die
- # 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\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
-# -i Tools/TestWebKitAPI/GNUmakefile.am || die
-
# bug #459978, upstream bug #113397
epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
@@ -217,10 +199,8 @@ src_configure() {
ruby_interpreter="RUBY=$(type -P ruby22)"
elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
ruby_interpreter="RUBY=$(type -P ruby21)"
- elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
- ruby_interpreter="RUBY=$(type -P ruby20)"
else
- ruby_interpreter="RUBY=$(type -P ruby19)"
+ ruby_interpreter="RUBY=$(type -P ruby20)"
fi
# TODO: Check Web Audio support
@@ -234,11 +214,11 @@ src_configure() {
$(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 libsecret credential_storage) \
$(use_enable opengl glx) \
$(use_enable spell spellcheck) \
$(use_enable webgl) \
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
similarity index 85%
rename from net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
index 4e181be..05127ab 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
@@ -5,8 +5,9 @@
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 toolchain-funcs versionator virtualx
+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"
@@ -17,7 +18,7 @@ LICENSE="LGPL-2+ BSD"
SLOT="3/25" # soname version of libwebkit2gtk-3.0
KEYWORDS="amd64 ~arm ~mips ~ppc x86"
-IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
+IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
# bugs 372493, 416331
REQUIRED_USE="
geoloc? ( introspection )
@@ -54,11 +55,11 @@ RDEPEND="
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 )
- libsecret? ( app-crypt/libsecret )
+ 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] )
@@ -76,14 +77,8 @@ RDEPEND="
# Need real bison, not yacc
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ ${RUBY_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_ruby23]
- 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
@@ -153,19 +148,6 @@ src_prepare() {
-e 's/-D_FORTIFY_SOURCE=2//g' \
-i Source/autotools/SetupCompilerFlags.m4 || die
- # 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\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
-# -i Tools/TestWebKitAPI/GNUmakefile.am || die
-
# bug #459978, upstream bug #113397
epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
@@ -230,10 +212,8 @@ src_configure() {
ruby_interpreter="RUBY=$(type -P ruby22)"
elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
ruby_interpreter="RUBY=$(type -P ruby21)"
- elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
- ruby_interpreter="RUBY=$(type -P ruby20)"
else
- ruby_interpreter="RUBY=$(type -P ruby19)"
+ ruby_interpreter="RUBY=$(type -P ruby20)"
fi
# TODO: Check Web Audio support
@@ -248,11 +228,11 @@ src_configure() {
$(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 libsecret credential_storage) \
$(use_enable opengl glx) \
$(use_enable spell spellcheck) \
$(use_enable webgl) \
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
@ 2016-03-15 0:38 Anthony G. Basile
0 siblings, 0 replies; 16+ messages in thread
From: Anthony G. Basile @ 2016-03-15 0:38 UTC (permalink / raw
To: gentoo-commits
commit: 604487515bdb3a80bdeacae697fbb9d55b5d5a04
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 00:27:51 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 00:48:58 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=60448751
net-libs/webkit-gtk: apply musl patches to 2.10.7
net-libs/webkit-gtk/Manifest | 6 +
.../webkit-gtk-2.10.7-remove-execinfo_h.patch | 37 +++
.../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.10.7.ebuild | 267 +++++++++++++++++++++
6 files changed, 375 insertions(+)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 3997772..9080f44 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,6 @@
AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818
AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
+AUX webkit-gtk-2.10.7-remove-execinfo_h.patch 1364 SHA256 ba69f07fcc325efc8b97bf828c2fbc145feeaa71b49195ccf08277d3ed6e185b SHA512 0738518490aedd5fe4dbec4cd21c3e67cb93dcbefe41fb621f66f4550a6439a370b61e836a6b3aea3709cd5ccb7643f2eac124b98cf069202b48f21d63f8dfb1 WHIRLPOOL e49766772e8a1cfa5f844dfe0024a238bedab42a977a5036476b0e02eb013b0785a6a744c5adca4eda46d8728ce7b018d970bde99d98377047ef2d118ab91e40
AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
@@ -8,7 +9,12 @@ AUX webkit-gtk-2.4.4-jpeg-9a.patch 1258 SHA256 bd626ff2df4a44b98b0a82fa3f555a0a2
AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e623a2fd67e80111d624a2b3c01fde2fbbcd64e SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 WHIRLPOOL ba3f9b9dbee12f6dae05db9f343a46fd7d182d377e1a951e1785a5aff9a046d057bbf85821642e948c15a084e69d01054fe5632d7460892b196334adea582e72
AUX webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch 733 SHA256 d447d71943cacdec166f0a65f34258494f70719ba9cd951d5b512902e20200d0 SHA512 580531428c0498e996de358a20a499f36edaaa98a108088c5dde428a997a61e5a55293cf855d652655c193cd5cda8e25723cac360d3983fcd1fbce35aa9b41a0 WHIRLPOOL b68bc94045ef46f5959146b6d14e2e39c9a1e3c7a39a9e7164ece4db1d1fc9f3c846b26af5e7b2b81db5ee82913b4018097367c6843a8b41758316cd27371bcc
AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d4f29417e3d4ebd619e183535368175c473485c2dd SHA512 f4a0647530f29bed5fdbf0fcec5d52c6064a13c00715fb6fb490490dee29dac87bb2b1d9ab35ce2bf7b9eb2da262cf5bb07b7c84f82f84cfab784a61f163811e WHIRLPOOL f18be67ef26051ebe271481c3444761c604a40fcda9679f3778cccbc3513f8501a6c3ea9b43fa1b3c3eaa04ca08585e62d8b3a27185358dc69c612ef8eab8364
+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.10.7.tar.xz 10988396 SHA256 990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512 f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b WHIRLPOOL 7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328
DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
+EBUILD webkit-gtk-2.10.7.ebuild 8050 SHA256 d680876d078bbe06d157e6b1ad870197a2ca41709feb10d41406dc4b0cb776b5 SHA512 190bd43e37ebb4f612aa0ae2ee236590a1f20c092dd5afc2f9552dbcf8dd2a9db03da66e10baa46cca61660e71623ee56c36d33b4155e9f238e11828b361d204 WHIRLPOOL d8ae2331d0f9c57f9191b8e697a74b7fd2639767eecdc4a50e0aeb344085b2b1739c6ee3a912b3b3b96151cbac0085857786eec6d37b71f70cfae132ee74723f
EBUILD webkit-gtk-2.4.9-r200.ebuild 9355 SHA256 e575d08794b0c8ec2c1282c21c6eb82bb10b8b741924e8596504ff196397ca6b SHA512 8904f1e912bbcb8e817a0fb8343440279a0ec6b72d682d9957b4043492587f40823ee0e15d549377a4974b10bd5f7bc7579c9e41d268f749856e7bb1603549dc WHIRLPOOL cefbee06f3fbed09655107bdb58abdeda4da0d048111ece027277ebd19cc65c90de1f668836b40f28bfd94a04e20177a96ea1c5b1aeaee157c4178e20f492885
EBUILD webkit-gtk-2.4.9.ebuild 9834 SHA256 eaa6df05bbf906160c3864d181c7f582a54a2804a9d5400e462f56eaf54ce037 SHA512 c7436ea640c76f118ed1794fe0fc769ce10a0b57c9d92932f3da10cd57d33f085f5656b2b86e3fe3f2bd6992c9b88591f53eede9de6f61d57531f3f61eab8e2d WHIRLPOOL 1759d9515453ded2058bf1c8cae35e91ddc4882706eb7f83187a641c0217d7519fe1df18f73d6b3a76579d36cac0e2dfbade9723b0f7775c1b55eeae22240d20
MISC metadata.xml 717 SHA256 0b14a37b119705ad7c50e3857d51674eaade8148fed94caf07ca2afd5282fa58 SHA512 996dbd54e6670cde58d6fca941fd6d1a11a054e42791e1b451005c2c6b5b46d14454869cbc9e4911e5b7c0119b8a04096c95ac7c20f8389ab9cd866c9947b365 WHIRLPOOL 531accd99228e552b04a9644b470db00f9c633021a438bc1895e517e848ea73ce807ddb5225df5fd3f74af19b80e86ab83ae83c8254de4a6b246dea3f7cc1803
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch
new file mode 100644
index 0000000..07705ac
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch
@@ -0,0 +1,37 @@
+diff -Naur webkitgtk-2.10.7.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.10.7/Source/WTF/wtf/Assertions.cpp
+--- webkitgtk-2.10.7.orig/Source/WTF/wtf/Assertions.cpp 2016-01-29 16:29:32.000000000 +0000
++++ webkitgtk-2.10.7/Source/WTF/wtf/Assertions.cpp 2016-03-15 00:12:11.432000000 +0000
+@@ -71,7 +71,8 @@
+ #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+-#include <execinfo.h>
++// removed for musl - we need better intelligence here
++//#include <execinfo.h>
+ #endif
+
+ extern "C" {
+@@ -226,7 +227,8 @@
+ void WTFGetBacktrace(void** stack, int* size)
+ {
+ #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+- *size = backtrace(stack, *size);
++// removed for musl - we need better intelligence here
++// *size = backtrace(stack, *size);
+ #elif OS(WINDOWS)
+ // The CaptureStackBackTrace function is available in XP, but it is not defined
+ // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
+@@ -272,9 +274,10 @@
+ void WTFPrintBacktrace(void** stack, int size)
+ {
+ #if USE(BACKTRACE_SYMBOLS)
+- char** symbols = backtrace_symbols(stack, size);
+- if (!symbols)
+- return;
++// removed for musl - we need better intelligence here
++// char** symbols = backtrace_symbols(stack, size);
++// if (!symbols)
++// return;
+ #endif
+
+ for (int i = 0; i < size; ++i) {
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 <tetromino@gentoo.org>
+
+ 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.10.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
new file mode 100644
index 0000000..3b78e34
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
@@ -0,0 +1,267 @@
+# 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 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit check-reqs cmake-utils 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="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
+# seccomp
+
+REQUIRED_USE="
+ geoloc? ( introspection )
+ gles2? ( egl )
+ introspection? ( gstreamer )
+ nsplugin? ( X )
+ webgl? ( ^^ ( gles2 opengl ) )
+ !webgl? ( ?? ( gles2 opengl ) )
+ || ( aqua 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
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+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
+
+ aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+ 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
+ >=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+ nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+ 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/libXcomposite
+ x11-libs/libXrender
+ x11-libs/libXt )
+"
+# Control knob is private and set to off
+# seccomp? ( sys-libs/libseccomp )
+
+# 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-libs/hyphen
+ >=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.9 >=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" ]] ; then
+ if 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.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+ fi
+
+ if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
+ die 'The active compiler needs to be gcc 4.9 (or newer)'
+ fi
+ 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
+
+ # musl patches
+ epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
+ epatch "${FILESDIR}"/${PN}-2.10.7-remove-execinfo_h.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-ld-is-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_ruby23]"; then
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+ elif 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)"
+ else
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+ fi
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # FTL_JIT requires llvm
+ local mycmakeargs=(
+ $(cmake-utils_use_enable aqua QUARTZ_TARGET)
+ $(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 gnome-keyring CREDENTIAL_STORAGE)
+ $(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 nsplugin PLUGIN_PROCESS_GTK2)
+ $(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
+ ${ruby_interpreter}
+ )
+ if tc-ld-is-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"
+ use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2021-06-07 13:24 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-23 14:57 [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2021-06-07 13:24 Jory Pratt
2020-12-04 19:12 Jory Pratt
2020-08-01 12:22 Anthony G. Basile
2020-03-26 23:51 Anthony G. Basile
2019-10-21 21:50 Jory Pratt
2019-09-02 15:01 Anthony G. Basile
2018-06-17 9:43 Anthony G. Basile
2017-11-22 4:57 Aric Belsito
2017-10-23 20:49 Aric Belsito
2017-05-13 11:26 Anthony G. Basile
2017-05-08 23:30 Aric Belsito
2017-02-03 0:47 Aric Belsito
2017-02-03 0:44 Aric Belsito
2016-06-01 13:34 Anthony G. Basile
2016-03-15 0:38 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox