diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-08-09 21:30:54 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-09 21:30:54 +0100 |
| commit | 8e5dcbcd9c97dcecc17992eff0e8d01e5c83ade2 (patch) | |
| tree | 72b9af89b84e219b09772e3bf824abbc801ad0e0 /net-libs/webkit-gtk | |
| parent | a2740fd9a512436fd84baef922a0a24c4b7417d9 (diff) | |
gentoo auto-resync : 09:08:2023 - 21:30:54
Diffstat (limited to 'net-libs/webkit-gtk')
5 files changed, 55 insertions, 3 deletions
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index dddba08368e0..744aff13209a 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,3 +1,4 @@ +AUX 2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch 1059 BLAKE2B de9edffeb14808fc7b04339af660343e8faeb599254157cd31cca0ef7b012526c9d27e44fbb8c27881c3836d80b65493081fd314e891cd29af147242b4a863b2 SHA512 b7ece6ebd90cf6c04e26cae1a809d7ec3925405a17b709809648b216426d19bbacdd6810390927622f965c334a220c4614a98fe38514246cf445a415859bd2bd DIST webkitgtk-2.40.3.tar.xz 40064488 BLAKE2B b88b3d9bb6729de8a1b667575acbc9e42c39a222c191ef666f1a58fc593047de1530c597fc2cbc657da845f6262bd4014995fea0cd9776ef60b931769a89594d SHA512 2b10d36427c6cf44c66bb9ddb166363dfc34e23c9b6095eb457d61514298103487a7e80096ead9e653da1b4c0db42613c3a83aa28b19298ec62f50da289eb42e DIST webkitgtk-2.40.4.tar.xz 40065340 BLAKE2B a6bab5ede61d85d93c61f70222156123ebbe8d352d00004e9aa317c3902745530676f40c9caef93485d2e0c227882554623dd4bee6343360bb914c4ccaefb8ad SHA512 3b9118f81d463d4d19d217abd0c4e109a159785bc5effe93188f62bca71f2d3124b232c969710ed958c58519b62cf2753bbdfbd2396e6200cc623a3343cdfc44 DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4fef92a4699b09b87c38e81d56e0da7b5fb20d9e0dbbc32016025e60ca2c6e44d9032c300bfbdc931f4097d5608bb62f SHA512 a8c9f04e971e0464ea39a5d1dacb6251a08c5a851def21bfeb990beebb82d1a2a97e7cfc65ae3ed1f6fe76ac6f6463b1f64a6a2a341d266c381710dd84c4082a @@ -7,7 +8,7 @@ EBUILD webkit-gtk-2.40.3.ebuild 7599 BLAKE2B 635def522e5cfc7126b0fb1962d3097ee1d EBUILD webkit-gtk-2.40.4-r410.ebuild 7875 BLAKE2B aa9ed3ce3537d60f701ab2ede0f4e64a610fbc8bb2a86b491d72542bb99cc67d3f7b9ae01bb2c56ae37cf80ee19eb22a4735a2d54734367e472599792b5212f5 SHA512 dd45395abac1b4842a82ee8a4272f2eb20ee9e885d8a7bcf87aada162f0ce02493a1da62b9cde7be4f0a829b8082ed6ff69f2fab123f8b023fa57b4978161ffe EBUILD webkit-gtk-2.40.4-r600.ebuild 7748 BLAKE2B 11ac66a2b5ba1446b860529f466ca682c8877cfd80aa883bbbb3390cbd603014b204412cfe6a1d80e6c5fe28b56c53904866e16a58fd87027e66b2208b959260 SHA512 5629d7021d56a1c3a387687acbfe322b8761184e01186e4000e65ce063957db4e5dc7194fd8e510056c210eeec232d03ff76d7586a990473f9c93a1554edc620 EBUILD webkit-gtk-2.40.4.ebuild 7601 BLAKE2B 2984369cfae09a7d10f8c0d237089ad8d08b6377f4311e56741462f9aa6dc0c86360955c428964ec8041a01dbf44d3fefb2e7a260a85422ec6c9784be997cc30 SHA512 d9c5e2682a43893339bbc5763ff20017f1e0fe0358be833d08c9009979a16beb085a9c70971a94d49542898b7fb8fadb396fc8fee1728864bc2b37e7f20cd239 -EBUILD webkit-gtk-2.40.5-r410.ebuild 7880 BLAKE2B c41526d723fc5a0804120a88b2075efd717f3d5cf49e1cfe884e119b111679f2f084c9b60f596334df2f6e6d85afc009736a9d15a24a38271ef9e356e2014681 SHA512 73e84efca6750422835d4ca20b072ad0462b3402a53a94bb1ed43d117fb2ed8d3951e5e98f5d121ba520f4a3475c5f015e895abc1c64837a19d86f032eff69af -EBUILD webkit-gtk-2.40.5-r600.ebuild 7753 BLAKE2B 626ac6c35aa06a49a5441a86afa42ffeb853ae7931aaa906000a37576495e5dd1bda4aea6b075cbe378f0e4b3d2b430a1abca471a89d1a484fbdf58f8aabf724 SHA512 6dec4465f21b97d950d000f8f171f5f352ef9cfa28e478ef995a943e7eb2ee78418824ec756c18164c9c3ef7cfe5319ae44388af4c5196074f2276abdbebf6be -EBUILD webkit-gtk-2.40.5.ebuild 7606 BLAKE2B edbe7e9828a0680dbe59918b469179675b4e15c9a010996ee5e2200b284ebf1e5512c4fe2a45258f7ce327acf3e84febf4cd3795890615fdd9a51e81f91870c2 SHA512 df388ae055f88c453f2d117502c100a8158a4ca12f80c3e215e86b0f0673a33f71e73477f9b58435970adb63a04ea74caafec1b5f36c78e1506a6edcbdc71e87 +EBUILD webkit-gtk-2.40.5-r410.ebuild 8105 BLAKE2B 695cf350254a23081cdf1450cc0977bbb4ed8837b879aeede7a17b1079d384dddb9b353efad4f47974efffac45926c1d7f58ed8b3e7a00081e082a87a72c2393 SHA512 68c85e551d14ddb7f09c2fa843d279dce0d28ab839581ce1fa4d4d956018990c9fbe8a3ac70e8d8890d33aeec6fb69a6c0484a0b1cff5c7191ce626398b0f9e1 +EBUILD webkit-gtk-2.40.5-r600.ebuild 7978 BLAKE2B fd91e102e4e493f6682146a9dd9cb8b8aa584a1d2df155b00f93e0ccc8a8bcd7b519d6842c61b78aae5f20118d8838bd7fd5fca9dfbdf153c29528d6274b9b5e SHA512 3419aec4fb03acc2aec5d17a46bbd3bab5b8d6b7dee89fcf6b140d1fd8a4dd08b661fac4363d2e75e15a9d575a67588f883f190ae763753622afe4e7e5fb6cfc +EBUILD webkit-gtk-2.40.5.ebuild 7831 BLAKE2B 876ade75ad21dd453c262dc205a74b31f56b0384ada162dae34d9d89759c2017d86b61c80f1e68061effb7f7cf41a4c2456e493617b1af06bacd169fca9884b5 SHA512 aba80603848c57812ee10d2070b1c148a6f26602f7dfd057c7161cb67080c0b2813414aa0f69ff64987f5bdeda74122b683ad2a122e6976f4c3347210e052394 MISC metadata.xml 709 BLAKE2B 270bd59a793199307b37c8899bdec1438c4576a6221926af6a81ae612e31269ba128b571e184ccf245cb6e82d73b2365adfa33a31cb79857dc2d0502b8fd1614 SHA512 37fa190e40b0b3fc2838ac39f7ee5915547b412692894ffdb72cc91e69236accdb3570f8d20b057fbd4db9d0b4e8d1cee638bce0720ceadd95cfec1ef8b53581 diff --git a/net-libs/webkit-gtk/files/2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch b/net-libs/webkit-gtk/files/2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch new file mode 100644 index 000000000000..f59f3ee09780 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.40.5-Fix-build-failure-when-gstreamer-support-is-disabled.patch @@ -0,0 +1,33 @@ +https://github.com/WebKit/WebKit/pull/16398 + +From f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Tue, 8 Aug 2023 16:51:25 -0700 +Subject: [PATCH] Fix build failure when gstreamer support is disabled + https://bugs.webkit.org/show_bug.cgi?id=259931 https://bugs.gentoo.org/911663 + +Reviewed by Carlos Alberto Lopez Perez. + +* Source/WebCore/loader/MixedContentChecker.cpp: + +Canonical link: https://commits.webkit.org/260527.429@fix-build +--- + Source/WebCore/loader/MixedContentChecker.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/WebCore/loader/MixedContentChecker.cpp b/Source/WebCore/loader/MixedContentChecker.cpp +index 9b4c7fe62020..ac4733bc08bc 100644 +--- a/Source/WebCore/loader/MixedContentChecker.cpp ++++ b/Source/WebCore/loader/MixedContentChecker.cpp +@@ -33,6 +33,8 @@ + #include "ContentSecurityPolicy.h" + #include "Document.h" + #include "Frame.h" ++#include "FrameLoader.h" ++#include "FrameLoaderClient.h" + #include "SecurityOrigin.h" + + namespace WebCore { +-- +2.41.0 + diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild index 46521ce3874e..0a80902a1200 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild @@ -122,6 +122,10 @@ S="${WORKDIR}/${MY_P}" CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 +# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and +# gnome2_src_prepare, and both apply ${PATCHES[@]} +PATCHES=() + pkg_pretend() { if [[ ${MERGE_TYPE} != "binary" ]] ; then if is-flagq "-g*" && ! is-flagq "-g*0" ; then @@ -146,6 +150,8 @@ pkg_setup() { src_prepare() { cmake_src_prepare gnome2_src_prepare + + eapply "${FILESDIR}/${PV}-Fix-build-failure-when-gstreamer-support-is-disabled.patch" } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild index 4e2e199e53c8..eebf464f2fd0 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild @@ -123,6 +123,10 @@ S="${WORKDIR}/${MY_P}" CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 +# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and +# gnome2_src_prepare, and both apply ${PATCHES[@]} +PATCHES=() + pkg_pretend() { if [[ ${MERGE_TYPE} != "binary" ]] ; then if is-flagq "-g*" && ! is-flagq "-g*0" ; then @@ -147,6 +151,8 @@ pkg_setup() { src_prepare() { cmake_src_prepare gnome2_src_prepare + + eapply "${FILESDIR}/${PV}-Fix-build-failure-when-gstreamer-support-is-disabled.patch" } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild index 0af88789a7fa..460653b5eb96 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild @@ -120,6 +120,10 @@ S="${WORKDIR}/${MY_P}" CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 +# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and +# gnome2_src_prepare, and both apply ${PATCHES[@]} +PATCHES=() + pkg_pretend() { if [[ ${MERGE_TYPE} != "binary" ]] ; then if is-flagq "-g*" && ! is-flagq "-g*0" ; then @@ -144,6 +148,8 @@ pkg_setup() { src_prepare() { cmake_src_prepare gnome2_src_prepare + + eapply "${FILESDIR}/${PV}-Fix-build-failure-when-gstreamer-support-is-disabled.patch" } src_configure() { |