diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2023-08-09 14:00:36 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2023-08-09 14:07:30 -0400 |
| commit | 82b844e81dc6416ba68a67315ded3f75aeef8789 (patch) | |
| tree | dfe8df50f6cae62a043ca04507b6dbebab8a5e1d /net-libs/webkit-gtk | |
| parent | dev-util/drone-cli: drop 1.5.0 (diff) | |
| download | gentoo-82b844e81dc6416ba68a67315ded3f75aeef8789.tar.gz gentoo-82b844e81dc6416ba68a67315ded3f75aeef8789.tar.bz2 gentoo-82b844e81dc6416ba68a67315ded3f75aeef8789.zip | |
net-libs/webkit-gtk: Fix build with USE=-gstreamer
Closes: https://bugs.gentoo.org/911663
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'net-libs/webkit-gtk')
4 files changed, 51 insertions, 0 deletions
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() { |