public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: David King <amigadave@amigadave.com>
To: git-commits@fedoraproject.org
Subject: [rpms/gtk4] f44: Drop obsolete patches
Date: Thu, 10 Sep 2026 15:46:47 GMT	[thread overview]
Message-ID: <178905520787.1.2974715256747562147.rpms-gtk4-ab2ef95a50b9@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/gtk4
Branch : f44
Commit : ab2ef95a50b9e745b9f56f2e18a16356ea0e9d28
Author : David King <amigadave@amigadave.com>
Date   : 2026-09-10T16:45:28+01:00
Stats  : +0/-78 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/gtk4/c/ab2ef95a50b9e745b9f56f2e18a16356ea0e9d28?branch=f44

Log:
Drop obsolete patches

---
diff --git a/0001-gtkapplication-wayland-null-check.patch b/0001-gtkapplication-wayland-null-check.patch
deleted file mode 100644
index 5da71a3..0000000
--- a/0001-gtkapplication-wayland-null-check.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 221cd8e1904f2ca35d89dff3c1068616c6ce588c Mon Sep 17 00:00:00 2001
-Date: Thu, 12 Mar 2026 17:04:59 +0000
-Subject: [PATCH] gtkapplication-wayland: Add a missing NULL check when
- forgetting a window
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It’s possible for `gtk_native_get_surface()` to return `NULL`, which
-`gdk_wayland_toplevel_remove_from_session()` doesn’t like.
-
-Copy the other `NULL` checks in the file and add the missing one here.
-
-Signed-off-by: Philip Withnall <pwithnall@gnome.org>
-
-Fixes: #8098
-Part-of: <https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/9643>
----
- gtk/gtkapplication-wayland.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtkapplication-wayland.c b/gtk/gtkapplication-wayland.c
-index 0ae4a30f279..7d8b5221267 100644
---- a/gtk/gtkapplication-wayland.c
-+++ b/gtk/gtkapplication-wayland.c
-@@ -222,7 +222,8 @@ gtk_application_impl_wayland_window_forget (GtkApplicationImpl *impl,
-   GTK_APPLICATION_IMPL_CLASS (gtk_application_impl_wayland_parent_class)->window_forget (impl, window);
- 
-   surface = gtk_native_get_surface (GTK_NATIVE (window));
--  gdk_wayland_toplevel_remove_from_session (GDK_TOPLEVEL (surface));
-+  if (GDK_IS_WAYLAND_TOPLEVEL (surface))
-+    gdk_wayland_toplevel_remove_from_session (GDK_TOPLEVEL (surface));
- }
- 
- static guint
--- 
-GitLab
-

diff --git a/0002-dragsource-Fix-memory-corruption-due-to-uncancelled-source.patch b/0002-dragsource-Fix-memory-corruption-due-to-uncancelled-source.patch
deleted file mode 100644
index 018868a..0000000
--- a/0002-dragsource-Fix-memory-corruption-due-to-uncancelled-source.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f022874b8974e60854a2d57d0f09e2d7c0f0af52 Mon Sep 17 00:00:00 2001
-From: Khalid Abu Shawarib <khalid.shawarib@gmail.com>
-Date: Wed, 6 May 2026 02:44:13 +0300
-Subject: [PATCH] dragsource: Fix memory corruption due to uncancelled source
-
-Drag begin was called multiple times before the timeout expired,
-overwriting the existing id and not be able to cancel it. This led to a
-hard to debug race condition that caused memory corruption and crashes.
-
-I've confirmed that crashes only occur if a GtkDragSource controller
-was present, and that this change stops crashes from happening.
-
-Fixes: #8191
-Part-of: <https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/9913>
----
- gtk/gtkdragsource.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gtk/gtkdragsource.c b/gtk/gtkdragsource.c
-index 72a680e92a8..ce649fe083d 100644
---- a/gtk/gtkdragsource.c
-+++ b/gtk/gtkdragsource.c
-@@ -286,6 +286,7 @@ gtk_drag_source_begin (GtkGesture       *gesture,
-   GdkEventSequence *current;
- 
-   current = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture));
-+  g_clear_handle_id (&source->timeout_id, g_source_remove);
-   source->timeout_id = g_timeout_add (MIN_TIME_TO_DND, drag_timeout, source);
- 
-   gtk_gesture_get_point (gesture, current, &source->start_x, &source->start_y);
--- 
-GitLab
-

diff --git a/gtk4.spec b/gtk4.spec
index 9090dfc..39f20a5 100644
--- a/gtk4.spec
+++ b/gtk4.spec
@@ -73,13 +73,6 @@ License:        LGPL-2.0-or-later AND LGPL-2.1-or-later AND Apache-2.0 AND CC0-1
 URL:            https://www.gtk.org
 Source0:        https://download.gnome.org/sources/gtk/4.22/gtk-%{version}.tar.xz
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=2450986
-Patch:          0001-gtkapplication-wayland-null-check.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=2524550
-# https://gitlab.gnome.org/GNOME/gtk/-/issues/8191
-Patch:          0002-dragsource-Fix-memory-corruption-due-to-uncancelled-source.patch
-
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-style-xsl

                 reply	other threads:[~2026-09-10 15:46 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178905520787.1.2974715256747562147.rpms-gtk4-ab2ef95a50b9@fedoraproject.org \
    --to=amigadave@amigadave.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox