unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed

blob 39cd4bd59abc9c01316c6db1b60ae603784bfdba 1080 bytes (raw)
name: gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch 	 # note: path name is non-authoritative(*)

Copied from <https://gitlab.gnome.org/GNOME/gtk/commit/e3a1593a>.
Fixes upstream bug <https://gitlab.gnome.org/GNOME/gtk/issues/1280>,
and hopefully also <https://bugs.gnu.org/34528>,
<https://bugs.gnu.org/34454>, and <https://bugs.gnu.org/34658>.

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 97ada6d73919fba3dfe192dd66929e90bc7677bb..764e39495f7edb0c3efe41cca25b8bee4778887d 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -2985,6 +2985,7 @@ gdk_window_x11_set_background (GdkWindow      *window,
   double r, g, b, a;
   cairo_surface_t *surface;
   cairo_matrix_t matrix;
+  cairo_pattern_t *parent_relative_pattern;
 
   if (GDK_WINDOW_DESTROYED (window))
     return;
@@ -2997,8 +2998,10 @@ gdk_window_x11_set_background (GdkWindow      *window,
     }
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  if (pattern == gdk_x11_get_parent_relative_pattern ())
+  parent_relative_pattern = gdk_x11_get_parent_relative_pattern ();
 G_GNUC_END_IGNORE_DEPRECATIONS
+
+  if (pattern == parent_relative_pattern)
     {
       GdkWindow *parent;
 

debug log:

solving 39cd4bd59a ...
found 39cd4bd59a in https://yhetil.org/guix-bugs/87muld58gn.fsf@netris.org/

applying [1/1] https://yhetil.org/guix-bugs/87muld58gn.fsf@netris.org/
diff --git a/gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch b/gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch
new file mode 100644
index 0000000000..39cd4bd59a

1:21: trailing whitespace.
 
1:26: trailing whitespace.
 
1:35: trailing whitespace.
 
Checking patch gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch...
1:35: new blank line at EOF.
+
Applied patch gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch cleanly.
warning: 4 lines add whitespace errors.

index at:
100644 39cd4bd59abc9c01316c6db1b60ae603784bfdba	gnu/packages/patches/gtk3-fix-deprecation-macro-use.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).