Title: [275589] trunk/Tools/buildstream
- Revision
- 275589
- Author
- lmo...@igalia.com
- Date
- 2021-04-07 00:38:50 -0700 (Wed, 07 Apr 2021)
Log Message
[Flatpak SDK] Bump GTK4 to 4.2
https://bugs.webkit.org/show_bug.cgi?id=224263
Reviewed by Carlos Garcia Campos.
* elements/sdk/gtk.bst: Bump and remove merged patch.
* patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/buildstream/ChangeLog (275588 => 275589)
--- trunk/Tools/buildstream/ChangeLog 2021-04-07 06:48:02 UTC (rev 275588)
+++ trunk/Tools/buildstream/ChangeLog 2021-04-07 07:38:50 UTC (rev 275589)
@@ -1,3 +1,13 @@
+2021-04-07 Lauro Moura <lmo...@igalia.com>
+
+ [Flatpak SDK] Bump GTK4 to 4.2
+ https://bugs.webkit.org/show_bug.cgi?id=224263
+
+ Reviewed by Carlos Garcia Campos.
+
+ * elements/sdk/gtk.bst: Bump and remove merged patch.
+ * patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch: Removed.
+
2021-04-06 Philippe Normand <pnorm...@igalia.com>
[Flatpak SDK] Enable high bit depth in libvpx
Modified: trunk/Tools/buildstream/elements/sdk/gtk.bst (275588 => 275589)
--- trunk/Tools/buildstream/elements/sdk/gtk.bst 2021-04-07 06:48:02 UTC (rev 275588)
+++ trunk/Tools/buildstream/elements/sdk/gtk.bst 2021-04-07 07:38:50 UTC (rev 275589)
@@ -5,9 +5,7 @@
url: gitlab_gnome_org:GNOME/gtk.git
track: master
track-tags: true
- ref: 4.0.0-0-g591c2f05956935adbebed5fc345a309dde2d449c
-- kind: patch
- path: patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch
+ ref: 4.2.0-0-gccbbc2f2babcfaee88d8d8040938ca6bf39d05b6
build-depends:
- sdk-build-depends/sassc.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
Deleted: trunk/Tools/buildstream/patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch (275588 => 275589)
--- trunk/Tools/buildstream/patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch 2021-04-07 06:48:02 UTC (rev 275588)
+++ trunk/Tools/buildstream/patches/gtk-clipboard-Fix-a-crash-when-GdkContentProviderUnion-d.patch 2021-04-07 07:38:50 UTC (rev 275589)
@@ -1,32 +0,0 @@
-From 50b70298c0100fb49fbe4ac20f7f2574e7837e9d Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <cgar...@igalia.com>
-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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
