From 18929397796e5a28690d5de6356dd5c4c3f52437 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 9 Jan 2021 19:51:31 +0100 Subject: [PATCH] Update to 4.0.1 --- .gitignore | 1 + ...uild-Fix-vulkan-reference-in-pc-file.patch | 28 ------ gtk4-gcc11.patch | 85 ------------------- gtk4.spec | 9 +- sources | 2 +- 5 files changed, 7 insertions(+), 118 deletions(-) delete mode 100644 0001-build-Fix-vulkan-reference-in-pc-file.patch delete mode 100644 gtk4-gcc11.patch diff --git a/.gitignore b/.gitignore index 59d7c2b..50e8677 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /gtk-3.99.4.tar.xz /gtk-3.99.5.tar.xz /gtk-4.0.0.tar.xz +/gtk-4.0.1.tar.xz diff --git a/0001-build-Fix-vulkan-reference-in-pc-file.patch b/0001-build-Fix-vulkan-reference-in-pc-file.patch deleted file mode 100644 index 817b71e..0000000 --- a/0001-build-Fix-vulkan-reference-in-pc-file.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7d5826ccf7a8d5ad39f370a3f214e4811ca1075b Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Sun, 27 Dec 2020 06:42:29 +0100 -Subject: [PATCH] build: Fix vulkan reference in pc file - -A mistake in string concatenation caused the vulcan dependency to be omitted. - -Fixes: https://gitlab.gnome.org/GNOME/gtk/-/issues/3517 ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index bb58717f6a..60e7729a8e 100644 ---- a/meson.build -+++ b/meson.build -@@ -723,7 +723,7 @@ if cairogobj_pkg_found - endif - - if vulkan_pkg_found -- gdk_packages += 'vulkan' -+ gdk_packages += ' vulkan' - endif - - pkgconf.set('GDK_PACKAGES', gdk_packages) --- -2.29.2 - diff --git a/gtk4-gcc11.patch b/gtk4-gcc11.patch deleted file mode 100644 index 985f827..0000000 --- a/gtk4-gcc11.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/gtk/css/gtkcssenumtypes.c.template b/gtk/css/gtkcssenumtypes.c.template -index 063b8d0..cb4c9ac 100644 ---- a/gtk/css/gtkcssenumtypes.c.template -+++ b/gtk/css/gtkcssenumtypes.c.template -@@ -13,7 +13,7 @@ - GType - @enum_name@_get_type (void) - { -- static volatile gsize g_define_type_id__volatile = 0; -+ static gsize g_define_type_id__volatile = 0; - - if (g_once_init_enter (&g_define_type_id__volatile)) - { -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 89f4b24..8f114bc 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -16,15 +16,13 @@ %global __provides_exclude_from ^%{_libdir}/gtk-4.0 Name: gtk4 -Version: 4.0.0 -Release: 3%{?dist} +Version: 4.0.1 +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: %{name}-gcc11.patch -Patch1: 0001-build-Fix-vulkan-reference-in-pc-file.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils @@ -234,6 +232,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/gtk-doc %changelog +* Sat Jan 09 2021 Kalev Lember - 4.0.1-1 +- Update to 4.0.1 + * Sat Jan 09 2021 Kalev Lember - 4.0.0-3 - Fix vulkan reference in pc file diff --git a/sources b/sources index f653276..fab0a07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gtk-4.0.0.tar.xz) = 5fe807bcdb59f0df2ad1cc5a28b654dbf90f5fa29bf9a4c69c9278543ab9a3e4f8b1712547fb2fd1f35711c438f78ee8a5cd1a509cf64f815274bb8c82023922 +SHA512 (gtk-4.0.1.tar.xz) = cab50b5bcf1a6bfdd5245c908e813330b9173531c49fdd63f9b5618f5329ddf2560f0a3548f61bba55dea6d816e57681d4e59941cfc50cf430544d3ebcd90aad