Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/
Date: Sat, 11 Feb 2017 19:23:57
Message-Id: 1486841004.8419b8061ab9a8ea52c990132e111b86b027aec0.lluixhi@gentoo
1 commit: 8419b8061ab9a8ea52c990132e111b86b027aec0
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Sat Feb 11 19:23:24 2017 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Sat Feb 11 19:23:24 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8419b806
7
8 net-libs/webkit-gtk: version bump to 2.14.4
9
10 net-libs/webkit-gtk/Manifest | 4 +--
11 ...-gtk-2.14.3.ebuild => webkit-gtk-2.14.4.ebuild} | 34 ++++++++++------------
12 2 files changed, 18 insertions(+), 20 deletions(-)
13
14 diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
15 index 4eae739..53b869d 100644
16 --- a/net-libs/webkit-gtk/Manifest
17 +++ b/net-libs/webkit-gtk/Manifest
18 @@ -14,9 +14,9 @@ AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d
19 AUX webkit-gtk-2.8.5-fix-alpha-build.patch 914 SHA256 aa6617505fe9342153ba9442ea109d880ca6c3315777c57ab599f67515e2a9f7 SHA512 c3599c21dbcc709cf1bbc56eafdff8f8d30d65732fff73e601a828b397523d9a0cec96a4e7940ad1b4b3d9b4711f6d5f2935dcd34cac9adec63b73401638fd5e WHIRLPOOL 68a39ccf49e7719393f14cd5d53497148527bd697b010378bdec4cdefb21c5fc7ce5081ce10b412c61390a82e45fa44d9d34aa7f223c51ad15eb1d0288ccbe60
20 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82
21 AUX webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch 880 SHA256 411a4238c2e863b60744287ad645f1e3e0cddd33e895f4dfb1e1c5cfd9f48765 SHA512 7150400387f5edd3a647359ef1d864634c25d0a7dad043c1b0734fb44d133f59bbc0ce065e59bc3abab0082272ac54c1b40752e06041e5e36c11f502a9734a62 WHIRLPOOL 470ea2f6228878ddae55cec72b667f14f56d5f7017ea1cce123dcc5da41dd3fd589214b722e5a85bd81f2a14445a759c55366826b82e3801d8e40ef2ba9c6826
22 -DIST webkitgtk-2.14.3.tar.xz 13962776 SHA256 0bead450a4c92024f09008725bb3e8c3830a32c7e2983d566368c4fede9e106c SHA512 b530b84f238230f29462ef599ffd1b9a9458690ba03a78d09126bf4c4ab37b4dfb477da7c364d2446cc259720ff4743112672ebf7888b8e3ff2c8fc1271fda57 WHIRLPOOL 560b4c818ca6271eca72a31c65c11b0c42269a125e68dfac7932f40e6d108cff325e5340d6040889f429b0e6b978a2a6279432f23a0c8956af02e6ece8a61ff8
23 +DIST webkitgtk-2.14.4.tar.xz 13956660 SHA256 d1ae2df51dd4ee44b9b89421a436ef71062816308738c3712ecf4bec3ccbe3ac SHA512 12b5332a3879c2b240a5ae0886a25cab9ae5bc35b983f3decef9e203014e853a01eeab25c40a65f2982a8d23bccc7262ee84a9709511ddacfb73a96f769b58e4 WHIRLPOOL a5fe62ad3db45bcf80b9e29ba042200c48d3f865c42064a5931d61823a481e77d56f7108a89043313fb5aaa4f14add9ddb518d6babe5ea5a4a7a9149af9f9e9a
24 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
25 -EBUILD webkit-gtk-2.14.3.ebuild 8558 SHA256 948c02462aee8e42db2d040c3e3c47079538935e99274e588064b6484b24c398 SHA512 0918411af48f6332925a3b2c3470273d7f6d586db94a065a34a899ed25635069c4559bacf3297d777779ed795dcb4360fa75f56ae7fcb2abecb0322e141192ae WHIRLPOOL 8df6af74418c8b595194dff849087bd8747062c586ace1ca76b1525d002bcc7c5fa63275bb536af9d75e405fcb613583b5b502e684b45bc41d18a9bf7fe4044c
26 +EBUILD webkit-gtk-2.14.4.ebuild 8501 SHA256 3cb5b835d6be0cd513eafdbdb4b1144e16ad72007c93a193d33a6e32ba103788 SHA512 d352da2fdb7030ae8929ba12b1f1078c2bc9342f7dd0007ad57d146e8a0f4ba842324c241584e7437e937c52d1803fe3a4e1928815f417bb24bca7ea8dafa991 WHIRLPOOL 99eda952c97bed8ec2c64d0f0070e4010106a03a3694efa49498ce79e17a320b2e06f3d69b53ec1baedd7c446498df91abe1206a1354d614583865ba5bd38371
27 EBUILD webkit-gtk-2.4.11-r1.ebuild 9123 SHA256 6fc62f471fe028d8e0a2fe0a130dc53833f62c49ab7136dbc446dd290b4b71ce SHA512 5e12f7febbd297859e6d9fa709efbdfe440b5d7900d70ee1e81479313bfabd5583b6c1a68d912748df02af2d1f430fac63382ecb92a9986cbb9841602294b5c8 WHIRLPOOL f9d46ac0776142733ee7d2fe5907acaa265198f6bc1334e74c8c6f7fecece8545de9f620d15d00b7f8aa3225e0d325ace4af58360145d3f9f8bd20a4ed74a067
28 EBUILD webkit-gtk-2.4.11-r200.ebuild 8530 SHA256 e579be98b8fba274c974019ac867e2a2fdefba5d4b7e4419c324f1eae74b7a5d SHA512 dbf7e7e1dffc157be18602e0e1bda57297f30c5a1f00862736067d6fee8573c1711f027bab07a698a1cd382a6f6d825327deed7274930a098f416e77c8d05371 WHIRLPOOL ec612bb5db541cdd866227f09281f63dbf9e157eb485c8ce8e87f9664ef3213750958f0ba13f3a87cfe641b3c6f1972ea15a9955d2293e101cf8b466dea10aad
29 MISC metadata.xml 634 SHA256 48f0a29437afb03701f60011476eb2ad74683d918b69c6963e16f92b763bb0de SHA512 36bcb7965d4bf4b61d9399c794d4f4a438152bf6338ef68cfd6a04f8c94351b35f1cb09172fb4eee4db9b072e0984420ee976031e2c27963fe0390e079494ba8 WHIRLPOOL e14b1f0070ff39f026b1c406718d68f2ccffe4c4db7bf5afe16c658cc1837cb3b29820868b2e9617beb37442eab7ac2f9d8340f55a763bc5ee8ebe1a2065c694
30
31 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild
32 similarity index 95%
33 rename from net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild
34 rename to net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild
35 index e9c4089..db6d382 100644
36 --- a/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild
37 +++ b/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild
38 @@ -16,7 +16,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
39
40 LICENSE="LGPL-2+ BSD"
41 SLOT="4/37" # soname version of libwebkit2gtk-4.0
42 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
43 +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
44
45 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
46
47 @@ -118,6 +118,21 @@ S="${WORKDIR}/${MY_P}"
48
49 CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
50
51 +PATCHES=(
52 + # https://bugs.gentoo.org/show_bug.cgi?id=555504
53 + "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
54 +
55 + # https://bugs.gentoo.org/show_bug.cgi?id=564352
56 + # https://bugs.webkit.org/show_bug.cgi?id=167283
57 + "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
58 +
59 + # https://bugs.webkit.org/show_bug.cgi?id=148379
60 + "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
61 +
62 + # musl and jit
63 + "${FILESDIR}"/${PN}-2.14.3-musl.patch
64 +)
65 +
66 pkg_pretend() {
67 if [[ ${MERGE_TYPE} != "binary" ]] ; then
68 if is-flagq "-g*" && ! is-flagq "-g*0" ; then
69 @@ -143,23 +158,6 @@ pkg_setup() {
70 python-any-r1_pkg_setup
71 }
72
73 -src_prepare() {
74 - # https://bugs.gentoo.org/show_bug.cgi?id=555504
75 - eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
76 -
77 - # https://bugs.gentoo.org/show_bug.cgi?id=564352
78 - # https://bugs.webkit.org/show_bug.cgi?id=167283
79 - eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
80 -
81 - # https://bugs.webkit.org/show_bug.cgi?id=148379
82 - eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
83 -
84 - # musl and jit
85 - eapply "${FILESDIR}"/${PN}-2.14.3-musl.patch
86 -
87 - gnome2_src_prepare
88 -}
89 -
90 src_configure() {
91 # Respect CC, otherwise fails on prefix #395875
92 tc-export CC