diff options
Diffstat (limited to 'net-libs/webkit-gtk')
| -rw-r--r-- | net-libs/webkit-gtk/Manifest | 8 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch | 14 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch | 21 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild | 2 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild (renamed from net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild) | 65 |
5 files changed, 30 insertions, 80 deletions
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 77a3f6bb91bc..0f152b4d14ab 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,7 +1,5 @@ -AUX 2.20.3-jsc-build-fixes.patch 611 BLAKE2B 63491442c9836873401fc58a2a2ed44d4f24fe52d67f21f98cc11a21e19572763cc6e0d656806cf60e4b2cdb11234ece232baa9619c54d33b69323984c573cb2 SHA512 90361785e3f562f55e37315600ab9f096804e755d0dbfa56eafd2fcb9448639467c6a707c8bf641cfa714489a8819bde706b9fffeb0229aca82c3f135e886725 -AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 BLAKE2B 4eb51aefe08ba9c2bef60a9b5f5f68dad98dac259fc2c014b0fd567a45424a30aee9412cd914b0a05745c16df0dd81e553fdf80e15beef5f006408ce78825321 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc -DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029 DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090 -EBUILD webkit-gtk-2.18.6.ebuild 8242 BLAKE2B 1e8058fdf46994b372aabdb0e03bcd19ee95b042cfd6f12b12396273b6f887e2f802a40445426cabe724e5044bbf138209a3cf5dc13027dc21807491b45970ae SHA512 ac334598eae40b438c8504e9d5ba93dd7902b1ee55d79f07a171b7aa78088e2bd2d54cbed7e528e32cc03835e0a027f13244a14a806d350e1861a222457c4ec1 -EBUILD webkit-gtk-2.20.4.ebuild 7855 BLAKE2B a0d932575d5f7ba224db1579469877ec9520d9c0c8d97e0f7f08b162d50ece4e85979ee839845eb7c07b391736e73236844c74ceca33d35e0d3444150575a0eb SHA512 0358d76289f7178aaa8da7684f2715f859390bea803305bff6d966aef86e633ce6e88380faf2054d2c027107f3d9cb35ab31deba8849442663c92671ce79af3c +DIST webkitgtk-2.20.5.tar.xz 16625200 BLAKE2B 1fd803d81df1659fd87a93821413326eb798fe9c21af86deeb92f16b3f8eab14350851db499e79745457b708305d013032769416877660db3d5bc7c6058b13cc SHA512 d92fd079ec2826b2880ae5b2d90795ee3071a331bd7a576230b77b9f67a829ab27f09a9b0241a780f612f4f78ea5cc849e4b3d09285d4903eb600a7a7729c1e7 +EBUILD webkit-gtk-2.20.4.ebuild 7860 BLAKE2B 425c3127e95c99e99a2289fc81d192a5290f2ec4df98a68f0263576d74b47b6b9084bd04fed17ed932bc1a5a13bf4cbd567764677f4244a70f42b66ae496d591 SHA512 78720140f6b08e3e109dd4edd14fbd9990095cbed1379d140173d5426a3cd90febd335e7edd3d80f515c7cb5e5b2f51308c461a85a82845dc6d64323e92228c8 +EBUILD webkit-gtk-2.20.5.ebuild 7881 BLAKE2B ab258b918df65d10a7a3a80654d86f03f8bba4f5506e3f81054a21539bae5cb59c0e550eb22f480210b9f8dc6039e83362dafb83eedaa0cc03e0fa38cb9ea7af SHA512 0820914a1c191cadd33a53caaafdf9d5a3e0274ec8efe296758c76c07594c5c629cb0f9134190155dd1777352a65f82d520286529d296c4e19976ea30756a6d7 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e diff --git a/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch b/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch deleted file mode 100644 index 32ff3a52844f..000000000000 --- a/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/662002 -https://bugs.webkit.org/show_bug.cgi?id=183788 -https://trac.webkit.org/changeset/229282/webkit - -Index: /trunk/Source/JavaScriptCore/CMakeLists.txt -=================================================================== ---- a/Source/JavaScriptCore/CMakeLists.txt (revision 229281) -+++ b/Source/JavaScriptCore/CMakeLists.txt (revision 229282) -@@ -248,4 +248,5 @@ - ) - target_link_libraries(LLIntOffsetsExtractor WTF) -+add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders) - - # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than 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 6c88c49d8b9e..000000000000 --- 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/webkit-gtk-2.20.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild index 6a241552a2b4..b7b46a2a59f4 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.20.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 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~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" diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild index 52bf62e9d38e..67e35f0c639a 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild @@ -4,9 +4,9 @@ EAPI=6 CMAKE_MAKEFILE_GENERATOR="ninja" PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby22 ruby23 ruby24" +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 +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" @@ -15,19 +15,18 @@ 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 ~ppc ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-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 ) + gles2? ( egl !opengl ) introspection? ( gstreamer ) nsplugin? ( X ) - webgl? ( ^^ ( gles2 opengl ) ) - !webgl? ( ?? ( gles2 opengl ) ) - webgl? ( gstreamer ) + webgl? ( gstreamer + || ( gles2 opengl ) ) wayland? ( egl ) || ( aqua wayland X ) " @@ -41,7 +40,7 @@ RESTRICT="test" # 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) RDEPEND=" - >=x11-libs/cairo-1.10.2:= + >=x11-libs/cairo-1.10.2:=[X?] >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= @@ -59,6 +58,7 @@ RDEPEND=" >=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:= ) @@ -69,10 +69,9 @@ RDEPEND=" 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.10:1.0[opengl?,egl?] ) + >=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] ) X? ( - x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage @@ -84,10 +83,8 @@ RDEPEND=" egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) - opengl? ( virtual/opengl - x11-libs/cairo[opengl] ) + opengl? ( virtual/opengl ) webgl? ( - x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) " @@ -109,16 +106,16 @@ DEPEND="${RDEPEND} dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp + virtual/perl-JSON-PP 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 ) ) " +# test? ( +# dev-python/pygobject:3[python_targets_python2_7] +# x11-themes/hicolor-icon-theme +# jit? ( sys-apps/paxctl ) ) S="${WORKDIR}/${MY_P}" @@ -150,8 +147,6 @@ pkg_setup() { } src_prepare() { - # https://bugs.gentoo.org/show_bug.cgi?id=555504 - eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch cmake-utils_src_prepare gnome2_src_prepare } @@ -190,17 +185,17 @@ src_configure() { # 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="" - - 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 + 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? @@ -216,14 +211,6 @@ src_configure() { 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) @@ -237,6 +224,7 @@ src_configure() { -DENABLE_JIT=$(usex jit) -DUSE_LIBNOTIFY=$(usex libnotify) -DUSE_LIBSECRET=$(usex gnome-keyring) + -DUSE_WOFF2=ON -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin) -DENABLE_SPELLCHECK=$(usex spell) -DENABLE_WAYLAND_TARGET=$(usex wayland) @@ -245,7 +233,6 @@ src_configure() { $(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} |