summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2020-01-31 20:07:29 +0200
committerMart Raudsepp <leio@gentoo.org>2020-01-31 21:18:10 +0200
commitb6825b367eab5028b16c0907070129c85c71b767 (patch)
tree0dd2c9497c492d442a1287b0c2a9d1b15452b52b /net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
parentkde-plasma/plasma-integration: Drop 5.17.5 (r0) (diff)
downloadgentoo-b6825b367eab5028b16c0907070129c85c71b767.tar.gz
gentoo-b6825b367eab5028b16c0907070129c85c71b767.tar.bz2
gentoo-b6825b367eab5028b16c0907070129c85c71b767.zip
net-libs/webkit-gtk: security bump to 2.26.3, fix gtk-doc
Move gtk-doc building from USE=doc to USE=gtk-doc, as the latter is the one to use now for when generating gtk-doc from scratch. Fix it with perl-based gtk-doc by stripping out some tags in the docs completely; this was already fixed upstream, but that fix seems dependent on newer gtk-doc handling the markdown quoting that got added. So remove the tags completely until we can depend on a newer gtk-doc that doesn't have trouble with the upstream way. Also a build fix for USE="wayland -opengl -gles2-only" (but remember: you shouldn't disable both opengl and gles2-only on any real desktop system). Bug: https://bugs.gentoo.org/706374 Bug: https://bugs.gentoo.org/704550 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch')
-rw-r--r--net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
new file mode 100644
index 00000000000..85328be1a5c
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
@@ -0,0 +1,27 @@
+Upstream commit 41455af5d76a726f195838846b61e1693a2da99c is supposed to fix this,
+but it looks like it's not enough with older perl-based gtk-doc.
+Keep this extra patch only until we can't depend on a newer gtk-doc version, which
+should be retested whether this patch is unnecessary then.
+
+Upstream extra reference for the above reference commit:
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245027 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
+index 023b14c33f4..657b1febf5d 100644
+--- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
++++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
+@@ -1505,7 +1505,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
+ * WebKitSettings:enable-media:
+ *
+ * Enable or disable support for media playback on pages. This setting is enabled by
+- * default. Disabling it means `<audio>`, `<track>` and `<video>` elements will have
++ * default. Disabling it means audio, track and video elements will have
+ * playback support disabled.
+ *
+ * Since: 2.26
+--
+2.20.1
+