From 3521e9e35a72dcfeaea26548862d33da4f225545 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 19 Jan 2021 10:57:37 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gtk4.git#5376622a32f242a7c573f283df2fb7cea4099578
---
 .gitignore       |  1 +
 gtk4-gcc11.patch | 72 ------------------------------------------------
 gtk4.spec        |  8 ++++--
 sources          |  2 +-
 4 files changed, 7 insertions(+), 76 deletions(-)
 delete mode 100644 gtk4-gcc11.patch

diff --git a/.gitignore b/.gitignore
index 50e8677..50978e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /gtk-3.99.5.tar.xz
 /gtk-4.0.0.tar.xz
 /gtk-4.0.1.tar.xz
+/gtk-4.0.2.tar.xz
diff --git a/gtk4-gcc11.patch b/gtk4-gcc11.patch
deleted file mode 100644
index 0071e46..0000000
--- a/gtk4-gcc11.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c
-index 4d5e30e..915b991 100644
---- a/gtk/gtktextchild.c
-+++ b/gtk/gtktextchild.c
-@@ -169,6 +169,12 @@ const GtkTextLineSegmentClass gtk_text_paintable_type = {
- GtkTextLineSegment *
- _gtk_paintable_segment_new (GdkPaintable *paintable)
- {
-+  /* gcc-11 issues a diagnostic here because the size allocated
-+     for SEG does not cover the entire size of a GtkTextLineSegment
-+     and gcc has no way to know that the union will only be used
-+     for limited types and the additional space is not needed.  */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Warray-bounds"
-   GtkTextLineSegment *seg;
-   guint flags;
- 
-@@ -204,6 +210,7 @@ _gtk_paintable_segment_new (GdkPaintable *paintable)
-   g_object_ref (paintable);
- 
-   return seg;
-+#pragma GCC diagnostic pop
- }
- 
- 
-@@ -280,6 +287,12 @@ const GtkTextLineSegmentClass gtk_text_child_type = {
- GtkTextLineSegment *
- _gtk_widget_segment_new (GtkTextChildAnchor *anchor)
- {
-+  /* gcc-11 issues a diagnostic here because the size allocated
-+     for SEG does not cover the entire size of a GtkTextLineSegment
-+     and gcc has no way to know that the union will only be used
-+     for limited types and the additional space is not needed.  */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Warray-bounds"
-   GtkTextLineSegment *seg;
- 
-   seg = g_slice_alloc (WIDGET_SEG_SIZE);
-@@ -303,6 +316,7 @@ _gtk_widget_segment_new (GtkTextChildAnchor *anchor)
-   g_object_ref (anchor);
-   
-   return seg;
-+#pragma GCC diagnostic pop
- }
- 
- void
-diff --git a/gtk/gtktextsegment.c b/gtk/gtktextsegment.c
-index a202ab6..aaac291 100644
---- a/gtk/gtktextsegment.c
-+++ b/gtk/gtktextsegment.c
-@@ -425,6 +425,13 @@ char_segment_check_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
- GtkTextLineSegment*
- _gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on)
- {
-+  /* gcc-11 issues a diagnostic here because the size allocated
-+     for SEG does not cover the entire size of a GtkTextLineSegment
-+     and gcc has no way to know that the union will only be used
-+     for limited types and the additional space is not needed.  */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Warray-bounds"
-+
-   GtkTextLineSegment *seg;
- 
-   seg = g_slice_alloc (TSEG_SIZE);
-@@ -440,6 +447,7 @@ _gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on)
-   seg->body.toggle.inNodeCounts = 0;
- 
-   return seg;
-+#pragma GCC diagnostic pop
- }
- 
- void
diff --git a/gtk4.spec b/gtk4.spec
index 00061b4..03de413 100644
--- a/gtk4.spec
+++ b/gtk4.spec
@@ -2,7 +2,7 @@
 %global with_broadway 1
 %endif
 
-%global glib2_version 2.65.0
+%global glib2_version 2.66.0
 %global pango_version 1.47.0
 %global cairo_version 1.14.0
 %global gdk_pixbuf_version 2.30.0
@@ -16,14 +16,13 @@
 %global __provides_exclude_from ^%{_libdir}/gtk-4.0
 
 Name:           gtk4
-Version:        4.0.1
+Version:        4.0.2
 Release:        1%{?dist}
 Summary:        GTK graphical user interface library
 
 License:        LGPLv2+
 URL:            https://www.gtk.org
 Source0:        https://download.gnome.org/sources/gtk/4.0/gtk-%{version}.tar.xz
-Patch0:         gtk4-gcc11.patch
 
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
@@ -233,6 +232,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Jan 19 2021 Kalev Lember <klember@redhat.com> - 4.0.2-1
+- Update to 4.0.2
+
 * Sat Jan 09 2021 Kalev Lember <klember@redhat.com> - 4.0.1-1
 - Update to 4.0.1
 
diff --git a/sources b/sources
index fab0a07..d14073e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gtk-4.0.1.tar.xz) = cab50b5bcf1a6bfdd5245c908e813330b9173531c49fdd63f9b5618f5329ddf2560f0a3548f61bba55dea6d816e57681d4e59941cfc50cf430544d3ebcd90aad
+SHA512 (gtk-4.0.2.tar.xz) = ae4d57c857bc07b775f7d906b4106804aa5d78240b0348c886f189a3c32d0fee494ebd1f0fd3301d53a523d6bb7c620150ee6306f44cc7d4f3f4f32fc42f8e49