From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E36EF1396D9 for ; Mon, 23 Oct 2017 17:55:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 372B42BC02D; Mon, 23 Oct 2017 17:55:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09E572BC02D for ; Mon, 23 Oct 2017 17:55:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 88A9133C27B for ; Mon, 23 Oct 2017 17:54:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C484316 for ; Mon, 23 Oct 2017 17:54:58 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1508781225.9fe519f6045ff8b27dd6cfe31f8bc57e83f5f1fe.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/ X-VCS-Repository: proj/musl X-VCS-Files: net-libs/webkit-gtk/Manifest net-libs/webkit-gtk/metadata.xml net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild X-VCS-Directories: net-libs/webkit-gtk/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: 9fe519f6045ff8b27dd6cfe31f8bc57e83f5f1fe X-VCS-Branch: master Date: Mon, 23 Oct 2017 17:54:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 78c86c37-fa79-41a1-80d2-beb6465a766a X-Archives-Hash: 9892bc3b67a36b6b2cf3548a1bd2c7ee commit: 9fe519f6045ff8b27dd6cfe31f8bc57e83f5f1fe Author: Aric Belsito gmail com> AuthorDate: Mon Oct 23 17:53:45 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Mon Oct 23 17:53:45 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9fe519f6 net-libs/webkit-gtk: version bump to 2.18.1 net-libs/webkit-gtk/Manifest | 6 +- net-libs/webkit-gtk/metadata.xml | 1 + ...-gtk-2.16.5.ebuild => webkit-gtk-2.18.1.ebuild} | 99 ++++++++++------------ 3 files changed, 51 insertions(+), 55 deletions(-) diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index cd9369b..dfbbb8e 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -14,11 +14,11 @@ 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 -DIST webkitgtk-2.16.5.tar.xz 14655656 SHA256 8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4 SHA512 9d7573da44267edcd83b4918e5f1e0516eb8d84c58ac6b239a2328448f96b39067b62bcd18e7d730ec0ef44b9f4b0a03712d17f9f465f00346a1f45a0a4ebb10 WHIRLPOOL 76fc7cc7dfb326d3600396bc1e486acd26cca1eda779d9a06ad123c60f8cba9eee162b626abe95a09c9e8ed0b308f341a818ebf833f6b902812c644e5925aacd 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.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3 -EBUILD webkit-gtk-2.16.5.ebuild 8479 SHA256 e8e9654be98cad921754a3b789bb71c9aee06f0fe6d65c77c57d35c2881c2ef1 SHA512 a64d237d9e011b78ce8e05158489aef83bc9d761ca3897d549f04cacf7377e44e4be5ef69182d3c81b6a0406b575d21d7866b3f5811fed47476476706a660a0f WHIRLPOOL c5d537a8e1247f82b83f6bea4a6c540af2fcb830b021d710b1cd831b9ae558058ed8abb0089aafa1f6527086d8069b3f222d7c2f7a50253d13c82814fba10b20 EBUILD webkit-gtk-2.16.6.ebuild 8479 SHA256 e8e9654be98cad921754a3b789bb71c9aee06f0fe6d65c77c57d35c2881c2ef1 SHA512 a64d237d9e011b78ce8e05158489aef83bc9d761ca3897d549f04cacf7377e44e4be5ef69182d3c81b6a0406b575d21d7866b3f5811fed47476476706a660a0f WHIRLPOOL c5d537a8e1247f82b83f6bea4a6c540af2fcb830b021d710b1cd831b9ae558058ed8abb0089aafa1f6527086d8069b3f222d7c2f7a50253d13c82814fba10b20 +EBUILD webkit-gtk-2.18.1.ebuild 8341 SHA256 b676787860e9f70db0bdd911a1124fa12b686ac2894338207de9565bcd3ad75b SHA512 3e45ae58f73765f2be0b45a1873efcb9a6cdb883c8606595b0b4ef9a7606d36e8f780c34f6c2e68196fcb71aecb5b1a9085b91a17a66c859aaf4a77f4e3f4367 WHIRLPOOL d64cbda15ae7d499a743dd112cee2cd5d43720286a573a7600ec9b38503760ce95e64403fa751db36f12bb1d11f5fdc5b343d39043d56b7bf752d550e0139ace 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 +MISC metadata.xml 771 SHA256 b59662217120ef1a7edb3454ef844a0f53a0e585ea294a545b821dc0b20c88be SHA512 a4f15ea6644bf827f15628917d7af57f6569a2273cdf1246d468af95ab776ffe89fa305f842c869ad75c2b9a9480c4d5bc0e00732952ded75607de7ed9695236 WHIRLPOOL 78368036e7299c5ee0549798aa9a0130ea5f8287b151b8a1fe252c57b2d5d025cc307763a82c017d3216bfd0a204d1167e5a5c80cc5139d8f7ecf7dddc6d627c diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml index 2aec057..9a96619 100644 --- a/net-libs/webkit-gtk/metadata.xml +++ b/net-libs/webkit-gtk/metadata.xml @@ -11,6 +11,7 @@ Enable geolocation support through app-misc/geoclue Enable geolocation support through app-misc/geoclue Enable GLESv2 support + Enable full nsplugin support (GTK2 plugins) Build support for the WebGL HTML API using virtual/opengl diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild similarity index 87% rename from net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild rename to net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild index 2b3f210..caf4f68 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild @@ -4,7 +4,7 @@ EAPI=6 CMAKE_MAKEFILE_GENERATOR="ninja" PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +USE_RUBY="ruby22 ruby23 ruby24" inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx @@ -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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +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" @@ -36,56 +36,60 @@ REQUIRED_USE=" # 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 +# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) 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 + >=x11-libs/cairo-1.10.2:= + >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 + >=dev-libs/libgcrypt-1.6.0:0= + >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[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/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] ) + >=dev-libs/glib-2.40:2 + >=dev-libs/libxslt-1.1.7 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:= + >=dev-libs/libgcrypt-1.7.0:0= + nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) + spell? ( >=app-text/enchant-0.22:= ) 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:= ) + >=media-libs/gst-plugins-bad-1.10:1.0[opengl?] ) + + X? ( + x11-libs/cairo[X] + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXrender + x11-libs/libXt ) + libnotify? ( x11-libs/libnotify ) - nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) + dev-libs/hyphen + + egl? ( media-libs/mesa[egl] ) + gles2? ( media-libs/mesa[gles2] ) 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 @@ -93,9 +97,8 @@ RDEPEND=" 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-lang/perl-5.10 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 @@ -121,18 +124,6 @@ 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 @@ -158,6 +149,15 @@ pkg_setup() { 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 + # musl and jit + eapply "${FILESDIR}"/${PN}-2.14.3-musl.patch + cmake-utils_src_prepare + gnome2_src_prepare +} + src_configure() { # Respect CC, otherwise fails on prefix #395875 tc-export CC @@ -189,11 +189,6 @@ src_configure() { # append-ldflags "-Wl,--reduce-memory-overheads" # fi - # older glibc needs this for INTPTR_MAX, bug #533976 - if has_version "