Title: [275145] trunk/Tools/buildstream
- Revision
- 275145
- Author
- [email protected]
- Date
- 2021-03-27 20:22:34 -0700 (Sat, 27 Mar 2021)
Log Message
[Flatpak SDK] Backport GTK4 Clipboard fix for GdkContentProviderUnion
https://bugs.webkit.org/show_bug.cgi?id=223813
Reviewed by Philippe Normand.
>From https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3346
Will fix some clipbaoard crashes.
* elements/sdk/gtk.bst:
* patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/buildstream/ChangeLog (275144 => 275145)
--- trunk/Tools/buildstream/ChangeLog 2021-03-28 02:52:37 UTC (rev 275144)
+++ trunk/Tools/buildstream/ChangeLog 2021-03-28 03:22:34 UTC (rev 275145)
@@ -1,3 +1,17 @@
+2021-03-27 Lauro Moura <[email protected]>
+
+ [Flatpak SDK] Backport GTK4 Clipboard fix for GdkContentProviderUnion
+ https://bugs.webkit.org/show_bug.cgi?id=223813
+
+ Reviewed by Philippe Normand.
+
+ From https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3346
+
+ Will fix some clipbaoard crashes.
+
+ * elements/sdk/gtk.bst:
+ * patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch: Added.
+
2021-03-25 Philippe Normand <[email protected]>
[Flatpak SDK] Update to GStreamer 1.18.4
Modified: trunk/Tools/buildstream/elements/sdk/gtk.bst (275144 => 275145)
--- trunk/Tools/buildstream/elements/sdk/gtk.bst 2021-03-28 02:52:37 UTC (rev 275144)
+++ trunk/Tools/buildstream/elements/sdk/gtk.bst 2021-03-28 03:22:34 UTC (rev 275145)
@@ -6,6 +6,8 @@
track: master
track-tags: true
ref: 4.0.0-0-g591c2f05956935adbebed5fc345a309dde2d449c
+- kind: patch
+ path: patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch
build-depends:
- sdk-build-depends/sassc.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
Added: trunk/Tools/buildstream/patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch (0 => 275145)
--- trunk/Tools/buildstream/patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch (rev 0)
+++ trunk/Tools/buildstream/patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch 2021-03-28 03:22:34 UTC (rev 275145)
@@ -0,0 +1,32 @@
+From 50b70298c0100fb49fbe4ac20f7f2574e7837e9d Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <[email protected]>
+Date: Thu, 25 Mar 2021 15:10:00 +0100
+Subject: [PATCH] clipboard: Fix a crash when GdkContentProviderUnion doesn't
+ support the given data format
+
+After iterating all the providers, all of them returning unsupported
+error, gdk_content_provider_union_get_value() returns FALSE without
+filing the given GError. Then gdk_clipboard_read_value_internal()
+assumes there's a GError when FALSE is returned and
+g_task_return_error() fails. We can just chain up to parent
+implementation to ensure the GError is filled with unsupported error.
+---
+ gdk/gdkcontentproviderimpl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdk/gdkcontentproviderimpl.c b/gdk/gdkcontentproviderimpl.c
+index df9525e9e6..9c337c7b77 100644
+--- a/gdk/gdkcontentproviderimpl.c
++++ b/gdk/gdkcontentproviderimpl.c
+@@ -349,7 +349,7 @@ gdk_content_provider_union_get_value (GdkContentProvider *provider,
+ g_clear_error (&provider_error);
+ }
+
+- return FALSE;
++ return GDK_CONTENT_PROVIDER_CLASS (gdk_content_provider_union_parent_class)->get_value (provider, value, error);
+ }
+
+ static void
+--
+2.25.1
+
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
